mahout-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smar...@apache.org
Subject mahout git commit: MAHOUT-1877: Switch to Flink 1.1.0, this closes apache/mahout#249
Date Tue, 09 Aug 2016 00:40:50 GMT
Repository: mahout
Updated Branches:
  refs/heads/master 45ee3cf09 -> 0ecb6685c


MAHOUT-1877: Switch to Flink 1.1.0, this closes apache/mahout#249


Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/0ecb6685
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/0ecb6685
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/0ecb6685

Branch: refs/heads/master
Commit: 0ecb6685c2bb8fd2e8857967954d616a59cc2389
Parents: 45ee3cf
Author: smarthi <smarthi@apache.org>
Authored: Mon Aug 8 20:40:30 2016 -0400
Committer: smarthi <smarthi@apache.org>
Committed: Mon Aug 8 20:40:30 2016 -0400

----------------------------------------------------------------------
 .../org/apache/mahout/flinkbindings/io/HDFSPathSearch.scala   | 7 ++++---
 pom.xml                                                       | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mahout/blob/0ecb6685/flink/src/main/scala/org/apache/mahout/flinkbindings/io/HDFSPathSearch.scala
----------------------------------------------------------------------
diff --git a/flink/src/main/scala/org/apache/mahout/flinkbindings/io/HDFSPathSearch.scala
b/flink/src/main/scala/org/apache/mahout/flinkbindings/io/HDFSPathSearch.scala
index c0b6ee9..1f36fe2 100644
--- a/flink/src/main/scala/org/apache/mahout/flinkbindings/io/HDFSPathSearch.scala
+++ b/flink/src/main/scala/org/apache/mahout/flinkbindings/io/HDFSPathSearch.scala
@@ -21,6 +21,7 @@ package org.apache.mahout.flinkbindings.io
 import org.apache.hadoop.conf.Configuration
 import org.apache.hadoop.fs.{FileStatus, FileSystem, Path}
 
+
 /**
  * Returns a [[java.lang.String]], which is comma delimited list of URIs discovered based
on parameters
  * in the constructor.
@@ -61,17 +62,17 @@ case class HDFSPathSearch(pathURI: String, filePattern: String = "", recursive:
     val seed = fs.getFileStatus(new Path(dir))
     var f: String = files
 
-    if (seed.isDirectory) {
+    if (seed.isDir) {
       val fileStatuses: Array[FileStatus] = fs.listStatus(new Path(dir))
       for (fileStatus <- fileStatuses) {
         if (fileStatus.getPath().getName().matches(filePattern)
-          && !fileStatus.isDirectory) {
+          && !fileStatus.isDir) {
           // found a file
           if (fileStatus.getLen() != 0) {
             // file is not empty
             f = f + fileStatus.getPath.toUri.toString + ","
           }
-        } else if (fileStatus.isDirectory && recursive) {
+        } else if (fileStatus.isDir && recursive) {
           f = findFiles(fileStatus.getPath.toString, filePattern, f)
         }
       }

http://git-wip-us.apache.org/repos/asf/mahout/blob/0ecb6685/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1a641be..315d9d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
     <scala.compat.version>2.10</scala.compat.version>
     <scala.version>2.10.4</scala.version>
     <spark.version>1.5.2</spark.version>
-    <flink.version>1.0.3</flink.version>
+    <flink.version>1.1.0</flink.version>
     <h2o.version>0.1.25</h2o.version>
     <jackson.version>2.7.4</jackson.version>
   </properties>


Mime
View raw message