date:20181220

[zeppelin] branch master updated: Revert "[ZEPPELIN-3882] Neo4jInterpreter - Support Point and Date Types" (#3270)

2018-12-20 Thread felixcheung

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 45fa3fd  Revert "[ZEPPELIN-3882] Neo4jInterpreter - Support Point and 
Date Types" (#3270)
45fa3fd is described below

commit 45fa3fdac0c79f78f6d0416e1bbfce281ef4e0df
Author: Felix Cheung 
AuthorDate: Fri Dec 21 02:03:48 2018 -0500

Revert "[ZEPPELIN-3882] Neo4jInterpreter - Support Point and Date Types" 
(#3270)

* Revert "fix checkstyle"

This reverts commit 5542262568b3532fd11e2832d3168b386f35b3d6.

* Revert "Added support for Neo4j temporal and point types"

This reverts commit b98ccea98996eda183382a332379f3cfc428c0e9.

* Revert "Added support for Neo4j temporal and point types"

This reverts commit 0fbcddae980ff245eead964e8a5e0ee0f1a6.
---
 docs/interpreter/neo4j.md  |   3 -
 neo4j/pom.xml  |   6 +-
 .../graph/neo4j/Neo4jCypherInterpreter.java|  14 ---
 .../graph/neo4j/Neo4jCypherInterpreterTest.java| 105 -
 4 files changed, 20 insertions(+), 108 deletions(-)

diff --git a/docs/interpreter/neo4j.md b/docs/interpreter/neo4j.md
index eec9e07..1b14127 100644
--- a/docs/interpreter/neo4j.md
+++ b/docs/interpreter/neo4j.md
@@ -26,9 +26,6 @@ limitations under the License.
 ## Overview
 [Neo4j](https://neo4j.com/product/) is a native graph database, designed to 
store and process graphs from bottom to top.
 
-### Supported Version
-
-The Neo4j Interpreter supports all Neo4j versions since v3 via the official 
[Neo4j Java Driver](https://github.com/neo4j/neo4j-java-driver)
 
 ![Neo4j - Interpreter - 
Video]({{BASE_PATH}}/assets/themes/zeppelin/img/docs-img/neo4j-interpreter-video.gif)
 
diff --git a/neo4j/pom.xml b/neo4j/pom.xml
index cc39fdc..b8a89ad 100644
--- a/neo4j/pom.xml
+++ b/neo4j/pom.xml
@@ -33,9 +33,9 @@
   Zeppelin: Neo4j interpreter
   
   
-   1.7.1
-   3.4.10
-   3.4.10
+   1.4.3
+   3.2.3
+   3.2.3
2.8.9
 neo4j
   
diff --git 
a/neo4j/src/main/java/org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreter.java
 
b/neo4j/src/main/java/org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreter.java
index d7f8485..bcb9d7b 100644
--- 
a/neo4j/src/main/java/org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreter.java
+++ 
b/neo4j/src/main/java/org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreter.java
@@ -201,20 +201,6 @@ public class Neo4jCypherInterpreter extends Interpreter {
   value = val.asList();
 } else if (val.hasType(InternalTypeSystem.TYPE_SYSTEM.MAP())) {
   value = val.asMap();
-} else if (val.hasType(InternalTypeSystem.TYPE_SYSTEM.POINT())) {
-  value = val.asPoint();
-} else if (val.hasType(InternalTypeSystem.TYPE_SYSTEM.DATE())) {
-  value = val.asLocalDate();
-} else if (val.hasType(InternalTypeSystem.TYPE_SYSTEM.TIME())) {
-  value = val.asOffsetTime();
-} else if (val.hasType(InternalTypeSystem.TYPE_SYSTEM.LOCAL_TIME())) {
-  value = val.asLocalTime();
-} else if 
(val.hasType(InternalTypeSystem.TYPE_SYSTEM.LOCAL_DATE_TIME())) {
-  value = val.asLocalDateTime();
-} else if (val.hasType(InternalTypeSystem.TYPE_SYSTEM.DATE_TIME())) {
-  value = val.asZonedDateTime();
-} else if (val.hasType(InternalTypeSystem.TYPE_SYSTEM.DURATION())) {
-  value = val.asIsoDuration();
 }
   }
   if (value instanceof Collection) {
diff --git 
a/neo4j/src/test/java/org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreterTest.java
 
b/neo4j/src/test/java/org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreterTest.java
index 7940d5f..24bd513 100644
--- 
a/neo4j/src/test/java/org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreterTest.java
+++ 
b/neo4j/src/test/java/org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreterTest.java
@@ -55,15 +55,10 @@ public class Neo4jCypherInterpreterTest {
   private static final String REL_KNOWS = "KNOWS";
 
   private static final String CYPHER_FOREACH =
-  "FOREACH (x in range(1,100) | CREATE (:%s{name: \"name\" + x, age: 
%s, " +
-  "address: point({ longitude: 56.7, latitude: 12.78, height: 
8 }), " +
-  "birth: date('1984-04-04')}))";
-  private static final String CHPHER_UNWIND = "UNWIND range(1,100) as x "
-+ "MATCH (n), (m) WHERE id(n) = x AND id(m) = toInt(rand() * 100) "
+  "FOREACH (x in range(1,1000) | CREATE (:%s{name: \"name\" + x, age: 
%s}))";
+  private static final String CHPHER_UNWIND = "UNWIND range(1,1000) as x "
++ "MATCH (n), (m) WHERE id(n) = x AND id(m) = toInt(rand() * 1000) "
 + "CREATE (n)-[:%s]->(m)";
-  
-  private static final String TABLE_RESULT_PREFIX = "%table ";
-  private static final String

[zeppelin] branch revert-3244-update-neo4j-datatypes created (now 7ae0e41)

2018-12-20 Thread felixcheung

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

felixcheung pushed a change to branch revert-3244-update-neo4j-datatypes
in repository https://gitbox.apache.org/repos/asf/zeppelin.git.


  at 7ae0e41  Revert "Added support for Neo4j temporal and point types"

This branch includes the following new commits:

 new 4ddee85  Revert "fix checkstyle"
 new 0193be5  Revert "Added support for Neo4j temporal and point types"
 new 7ae0e41  Revert "Added support for Neo4j temporal and point types"

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[zeppelin] 01/03: Revert "fix checkstyle"

2018-12-20 Thread felixcheung

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

felixcheung pushed a commit to branch revert-3244-update-neo4j-datatypes
in repository https://gitbox.apache.org/repos/asf/zeppelin.git

commit 4ddee8579401c4bbf59f714a9972538684f555e5
Author: Felix Cheung 
AuthorDate: Thu Dec 20 23:03:14 2018 -0800

Revert "fix checkstyle"

This reverts commit 5542262568b3532fd11e2832d3168b386f35b3d6.
---
 .../graph/neo4j/Neo4jCypherInterpreter.java|  14 ---
 .../graph/neo4j/Neo4jCypherInterpreterTest.java| 101 +++--
 2 files changed, 15 insertions(+), 100 deletions(-)

diff --git 
a/neo4j/src/main/java/org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreter.java
 
b/neo4j/src/main/java/org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreter.java
index d7f8485..bcb9d7b 100644
--- 
a/neo4j/src/main/java/org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreter.java
+++ 
b/neo4j/src/main/java/org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreter.java
@@ -201,20 +201,6 @@ public class Neo4jCypherInterpreter extends Interpreter {
   value = val.asList();
 } else if (val.hasType(InternalTypeSystem.TYPE_SYSTEM.MAP())) {
   value = val.asMap();
-} else if (val.hasType(InternalTypeSystem.TYPE_SYSTEM.POINT())) {
-  value = val.asPoint();
-} else if (val.hasType(InternalTypeSystem.TYPE_SYSTEM.DATE())) {
-  value = val.asLocalDate();
-} else if (val.hasType(InternalTypeSystem.TYPE_SYSTEM.TIME())) {
-  value = val.asOffsetTime();
-} else if (val.hasType(InternalTypeSystem.TYPE_SYSTEM.LOCAL_TIME())) {
-  value = val.asLocalTime();
-} else if 
(val.hasType(InternalTypeSystem.TYPE_SYSTEM.LOCAL_DATE_TIME())) {
-  value = val.asLocalDateTime();
-} else if (val.hasType(InternalTypeSystem.TYPE_SYSTEM.DATE_TIME())) {
-  value = val.asZonedDateTime();
-} else if (val.hasType(InternalTypeSystem.TYPE_SYSTEM.DURATION())) {
-  value = val.asIsoDuration();
 }
   }
   if (value instanceof Collection) {
diff --git 
a/neo4j/src/test/java/org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreterTest.java
 
b/neo4j/src/test/java/org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreterTest.java
index 7940d5f..f44cd77 100644
--- 
a/neo4j/src/test/java/org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreterTest.java
+++ 
b/neo4j/src/test/java/org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreterTest.java
@@ -55,15 +55,10 @@ public class Neo4jCypherInterpreterTest {
   private static final String REL_KNOWS = "KNOWS";
 
   private static final String CYPHER_FOREACH =
-  "FOREACH (x in range(1,100) | CREATE (:%s{name: \"name\" + x, age: 
%s, " +
-  "address: point({ longitude: 56.7, latitude: 12.78, height: 
8 }), " +
-  "birth: date('1984-04-04')}))";
+  "FOREACH (x in range(1,100) | CREATE (:%s{name: \"name\" + x, age: 
%s, address: point({ longitude: 56.7, latitude: 12.78, height: 8 }), birth: 
date('1984-04-04')}))";
   private static final String CHPHER_UNWIND = "UNWIND range(1,100) as x "
 + "MATCH (n), (m) WHERE id(n) = x AND id(m) = toInt(rand() * 100) "
 + "CREATE (n)-[:%s]->(m)";
-  
-  private static final String TABLE_RESULT_PREFIX = "%table ";
-  private static final String NETWORK_RESULT_PREFIX = "%network ";
 
   @BeforeClass
   public static void setUpNeo4jServer() throws Exception {
@@ -78,7 +73,7 @@ public class Neo4jCypherInterpreterTest {
   public static void tearDownNeo4jServer() throws Exception {
 server.close();
   }
-
+  
   @Before
   public void setUpZeppelin() {
 Properties p = new Properties();
@@ -88,7 +83,7 @@ public class Neo4jCypherInterpreterTest {
 interpreter = new Neo4jCypherInterpreter(p);
 context = InterpreterContext.builder()
 .setInterpreterOut(new InterpreterOutput(null))
-.build();
+.build();;
   }
 
   @After
@@ -103,15 +98,14 @@ public class Neo4jCypherInterpreterTest {
 "return 'a' as colA, 'b' as colB, [1, 2, 3] as colC", context);
 assertEquals(Code.SUCCESS, result.code());
 final String tableResult = "colA\tcolB\tcolC\n\"a\"\t\"b\"\t[1,2,3]\n";
-assertEquals(tableResult, result.toString().replace(TABLE_RESULT_PREFIX, 
StringUtils.EMPTY));
-
+assertEquals(tableResult, result.toString().replace("%table ", 
StringUtils.EMPTY));
+
 result = interpreter.interpret(
 "return 'a' as colA, 'b' as colB, [{key: \"value\"}, {key: 1}] as 
colC", context);
 assertEquals(Code.SUCCESS, result.code());
 final String tableResultWithMap =
 
"colA\tcolB\tcolC\n\"a\"\t\"b\"\t[{\"key\":\"value\"},{\"key\":1}]\n";
-assertEquals(tableResultWithMap, 
result.toString().replace(TABLE_RESULT_PREFIX,
-StringUtils.EMPTY));
+assertEquals(tableResultWithMap, result.toString().replace("%table ", 
StringUtils.EMPTY));
   }
 
   @Test
@@ -127,14 +121,10 @@

[zeppelin] 02/03: Revert "Added support for Neo4j temporal and point types"

2018-12-20 Thread felixcheung

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

felixcheung pushed a commit to branch revert-3244-update-neo4j-datatypes
in repository https://gitbox.apache.org/repos/asf/zeppelin.git

commit 0193be5b312845f4ea4fed737a0441b001e1b403
Author: Felix Cheung 
AuthorDate: Thu Dec 20 23:03:14 2018 -0800

Revert "Added support for Neo4j temporal and point types"

This reverts commit b98ccea98996eda183382a332379f3cfc428c0e9.
---
 docs/interpreter/neo4j.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/interpreter/neo4j.md b/docs/interpreter/neo4j.md
index eec9e07..1b14127 100644
--- a/docs/interpreter/neo4j.md
+++ b/docs/interpreter/neo4j.md
@@ -26,9 +26,6 @@ limitations under the License.
 ## Overview
 [Neo4j](https://neo4j.com/product/) is a native graph database, designed to 
store and process graphs from bottom to top.
 
-### Supported Version
-
-The Neo4j Interpreter supports all Neo4j versions since v3 via the official 
[Neo4j Java Driver](https://github.com/neo4j/neo4j-java-driver)
 
 ![Neo4j - Interpreter - 
Video]({{BASE_PATH}}/assets/themes/zeppelin/img/docs-img/neo4j-interpreter-video.gif)

[zeppelin] 03/03: Revert "Added support for Neo4j temporal and point types"

2018-12-20 Thread felixcheung

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

felixcheung pushed a commit to branch revert-3244-update-neo4j-datatypes
in repository https://gitbox.apache.org/repos/asf/zeppelin.git

commit 7ae0e418a15540fffb2402391d122219e6819234
Author: Felix Cheung 
AuthorDate: Thu Dec 20 23:03:14 2018 -0800

Revert "Added support for Neo4j temporal and point types"

This reverts commit 0fbcddae980ff245eead964e8a5e0ee0f1a6.
---
 neo4j/pom.xml   | 6 +++---
 .../org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreterTest.java | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/neo4j/pom.xml b/neo4j/pom.xml
index cc39fdc..b8a89ad 100644
--- a/neo4j/pom.xml
+++ b/neo4j/pom.xml
@@ -33,9 +33,9 @@
   Zeppelin: Neo4j interpreter
   
   
-   1.7.1
-   3.4.10
-   3.4.10
+   1.4.3
+   3.2.3
+   3.2.3
2.8.9
 neo4j
   
diff --git 
a/neo4j/src/test/java/org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreterTest.java
 
b/neo4j/src/test/java/org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreterTest.java
index f44cd77..24bd513 100644
--- 
a/neo4j/src/test/java/org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreterTest.java
+++ 
b/neo4j/src/test/java/org/apache/zeppelin/graph/neo4j/Neo4jCypherInterpreterTest.java
@@ -55,9 +55,9 @@ public class Neo4jCypherInterpreterTest {
   private static final String REL_KNOWS = "KNOWS";
 
   private static final String CYPHER_FOREACH =
-  "FOREACH (x in range(1,100) | CREATE (:%s{name: \"name\" + x, age: 
%s, address: point({ longitude: 56.7, latitude: 12.78, height: 8 }), birth: 
date('1984-04-04')}))";
-  private static final String CHPHER_UNWIND = "UNWIND range(1,100) as x "
-+ "MATCH (n), (m) WHERE id(n) = x AND id(m) = toInt(rand() * 100) "
+  "FOREACH (x in range(1,1000) | CREATE (:%s{name: \"name\" + x, age: 
%s}))";
+  private static final String CHPHER_UNWIND = "UNWIND range(1,1000) as x "
++ "MATCH (n), (m) WHERE id(n) = x AND id(m) = toInt(rand() * 1000) "
 + "CREATE (n)-[:%s]->(m)";
 
   @BeforeClass

[zeppelin] branch master updated: Revert "[ZEPPELIN-3882] Neo4jInterpreter - Support Point and Date Types" (#3270)

[zeppelin] branch revert-3244-update-neo4j-datatypes created (now 7ae0e41)

[zeppelin] 01/03: Revert "fix checkstyle"

[zeppelin] 02/03: Revert "Added support for Neo4j temporal and point types"

[zeppelin] 03/03: Revert "Added support for Neo4j temporal and point types"

5 matches

Site Navigation

Mail list logo

Footer information