[gora] branch master updated: GORA-612 : Fix Flink tests for MongoDB module

[djkevincr]

This is an automated email from the ASF dual-hosted git repository.

djkevincr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/gora.git


The following commit(s) were added to refs/heads/master by this push:
     new c6f3f09  GORA-612 : Fix Flink tests for MongoDB module
     new 04d8010  Merge pull request #162 from djkevincr/GORA-612
c6f3f09 is described below

commit c6f3f0996b8031d4ca1f6e2e327730c796239b13
Author: Kevin Ratnasekera <djkevi...@yahoo.com>
AuthorDate: Wed May 1 22:28:22 2019 +0530

    GORA-612 : Fix Flink tests for MongoDB module
---
 .../src/main/java/org/apache/gora/spark/GoraSparkEngine.java     | 9 ++++++++-
 gora-mongodb/src/test/conf/gora.properties                       | 2 +-
 .../apache/gora/mongodb/mapreduce/TestMongoStoreWordCount.java   | 1 -
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/gora-core/src/main/java/org/apache/gora/spark/GoraSparkEngine.java 
b/gora-core/src/main/java/org/apache/gora/spark/GoraSparkEngine.java
index b1916b6..fb3831d 100644
--- a/gora-core/src/main/java/org/apache/gora/spark/GoraSparkEngine.java
+++ b/gora-core/src/main/java/org/apache/gora/spark/GoraSparkEngine.java
@@ -105,8 +105,15 @@ public class GoraSparkEngine<K, V extends Persistent> {
    */
     public <K, V extends Persistent> Configuration 
generateOutputConf(DataStore<K, V> dataStore)
        throws IOException {
+      Configuration hadoopConf;
+
+      if ((dataStore instanceof Configurable)
+              && ((Configurable) dataStore).getConf() != null) {
+        hadoopConf = ((Configurable) dataStore).getConf();
+      } else {
+        hadoopConf = new Configuration();
+      }
 
-      Configuration hadoopConf = new Configuration();
       GoraMapReduceUtils.setIOSerializations(hadoopConf, true);
       Job job = Job.getInstance(hadoopConf);
 
diff --git a/gora-mongodb/src/test/conf/gora.properties 
b/gora-mongodb/src/test/conf/gora.properties
index 4be92f7..39960df 100644
--- a/gora-mongodb/src/test/conf/gora.properties
+++ b/gora-mongodb/src/test/conf/gora.properties
@@ -21,7 +21,7 @@ gora.datastore.autocreateschema=true
 gora.datastore.default=org.apache.gora.mongodb.store.MongoStore
 # Don't override properties coming from Hadoop configuration for test
 # Those properties will contains override for Mongo server port
-gora.mongodb.override_hadoop_configuration=true
+gora.mongodb.override_hadoop_configuration=false
 gora.mongodb.mapping.file=/gora-mongodb-mapping.xml
 gora.mongodb.servers=localhost
 gora.mongodb.db=nutchtest
diff --git 
a/gora-mongodb/src/test/java/org/apache/gora/mongodb/mapreduce/TestMongoStoreWordCount.java
 
b/gora-mongodb/src/test/java/org/apache/gora/mongodb/mapreduce/TestMongoStoreWordCount.java
index de61ec8..d48c43f 100644
--- 
a/gora-mongodb/src/test/java/org/apache/gora/mongodb/mapreduce/TestMongoStoreWordCount.java
+++ 
b/gora-mongodb/src/test/java/org/apache/gora/mongodb/mapreduce/TestMongoStoreWordCount.java
@@ -62,7 +62,6 @@ public class TestMongoStoreWordCount extends 
GoraMongoMapredTest {
   }
 
   //todo fix config
-  //@Ignore
   @Test
   public void testSparkWordCount() throws Exception {
     MapReduceTestUtils.testSparkWordCount(testDriver.getConfiguration(),