From ffa42bc592673b8e8e82f4f0ad326b437a30174d Mon Sep 17 00:00:00 2001 From: Randall Whitman Date: Wed, 4 Nov 2015 17:03:05 -0800 Subject: [PATCH] [SPARK] SparkContextFunctions.esRDD parameters Add an overload with all three parameters available with EsSpark.esRDD(..., resource, query, cfg). Likewise for esJsonRDD. --- spark/core/main/scala/org/elasticsearch/spark/package.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spark/core/main/scala/org/elasticsearch/spark/package.scala b/spark/core/main/scala/org/elasticsearch/spark/package.scala index 3d6ae9160..951394962 100644 --- a/spark/core/main/scala/org/elasticsearch/spark/package.scala +++ b/spark/core/main/scala/org/elasticsearch/spark/package.scala @@ -21,12 +21,16 @@ package object spark { def esRDD(resource: String, query: String) = EsSpark.esRDD(sc, resource, query) def esRDD(cfg: scala.collection.Map[String, String]) = EsSpark.esRDD(sc, cfg) def esRDD(resource: String, cfg: scala.collection.Map[String, String]) = EsSpark.esRDD(sc, resource, cfg) + def esRDD(resource: String, query: String, cfg: scala.collection.Map[String, String]) = + EsSpark.esRDD(sc, resource, query, cfg) def esJsonRDD() = EsSpark.esJsonRDD(sc) def esJsonRDD(resource: String) = EsSpark.esJsonRDD(sc, resource) def esJsonRDD(resource: String, query: String) = EsSpark.esJsonRDD(sc, resource, query) def esJsonRDD(cfg: scala.collection.Map[String, String]) = EsSpark.esJsonRDD(sc, cfg) def esJsonRDD(resource: String, cfg: scala.collection.Map[String, String]) = EsSpark.esJsonRDD(sc, resource, cfg) + def esJsonRDD(resource: String, query: String, cfg: scala.collection.Map[String, String]) = + EsSpark.esJsonRDD(sc, resource, query, cfg) } implicit def sparkRDDFunctions[T : ClassTag](rdd: RDD[T]) = new SparkRDDFunctions[T](rdd) @@ -53,4 +57,4 @@ package object spark { def saveToEsWithMeta[K,V](resource: String, cfg: Map[String, String]) { EsSpark.saveToEsWithMeta(rdd, resource, cfg) } def saveToEsWithMeta[K,V](cfg: Map[String, String]) { EsSpark.saveToEsWithMeta(rdd, cfg) } } -} \ No newline at end of file +}