You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hugegraph.apache.org by ji...@apache.org on 2023/01/16 17:51:34 UTC
[incubator-hugegraph] branch master updated: refact: update with release branch (#2091)
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.git
The following commit(s) were added to refs/heads/master by this push:
new fc6e3702d refact: update with release branch (#2091)
fc6e3702d is described below
commit fc6e3702da5373c9f9d994e7233c14a7d74d610c
Author: imbajin <ji...@apache.org>
AuthorDate: Tue Jan 17 01:51:26 2023 +0800
refact: update with release branch (#2091)
* fix: add style file back for building
* fix: script no permission
* chore: add NOTICE and LICENSE to binary package and add DISCLAIMER file
Co-authored-by: Simon Cheung <mi...@apache.org>
Co-authored-by: vaughn <va...@apache.org>
Co-authored-by: 青年 <10...@qq.com>
---
.gitattributes | 2 --
.../src/main/java/org/apache/hugegraph/structure/HugeEdge.java | 3 +--
hugegraph-dist/src/assembly/static/bin/dump-conf.sh | 4 +++-
hugegraph-dist/src/assembly/static/bin/dump-store.sh | 4 +++-
hugegraph-test/src/main/resources/fast-methods.filter | 5 ++++-
hugegraph-test/src/main/resources/methods.filter | 5 ++++-
6 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/.gitattributes b/.gitattributes
index e66a894fb..636f55aa0 100755
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,7 +2,6 @@
.gitattributes export-ignore
.gitignore export-ignore
.asf.yaml export-ignore
-checkstyle.xml export-ignore
apache-release.sh export-ignore
.licenserc.yaml export-ignore
.editorconfig export-ignore
@@ -10,5 +9,4 @@ apache-release.sh export-ignore
# ignored directory
.github/ export-ignore
hugegraph-dist/scripts/ export-ignore
-style/ export-ignore
#assembly/ export-ignore
diff --git a/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeEdge.java b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeEdge.java
index a1e667cd9..d08c4c21a 100644
--- a/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeEdge.java
+++ b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeEdge.java
@@ -367,8 +367,7 @@ public class HugeEdge extends HugeElement implements Edge, Cloneable {
if (ownerLabel.equals(this.label.sourceLabel())) {
this.vertices(true, owner, other);
} else {
- // TODO: why compare the label but ignore the result?
- ownerLabel.equals(this.label.targetLabel());
+ assert ownerLabel.equals(this.label.targetLabel());
this.vertices(false, owner, other);
}
}
diff --git a/hugegraph-dist/src/assembly/static/bin/dump-conf.sh b/hugegraph-dist/src/assembly/static/bin/dump-conf.sh
index ec8c050a5..70c5fbf3b 100755
--- a/hugegraph-dist/src/assembly/static/bin/dump-conf.sh
+++ b/hugegraph-dist/src/assembly/static/bin/dump-conf.sh
@@ -45,5 +45,7 @@ cd $TOP
echo "Dumping HugeGraph Config($conf)..."
-exec $JAVA -cp $LIB/hugegraph-dist-*.jar -Djava.ext.dirs=$LIB/ \
+dump_conf_ext_jar_path=$LIB/hugegraph-dist-*.jar
+for i in $LIB/*.jar; do dump_conf_ext_jar_path=$dump_conf_ext_jar_path:$i; export dump_conf_ext_jar_path; done
+exec $JAVA -cp dump_conf_ext_jar_path \
org.apache.hugegraph.cmd.ConfDumper $conf
diff --git a/hugegraph-dist/src/assembly/static/bin/dump-store.sh b/hugegraph-dist/src/assembly/static/bin/dump-store.sh
index 798abfd63..dfabfe4ca 100755
--- a/hugegraph-dist/src/assembly/static/bin/dump-store.sh
+++ b/hugegraph-dist/src/assembly/static/bin/dump-store.sh
@@ -45,5 +45,7 @@ cd $TOP
echo "Dumping HugeGraph Store($conf)..."
-exec $JAVA -cp $LIB/hugegraph-dist-*.jar -Djava.ext.dirs=$LIB/ \
+dump_store_ext_jar_path=$LIB/hugegraph-dist-*.jar
+for i in $LIB/*.jar; do dump_store_ext_jar_path=$dump_store_ext_jar_path:$i; export dump_store_ext_jar_path; done
+exec $JAVA -cp dump_store_ext_jar_path \
org.apache.hugegraph.cmd.StoreDumper $conf $2 $3 $4
diff --git a/hugegraph-test/src/main/resources/fast-methods.filter b/hugegraph-test/src/main/resources/fast-methods.filter
index 85f099a46..2d162bd70 100644
--- a/hugegraph-test/src/main/resources/fast-methods.filter
+++ b/hugegraph-test/src/main/resources/fast-methods.filter
@@ -95,6 +95,9 @@ org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceEdgeTest.shouldCo
# unsupported automatic edge id, therefore number of edge is wrong
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.EventStrategyProcessTest.shouldTriggerAddEdge: Unsupported automatic edge id, therefore number of edge is wrong
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.EventStrategyProcessTest.shouldTriggerAddEdgeByPath: Unsupported automatic edge id, therefore number of edge is wrong
+# shouldWriteToMultiplePartitions
+org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategyProcessTest.shouldWriteToMultiplePartitions: It's not allowed to query by index when there are uncommitted records
+org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategyProcessTest.shouldWriteVerticesToMultiplePartitions: It's not allowed to query by index when there are uncommitted records
# assert error, long time, reason: replicated edges treated as one
org.apache.tinkerpop.gremlin.process.traversal.step.map.CountTest.Traversals.g_V_both_both_count: Replicated edges treated as one
@@ -165,7 +168,7 @@ org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTest.Traversals.g_
org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTest.Traversals.g_V_hasXname_not_endingWithXasXX: Unsupported predicate 'notEndingWith(as)'
org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTest.Traversals.g_V_hasXage_withoutX27_29X_count: Unsupported relation 'NEQ'
org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTest.Traversals.g_V_hasXname_gtXmX_andXcontainingXoXXX: Unsupported predicate 'containing(o)'
-org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTest.g_V_hasXp_neqXvXX: Unsupported relation 'NEQ'
+org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTest.Traversals.g_V_hasXp_neqXvXX: Don't accept query based on properties [p] that are not indexed in any label, may not match not-equal condition
# Unsupport edge label 'created': 'software' -> 'person', has existed an edgelabel (created: person -> software) in this case
org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeTest.Traversals.g_V_hasXname_markoX_asXaX_outEXcreatedX_asXbX_inV_addEXselectXbX_labelX_toXaX: Unsupport edge from inV to outV
diff --git a/hugegraph-test/src/main/resources/methods.filter b/hugegraph-test/src/main/resources/methods.filter
index d32d3126e..d4b7c3e78 100644
--- a/hugegraph-test/src/main/resources/methods.filter
+++ b/hugegraph-test/src/main/resources/methods.filter
@@ -94,6 +94,9 @@ org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceEdgeTest.shouldCo
# unsupported automatic edge id, therefore number of edge is wrong
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.EventStrategyProcessTest.shouldTriggerAddEdge: Unsupported automatic edge id, therefore number of edge is wrong
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.EventStrategyProcessTest.shouldTriggerAddEdgeByPath: Unsupported automatic edge id, therefore number of edge is wrong
+# shouldWriteToMultiplePartitions
+org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategyProcessTest.shouldWriteToMultiplePartitions: It's not allowed to query by index when there are uncommitted records
+org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategyProcessTest.shouldWriteVerticesToMultiplePartitions: It's not allowed to query by index when there are uncommitted records
# assert error, long time, reason: replicated edges treated as one
org.apache.tinkerpop.gremlin.process.traversal.step.map.CountTest.Traversals.g_V_both_both_count: Replicated edges treated as one
@@ -128,7 +131,7 @@ org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTest.Traversals.g_
org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTest.Traversals.g_V_hasXname_not_endingWithXasXX: Unsupported predicate 'notEndingWith(as)'
org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTest.Traversals.g_V_hasXage_withoutX27_29X_count: Unsupported relation 'NEQ'
org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTest.Traversals.g_V_hasXname_gtXmX_andXcontainingXoXXX: Unsupported predicate 'containing(o)'
-org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTest.g_V_hasXp_neqXvXX: Unsupported relation 'NEQ'
+org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTest.Traversals.g_V_hasXp_neqXvXX: Don't accept query based on properties [p] that are not indexed in any label, may not match not-equal condition
# Unsupport edge label 'created': 'software' -> 'person', has existed an edgelabel (created: person -> software) in this case
org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeTest.Traversals.g_V_hasXname_markoX_asXaX_outEXcreatedX_asXbX_inV_addEXselectXbX_labelX_toXaX: Unsupport edge from inV to outV