diff --git a/dga-giraph/build.gradle b/dga-giraph/build.gradle index 1c40327..944f641 100644 --- a/dga-giraph/build.gradle +++ b/dga-giraph/build.gradle @@ -27,7 +27,7 @@ dependencies { exclude module: 'zookeeper' } hadoopProvided group: 'org.apache.hadoop', name: 'hadoop-client', version: cdh_version - testCompile 'org.apache.giraph:giraph-core:1.1.0-hadoop2' + testCompile 'org.apache.giraph:giraph-core:1.2.0-hadoop2' testCompile "org.mockito:mockito-core:1.9.5" testCompile 'junit:junit:4.11' testCompile 'commons-httpclient:commons-httpclient:3.0.1' diff --git a/dga-giraph/src/main/java/com/soteradefense/dga/lc/LeafCompressionComputation.java b/dga-giraph/src/main/java/com/soteradefense/dga/lc/LeafCompressionComputation.java index 0adb315..3385de4 100644 --- a/dga-giraph/src/main/java/com/soteradefense/dga/lc/LeafCompressionComputation.java +++ b/dga-giraph/src/main/java/com/soteradefense/dga/lc/LeafCompressionComputation.java @@ -106,4 +106,4 @@ private int getVertexValue(String value) { } return vertexValue; } -} \ No newline at end of file +} diff --git a/dga-giraph/src/main/java/com/soteradefense/dga/louvain/giraph/LouvainMasterCompute.java b/dga-giraph/src/main/java/com/soteradefense/dga/louvain/giraph/LouvainMasterCompute.java index fb2b36e..32be99e 100644 --- a/dga-giraph/src/main/java/com/soteradefense/dga/louvain/giraph/LouvainMasterCompute.java +++ b/dga-giraph/src/main/java/com/soteradefense/dga/louvain/giraph/LouvainMasterCompute.java @@ -191,7 +191,8 @@ private void writeFile(String path, String message) { Path pt = new Path(path); logger.debug("Writing file out to {}, message {}", path, message); try { - FileSystem fs = FileSystem.get(new Configuration()); + //FileSystem fs = FileSystem.get(new Configuration()); + FileSystem fs = FileSystem.get(getConf()); BufferedWriter br = new BufferedWriter(new OutputStreamWriter(fs.create(pt, true))); br.write(message); br.close(); @@ -206,7 +207,8 @@ private String readFile(String path) { StringBuilder builder = new StringBuilder(); try { Path pt = new Path(path); - FileSystem fs = FileSystem.get(new Configuration()); + //FileSystem fs = FileSystem.get(new Configuration()); + FileSystem fs = FileSystem.get(getConf()); BufferedReader br = new BufferedReader(new InputStreamReader(fs.open(pt))); String line; line = br.readLine();