Skip to content

Commit

Permalink
refact: update with release branch (apache#2091)
Browse files Browse the repository at this point in the history
* 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 <ming@apache.org>
Co-authored-by: vaughn <vaughn@apache.org>
Co-authored-by: 青年 <1043706593@qq.com>
  • Loading branch information
4 people authored Jan 16, 2023
1 parent 91a616b commit fc6e370
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 8 deletions.
2 changes: 0 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
.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

# ignored directory
.github/ export-ignore
hugegraph-dist/scripts/ export-ignore
style/ export-ignore
#assembly/ export-ignore
Original file line number Diff line number Diff line change
Expand Up @@ -367,8 +367,7 @@ public void vertices(HugeVertex owner, HugeVertex other) {
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);
}
}
Expand Down
4 changes: 3 additions & 1 deletion hugegraph-dist/src/assembly/static/bin/dump-conf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 3 additions & 1 deletion hugegraph-dist/src/assembly/static/bin/dump-store.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 4 additions & 1 deletion hugegraph-test/src/main/resources/fast-methods.filter
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion hugegraph-test/src/main/resources/methods.filter
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit fc6e370

Please sign in to comment.