Merge pull request #83 from zouzias/develop

Develop

Author: zouzias

.travis.yml

@@ -16,13 +16,13 @@ matrix:
     # Spark 2.0.0
     - jdk: openjdk7
       scala: 2.11.8
-      env: TEST_SPARK_VERSION="2.0.1" LUCENE_ANALYZER="en"
+      env: TEST_SPARK_VERSION="2.0.2" LUCENE_ANALYZER="en"
     - jdk: oraclejdk8
       scala: 2.11.8
-      env: TEST_SPARK_VERSION="2.0.1" LUCENE_ANALYZER="en"
+      env: TEST_SPARK_VERSION="2.0.2" LUCENE_ANALYZER="en"
     - jdk: oraclejdk8
       scala: 2.11.8
-      env: TEST_SPARK_VERSION="2.0.1" LUCENE_ANALYZER="whitespace"
+      env: TEST_SPARK_VERSION="2.0.2" LUCENE_ANALYZER="whitespace"
 script:
   - sbt ++$TRAVIS_SCALA_VERSION clean update -Dlucenerdd.analyzer.name=${LUCENE_ANALYZER} -test
   - sbt ++$TRAVIS_SCALA_VERSION scalastyle

build.sbt

@@ -78,7 +78,7 @@ pomExtra := (
 val luceneV = "5.5.3"
 
 spName := "zouzias/spark-lucenerdd"
-sparkVersion := "2.0.1"
+sparkVersion := "2.0.2"
 spShortDescription := "Spark RDD with Lucene's query capabilities"
 sparkComponents ++= Seq("core", "sql")
 spAppendScalaVersion := true

spark-shell.sh

@@ -20,9 +20,11 @@ MAIN_JAR=${CURRENT_DIR}/target/scala-2.11/spark-lucenerdd-assembly-${SPARK_LUCEN
 # Run spark shell locally
 ${SPARK_HOME}/bin/spark-shell   --jars "${MAIN_JAR}" \
 				--conf "spark.executor.memory=1g" \
-				--conf "spark.driver.memory=512m" \
+				--conf "spark.driver.memory=1g" \
 				--conf "spark.rdd.compress=true" \
 				--conf "spark.serializer=org.apache.spark.serializer.KryoSerializer" \
 				--conf "spark.kryo.registrator=org.zouzias.spark.lucenerdd.LuceneRDDKryoRegistrator" \
+				--conf spark.executor.extraJavaOptions="-Dlucenerdd.index.store.mode=disk" \
+				--conf spark.driver.extraJavaOptions="-Dlucenerdd.index.store.mode=disk" \
 				--conf "spark.kryoserializer.buffer=24mb" \
 				--master local[*]