Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix IdSet.contains() not override AbstractCollection.contains() #1511

Merged
merged 2 commits into from
Jun 24, 2021
Merged

fix IdSet.contains() not override AbstractCollection.contains() #1511

merged 2 commits into from
Jun 24, 2021

Conversation

zhoney
Copy link
Contributor

@zhoney zhoney commented Jun 22, 2021

Change-Id: I483aefdf692c766248255f0ce872908fffddd8a8

@zhoney
fix IdSet.contains() not override AbstractCollection.contains()
83f77ff 
Change-Id: I483aefdf692c766248255f0ce872908fffddd8a8
@zhoney zhoney force-pushed the fix-idSet-contains branch from c36f150 to 83f77ff Compare June 22, 2021 14:30
imbajin
imbajin approved these changes Jun 23, 2021
View reviewed changes
Copy link
Member

@imbajin imbajin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe we could have a basic perf test later (compare speed)

@zhoney
Empty test for CI
1cd17cd 
Change-Id: I4241c2dc7ca3205bf415b66c10c5cc4abdb4ea08
@codecov
Copy link

codecov bot commented Jun 24, 2021 •
edited
Loading

Codecov Report

Merging #1511 (1cd17cd) into master (0c51de5) will decrease coverage by 0.55%.
The diff coverage is 33.33%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #1511      +/-   ##
============================================
- Coverage     60.02%   59.46%   -0.56%     
- Complexity      305     6113    +5808     
============================================
  Files           426      406      -20     
  Lines         35096    33064    -2032     
  Branches       4970     4574     -396     
============================================
- Hits          21065    19661    -1404     
+ Misses        11894    11340     -554     
+ Partials       2137     2063      -74
Impacted Files Coverage Δ
...ava/com/baidu/hugegraph/util/collection/IdSet.java 83.87% <33.33%> (-5.42%) ⬇️
...raph/backend/store/postgresql/PostgresqlStore.java 0.00% <0.00%> (-100.00%) ⬇️
...raph/backend/store/postgresql/PostgresqlTable.java 0.00% <0.00%> (-96.83%) ⬇️
...kend/store/postgresql/PostgresqlStoreProvider.java 0.00% <0.00%> (-92.50%) ⬇️
...aph/backend/store/postgresql/PostgresqlTables.java 0.00% <0.00%> (-87.96%) ⬇️
...raph/backend/store/cassandra/CassandraMetrics.java 0.00% <0.00%> (-86.96%) ⬇️
...du/hugegraph/backend/store/hbase/HbaseMetrics.java 0.00% <0.00%> (-86.85%) ⬇️
...ugegraph/backend/store/rocksdb/RocksDBMetrics.java 0.00% <0.00%> (-85.87%) ⬇️
...hugegraph/backend/store/mysql/MysqlSerializer.java 0.00% <0.00%> (-82.46%) ⬇️
...u/hugegraph/backend/store/mysql/MysqlFeatures.java 0.00% <0.00%> (-80.96%) ⬇️
... and 55 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0c51de5...1cd17cd. Read the comment docs.

@zhoney
Copy link
Contributor Author

zhoney commented Jun 24, 2021 •
edited
Loading

ScyllaDB CI failed:

Error:  Tests run: 689, Failures: 0, Errors: 25, Skipped: 25, Time elapsed: 605.786 s <<< FAILURE! - in com.baidu.hugegraph.core.CoreTestSuite
Error:  testQueryEdgesByHasValues(com.baidu.hugegraph.core.EdgeCoreTest)  Time elapsed: 0.105 s  <<< ERROR!
com.baidu.hugegraph.exception.ExistedException: The edge label 'transfer' has existed
	at com.baidu.hugegraph.core.EdgeCoreTest.initSchema(EdgeCoreTest.java:143)

Error:  testAddEdgeWithTtlAndTtlStartTime(com.baidu.hugegraph.core.EdgeCoreTest)  Time elapsed: 0.2 s  <<< ERROR!
com.baidu.hugegraph.exception.ExistedException: The edge label 'authored' has existed
	at com.baidu.hugegraph.core.EdgeCoreTest.initSchema(EdgeCoreTest.java:149)

Error:  testQueryAllEdgesWithGraphAPI(com.baidu.hugegraph.core.EdgeCoreTest)  Time elapsed: 0.139 s  <<< ERROR!
com.baidu.hugegraph.exception.ExistedException: The edge label 'write' has existed
	at com.baidu.hugegraph.core.EdgeCoreTest.initSchema(EdgeCoreTest.java:154)

Error:  testQueryEdgesWithOrderBy(com.baidu.hugegraph.core.EdgeCoreTest)  Time elapsed: 0.164 s  <<< ERROR!
com.baidu.hugegraph.exception.ExistedException: The edge label 'look' has existed
	at com.baidu.hugegraph.core.EdgeCoreTest.initSchema(EdgeCoreTest.java:160)

Error:  testQueryEdgesOfVertexWithCustomizeId(com.baidu.hugegraph.core.EdgeCoreTest)  Time elapsed: 0.158 s  <<< ERROR!
com.baidu.hugegraph.exception.ExistedException: The edge label 'know' has existed
	at com.baidu.hugegraph.core.EdgeCoreTest.initSchema(EdgeCoreTest.java:164)

Error:  testQueryEdgeBeforeAfterUpdateMultiPropertyWithIndex(com.baidu.hugegraph.core.EdgeCoreTest)  Time elapsed: 0.168 s  <<< ERROR!
com.baidu.hugegraph.exception.ExistedException: The edge label 'followedBy' has existed
	at com.baidu.hugegraph.core.EdgeCoreTest.initSchema(EdgeCoreTest.java:168)

Error:  testUpdateEdgePropertyOfAggregateType(com.baidu.hugegraph.core.EdgeCoreTest)  Time elapsed: 0.2 s  <<< ERROR!
com.baidu.hugegraph.exception.ExistedException: The edge label 'friend' has existed
	at com.baidu.hugegraph.core.EdgeCoreTest.initSchema(EdgeCoreTest.java:172)

Error:  testAddEdgePropertyWithNotExistPropKey(com.baidu.hugegraph.core.EdgeCoreTest)  Time elapsed: 0.194 s  <<< ERROR!
com.baidu.hugegraph.exception.ExistedException: The edge label 'follow' has existed
	at com.baidu.hugegraph.core.EdgeCoreTest.initSchema(EdgeCoreTest.java:176)

Error:  testQueryEdgesOfVertex(com.baidu.hugegraph.core.EdgeCoreTest)  Time elapsed: 0.223 s  <<< ERROR!
com.baidu.hugegraph.exception.ExistedException: The edge label 'created' has existed
	at com.baidu.hugegraph.core.EdgeCoreTest.initSchema(EdgeCoreTest.java:180)

Error:  testQueryEdgeWithSecondaryIndexAndTtlInTx(com.baidu.hugegraph.core.EdgeCoreTest)  Time elapsed: 0.241 s  <<< ERROR!
com.baidu.hugegraph.exception.ExistedException: The edge label 'strike' has existed
	at com.baidu.hugegraph.core.EdgeCoreTest.initSchema(EdgeCoreTest.java:187)

Error:  testAddEdgePropertyWithIllegalValueForIndex(com.baidu.hugegraph.core.EdgeCoreTest)  Time elapsed: 0.23 s  <<< ERROR!
com.baidu.hugegraph.exception.ExistedException: The edge label 'read' has existed
	at com.baidu.hugegraph.core.EdgeCoreTest.initSchema(EdgeCoreTest.java:193)

Error:  testQueryByOutEWithDateProperty(com.baidu.hugegraph.core.EdgeCoreTest)  Time elapsed: 0.253 s  <<< ERROR!
com.baidu.hugegraph.exception.ExistedException: The edge label 'borrow' has existed
	at com.baidu.hugegraph.core.EdgeCoreTest.initSchema(EdgeCoreTest.java:200)

Error:  testListAccess(com.baidu.hugegraph.core.AuthTest)  Time elapsed: 0.146 s  <<< ERROR!
java.lang.IllegalArgumentException: Undefined property key: '~access_creator'
	at com.baidu.hugegraph.core.AuthTest.testListAccess(AuthTest.java:995)

Error:  testListBelong(com.baidu.hugegraph.core.AuthTest)  Time elapsed: 0.153 s  <<< ERROR!
java.lang.IllegalArgumentException: Undefined property key: '~belong_update'
	at com.baidu.hugegraph.core.AuthTest.testListBelong(AuthTest.java:691)

Error:  testUpdateAccess(com.baidu.hugegraph.core.AuthTest)  Time elapsed: 0.147 s  <<< ERROR!
java.lang.IllegalArgumentException: Undefined property key: '~access_creator'
	at com.baidu.hugegraph.core.AuthTest.testUpdateAccess(AuthTest.java:1099)

Error:  testUpdateBelong(com.baidu.hugegraph.core.AuthTest)  Time elapsed: 0.139 s  <<< ERROR!
java.lang.IllegalArgumentException: Undefined property key: '~belong_description'
	at com.baidu.hugegraph.core.AuthTest.testUpdateBelong(AuthTest.java:793)

Error:  testDeleteAccess(com.baidu.hugegraph.core.AuthTest)  Time elapsed: 0.182 s  <<< ERROR!
java.lang.IllegalArgumentException: Undefined property key: '~access_creator'
	at com.baidu.hugegraph.core.AuthTest.testDeleteAccess(AuthTest.java:1160)

Error:  testDeleteBelong(com.baidu.hugegraph.core.AuthTest)  Time elapsed: 0.141 s  <<< ERROR!
java.lang.IllegalArgumentException: Undefined property key: '~belong_update'
	at com.baidu.hugegraph.core.AuthTest.testDeleteBelong(AuthTest.java:833)

Error:  testRolePermission(com.baidu.hugegraph.core.AuthTest)  Time elapsed: 0.171 s  <<< ERROR!
java.lang.IllegalArgumentException: Undefined property key: '~belong_update'
	at com.baidu.hugegraph.core.AuthTest.testRolePermission(AuthTest.java:1220)

Error:  testListAllAccess(com.baidu.hugegraph.core.AuthTest)  Time elapsed: 0.147 s  <<< ERROR!
java.lang.IllegalArgumentException: Undefined property key: '~access_creator'
	at com.baidu.hugegraph.core.AuthTest.testListAllAccess(AuthTest.java:1040)

Error:  testListAllBelong(com.baidu.hugegraph.core.AuthTest)  Time elapsed: 0.145 s  <<< ERROR!
java.lang.IllegalArgumentException: Undefined property key: '~belong_update'
	at com.baidu.hugegraph.core.AuthTest.testListAllBelong(AuthTest.java:734)

Error:  testGetAccess(com.baidu.hugegraph.core.AuthTest)  Time elapsed: 0.151 s  <<< ERROR!
java.lang.IllegalArgumentException: Undefined property key: '~access_creator'
	at com.baidu.hugegraph.core.AuthTest.testGetAccess(AuthTest.java:1066)

Error:  testGetBelong(com.baidu.hugegraph.core.AuthTest)  Time elapsed: 0.147 s  <<< ERROR!
java.lang.IllegalArgumentException: Undefined property key: '~belong_update'
	at com.baidu.hugegraph.core.AuthTest.testGetBelong(AuthTest.java:758)

Error:  testCreateAccess(com.baidu.hugegraph.core.AuthTest)  Time elapsed: 0.152 s  <<< ERROR!
java.lang.IllegalArgumentException: Undefined property key: '~access_creator'
	at com.baidu.hugegraph.core.AuthTest.testCreateAccess(AuthTest.java:865)

Error:  testCreateBelong(com.baidu.hugegraph.core.AuthTest)  Time elapsed: 0.145 s  <<< ERROR!
java.lang.IllegalArgumentException: Undefined property key: '~belong_update'
	at com.baidu.hugegraph.core.AuthTest.testCreateBelong(AuthTest.java:611)

Error: Exception in thread "hugegraph-shutdown" com.baidu.hugegraph.HugeException: Failed to shutdown
	at com.baidu.hugegraph.HugeFactory.shutdown(HugeFactory.java:144)
2021-06-24 11:34:40 [hugegraph-shutdown] [INFO] c.b.h.HugeGraph - HugeGraph is shutting down
	at com.baidu.hugegraph.HugeFactory.lambda$static$0(HugeFactory.java:52)
Error: -24 11:34:40 [hugegraph-shutdown] [ERROR] c.b.h.HugeGraph - Error while shutdown
	at java.lang.Thread.run(Thread.java:748)
java.lang.AssertionError: 2
Caused by: java.lang.AssertionError: 2
	at com.baidu.hugegraph.task.TaskManager.shutdown(TaskManager.java:180)
	at com.baidu.hugegraph.HugeFactory.shutdown(HugeFactory.java:140)
	... 2 more
	at com.baidu.hugegraph.task.TaskManager.shutdown(TaskManager.java:180) ~[classes/:?]
	at com.baidu.hugegraph.HugeFactory.shutdown(HugeFactory.java:140) ~[classes/:?]
	at com.baidu.hugegraph.HugeFactory.lambda$static$0(HugeFactory.java:52) ~[classes/:?]
	at java.lang.Thread.run(Thread.java:748) [?:1.8.0_292]
[INFO] 
[INFO] Results:
[INFO] 
Error:  Errors: 
Error:    AuthTest.testCreateAccess:865 » IllegalArgument Undefined property key: '~acce...
Error:    AuthTest.testCreateBelong:611 » IllegalArgument Undefined property key: '~belo...
Error:    AuthTest.testDeleteAccess:1160 » IllegalArgument Undefined property key: '~acc...
Error:    AuthTest.testDeleteBelong:833 » IllegalArgument Undefined property key: '~belo...
Error:    AuthTest.testGetAccess:1066 » IllegalArgument Undefined property key: '~access...
Error:    AuthTest.testGetBelong:758 » IllegalArgument Undefined property key: '~belong_...
Error:    AuthTest.testListAccess:995 » IllegalArgument Undefined property key: '~access...
Error:    AuthTest.testListAllAccess:1040 » IllegalArgument Undefined property key: '~ac...
Error:    AuthTest.testListAllBelong:734 » IllegalArgument Undefined property key: '~bel...
Error:    AuthTest.testListBelong:691 » IllegalArgument Undefined property key: '~belong...
Error:    AuthTest.testRolePermission:1220 » IllegalArgument Undefined property key: '~b...
Error:    AuthTest.testUpdateAccess:1099 » IllegalArgument Undefined property key: '~acc...
Error:    AuthTest.testUpdateBelong:793 » IllegalArgument Undefined property key: '~belo...
Error:    EdgeCoreTest.initSchema:193 » Existed The edge label 'read' has existed
Error:    EdgeCoreTest.initSchema:176 » Existed The edge label 'follow' has existed
Error:    EdgeCoreTest.initSchema:149 » Existed The edge label 'authored' has existed
Error:    EdgeCoreTest.initSchema:154 » Existed The edge label 'write' has existed
Error:    EdgeCoreTest.initSchema:200 » Existed The edge label 'borrow' has existed
Error:    EdgeCoreTest.initSchema:168 » Existed The edge label 'followedBy' has existed
Error:    EdgeCoreTest.initSchema:187 » Existed The edge label 'strike' has existed
Error:    EdgeCoreTest.initSchema:143 » Existed The edge label 'transfer' has existed
Error:    EdgeCoreTest.initSchema:180 » Existed The edge label 'created' has existed
Error:    EdgeCoreTest.initSchema:164 » Existed The edge label 'know' has existed
Error:    EdgeCoreTest.initSchema:160 » Existed The edge label 'look' has existed
Error:    EdgeCoreTest.initSchema:172 » Existed The edge label 'friend' has existed
[INFO] 
Error:  Tests run: 689, Failures: 0, Errors: 25, Skipped: 25

@javeme javeme merged commit 44fc43c into master Jun 24, 2021
@javeme javeme deleted the fix-idSet-contains branch June 24, 2021 12:04
jadepeng pushed a commit to jadepeng/hugegraph that referenced this pull request Jun 25, 2021
@zhoney
fix IdSet.contains() not override AbstractCollection.contains() (apac…
5130f12 
…he#1511)

Change-Id: I483aefdf692c766248255f0ce872908fffddd8a8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@imbajin imbajin imbajin approved these changes

@javeme javeme javeme approved these changes

@Linary Linary Linary approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@zhoney @Linary @javeme @imbajin