[incubator-hugegraph-toolchain] branch master updated: fix: Spark Loader example schema and struct mismatch (#504)

[jin]

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

jin pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-hugegraph-toolchain.git


The following commit(s) were added to refs/heads/master by this push:
     new d9f234ae fix: Spark Loader example schema and struct mismatch (#504)
d9f234ae is described below

commit d9f234ae97107f22cb020dcef073d1b8596b6ed7
Author: Liu Xiao <42756849+liuxiao...@users.noreply.github.com>
AuthorDate: Tue Aug 8 00:03:36 2023 +0800

    fix: Spark Loader example schema and struct mismatch (#504)
---
 hugegraph-loader/assembly/static/example/spark/schema.groovy |  6 +++---
 .../static/example/spark/{struct.json => struct-hbase.json}  |  3 +--
 hugegraph-loader/assembly/static/example/spark/struct.json   | 10 +---------
 .../assembly/static/example/spark/vertex_person.json         | 12 ++++++------
 .../assembly/static/example/spark/vertex_software.json       |  4 ++--
 5 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/hugegraph-loader/assembly/static/example/spark/schema.groovy 
b/hugegraph-loader/assembly/static/example/spark/schema.groovy
index 3203d95f..46126b88 100644
--- a/hugegraph-loader/assembly/static/example/spark/schema.groovy
+++ b/hugegraph-loader/assembly/static/example/spark/schema.groovy
@@ -26,13 +26,13 @@ 
schema.propertyKey("price").asDouble().ifNotExist().create();
 
 schema.vertexLabel("person")
       .properties("name", "age", "city")
-      .primaryKeys("name")
+      .useCustomizeStringId()
       .nullableKeys("age", "city")
       .ifNotExist()
       .create();
 schema.vertexLabel("software")
-        .properties("name", "lang", "price")
-        .primaryKeys("name")
+      .properties("name", "lang", "price")
+      .useCustomizeStringId()
       .ifNotExist()
       .create();
 
diff --git a/hugegraph-loader/assembly/static/example/spark/struct.json 
b/hugegraph-loader/assembly/static/example/spark/struct-hbase.json
similarity index 98%
copy from hugegraph-loader/assembly/static/example/spark/struct.json
copy to hugegraph-loader/assembly/static/example/spark/struct-hbase.json
index 275bdbd3..6b909ff3 100644
--- a/hugegraph-loader/assembly/static/example/spark/struct.json
+++ b/hugegraph-loader/assembly/static/example/spark/struct-hbase.json
@@ -46,8 +46,7 @@
       }
     }
   ],
-  "backendStoreInfo":
-  {
+  "backendStoreInfo": {
     "edge_tablename": "hugegraph:g_oe",
     "vertex_tablename": "hugegraph:g_v",
     "hbase_zookeeper_quorum": "127.0.0.1",
diff --git a/hugegraph-loader/assembly/static/example/spark/struct.json 
b/hugegraph-loader/assembly/static/example/spark/struct.json
index 275bdbd3..7f3b7e55 100644
--- a/hugegraph-loader/assembly/static/example/spark/struct.json
+++ b/hugegraph-loader/assembly/static/example/spark/struct.json
@@ -45,13 +45,5 @@
         "target_name": "name"
       }
     }
-  ],
-  "backendStoreInfo":
-  {
-    "edge_tablename": "hugegraph:g_oe",
-    "vertex_tablename": "hugegraph:g_v",
-    "hbase_zookeeper_quorum": "127.0.0.1",
-    "hbase_zookeeper_property_clientPort": "2181",
-    "zookeeper_znode_parent": "/hbase"
-  }
+  ]
 }
diff --git a/hugegraph-loader/assembly/static/example/spark/vertex_person.json 
b/hugegraph-loader/assembly/static/example/spark/vertex_person.json
index e018df41..93e41a96 100644
--- a/hugegraph-loader/assembly/static/example/spark/vertex_person.json
+++ b/hugegraph-loader/assembly/static/example/spark/vertex_person.json
@@ -1,6 +1,6 @@
-{"name": "marko", "age": "29",  "city": "Beijing"}
-{"name": "vadas", "age": "27",  "city": "Hongkong"}
-{"name": "josh", "age": "32",  "city": "Beijing"}
-{"name": "peter", "age": "35",  "city": "Shanghai"}
-{"name": "li,nary", "age": "26",  "city": "Wu,han"}
-{"name": "tom", "age": "null",  "city": "NULL"}
+{"name": "marko", "age": "29", "city": "Beijing"}
+{"name": "vadas", "age": "27", "city": "Hongkong"}
+{"name": "josh", "age": "32", "city": "Beijing"}
+{"name": "peter", "age": "35", "city": "Shanghai"}
+{"name": "li,nary", "age": "26", "city": "Wu,han"}
+{"name": "tom", "age": "null", "city": "NULL"}
diff --git 
a/hugegraph-loader/assembly/static/example/spark/vertex_software.json 
b/hugegraph-loader/assembly/static/example/spark/vertex_software.json
index cd9dbf3c..5ee271d1 100644
--- a/hugegraph-loader/assembly/static/example/spark/vertex_software.json
+++ b/hugegraph-loader/assembly/static/example/spark/vertex_software.json
@@ -1,2 +1,2 @@
-{ "name": "lop",  "lang": "java","price": "328","ISBN": 
"ISBN978-7-107-18618-5"}
-{ "name": "ripple",  "lang": "java","price": "199","ISBN": 
"ISBN978-7-100-13678-5"}
+{"name": "lop", "lang": "java", "price": "328", "ISBN": 
"ISBN978-7-107-18618-5"}
+{"name": "ripple", "lang": "java", "price": "199", "ISBN": 
"ISBN978-7-100-13678-5"}