Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: hail-is/hail
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: nicklecompteBCH/hail
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Feb 17, 2020

  1. update ES connector

    @nicklecompteBCH
    nicklecompteBCH committed Feb 17, 2020
    Copy the full SHA
    a2588c4 View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 hail/build.gradle
  2. +1 −1 hail/build.sbt
  3. +2 −2 hail/src/main/scala/is/hail/io/ElasticsearchConnector.scala
2 changes: 1 addition & 1 deletion hail/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -154,7 +154,7 @@ dependencies {

bundled group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'

bundled 'org.elasticsearch:elasticsearch-spark-20_2.11:6.2.4'
bundled 'org.elasticsearch:elasticsearch-hadoop:6.2.4'

bundled 'org.apache.httpcomponents:httpcore:4.4.3'
bundled('org.apache.httpcomponents:httpclient:4.5.1') {
2 changes: 1 addition & 1 deletion hail/build.sbt
View file
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@ lazy val root = (project in file(".")).
, "org.json4s" %% "json4s-core" % "3.2.10"
, "org.json4s" %% "json4s-jackson" % "3.2.10"
, "org.json4s" %% "json4s-ast" % "3.2.10"
, "org.elasticsearch" % "elasticsearch-spark-20_2.11" % "6.2.4"
, "org.elasticsearch" % "elasticsearch-hadoop" % "6.2.4"
, "org.apache.solr" % "solr-solrj" % "6.2.0"
, "com.datastax.cassandra" % "cassandra-driver-core" % "3.0.0"
, "com.jayway.restassured" % "rest-assured" % "2.8.0"
4 changes: 2 additions & 2 deletions hail/src/main/scala/is/hail/io/ElasticsearchConnector.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package is.hail.io

import org.apache.spark
import org.elasticsearch.spark.sql._
import org.elasticsearch.spark._

import scala.collection.JavaConverters._
import scala.collection.Map
@@ -41,6 +41,6 @@ object ElasticsearchConnector {
if (verbose)
println(s"Config ${ mergedConfig }")

df.saveToEs(s"${ index }/${ indexType }", mergedConfig)
df.rdd.saveToEs(s"${ index }/${ indexType }", mergedConfig)
}
}