tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ok...@apache.org
Subject [29/35] incubator-tinkerpop git commit: Fixed regex construction
Date Tue, 23 Feb 2016 23:22:22 GMT
Fixed regex construction


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/164fdace
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/164fdace
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/164fdace

Branch: refs/heads/TINKERPOP-1166
Commit: 164fdace2e58e9632d8de4bba0fe8bea4c2bd5b2
Parents: 317d5c8
Author: Marvin Froeder <marvin.froeder@vizexplorer.com>
Authored: Wed Feb 3 09:17:11 2016 +1300
Committer: Marvin Froeder <marvin.froeder@vizexplorer.com>
Committed: Mon Feb 22 09:31:56 2016 +1300

----------------------------------------------------------------------
 .../gremlin/spark/structure/io/SparkContextStorage.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/164fdace/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkContextStorage.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkContextStorage.java
b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkContextStorage.java
index 4b113a3..799c215 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkContextStorage.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkContextStorage.java
@@ -75,7 +75,7 @@ public final class SparkContextStorage implements Storage {
     @Override
     public List<String> ls(final String location) {
         final List<String> rdds = new ArrayList<>();
-        final String wildCardLocation = (location.endsWith("*") ? location : location + "*").replace(".",
"\\.").replace("*", ".*").replace('\\', '/');
+        final String wildCardLocation = (location.endsWith("*") ? location : location + "*").replace('\\',
'/').replace(".", "\\.").replace("*", ".*");
         for (final RDD<?> rdd : Spark.getRDDs()) {
             if (rdd.name().replace('\\', '/').matches(wildCardLocation))
                 rdds.add(rdd.name() + " [" + rdd.getStorageLevel().description() + "]");
@@ -103,7 +103,7 @@ public final class SparkContextStorage implements Storage {
     @Override
     public boolean rm(final String location) {
         final List<String> rdds = new ArrayList<>();
-        final String wildCardLocation = (location.endsWith("*") ? location : location + "*").replace(".",
"\\.").replace("*", ".*").replace('\\', '/');
+        final String wildCardLocation = (location.endsWith("*") ? location : location + "*").replace('\\',
'/').replace(".", "\\.").replace("*", ".*");
         for (final RDD<?> rdd : Spark.getRDDs()) {
             if (rdd.name().replace('\\', '/').matches(wildCardLocation))
                 rdds.add(rdd.name());


Mime
View raw message