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

fix(pd-store): fix hstore backend core tests failure #2431

Merged
merged 17 commits into from
Feb 27, 2024
Merged

fix(pd-store): fix hstore backend core tests failure #2431

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9cf9fd9
fix global sharing schemaCache into exclusive schemaGraph
Pengzna Jan 29, 2024
0e39162
fix: before test cache error
Pengzna Feb 7, 2024
a028199
Merge branch 'apache:pd-store' into pd-store
Pengzna Feb 19, 2024
8b66701
fix: add comment
Pengzna Feb 19, 2024
bfbec02
fix: uncomment cache
Pengzna Feb 19, 2024
449927f
add some question
Pengzna Feb 25, 2024
982520a
migrate api fix
Pengzna Feb 25, 2024
66dfe3d
Merge remote-tracking branch 'base/pd-store' into pd-store
Pengzna Feb 25, 2024
cc62b48
skip grpc check
Pengzna Feb 25, 2024
a63dbbb
skip tmp file license check
Pengzna Feb 25, 2024
cdd751c
Revert "migrate api fix"
Pengzna Feb 25, 2024
8ad7d3b
try ci
Pengzna Feb 25, 2024
a8a146f
chore: reset issues related to hstore data access
VGalaxies Feb 26, 2024
f6771d8
fix: SchemaJob ISchemaTransaction
VGalaxies Feb 26, 2024
fb3bd87
clear cache
Pengzna Feb 26, 2024
ad5e00f
skip tmp rat check
Pengzna Feb 26, 2024
5cb2033
Revert "clear cache"
Pengzna Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...-server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/CacheManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,8 @@
"Invalid cache implement: %s", cache.getClass());
return cache;
}

public void clearCache() {
this.caches.clear();
}

Check warning on line 157 in hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/CacheManager.java

View check run for this annotation

Codecov / codecov/patch

hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/CacheManager.java#L156-L157 

Added lines #L156 - L157 were not covered by tests
}
4 changes: 1 addition & 3 deletions ...raph-core/src/main/java/org/apache/hugegraph/backend/cache/CachedSchemaTransactionV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,7 @@
}

private Cache<Id, Object> cache(String prefix, long capacity) {
// TODO: uncomment later - graph space
Pengzna marked this conversation as resolved.
Show resolved Hide resolved
//final String name = prefix + "-" + this.graph().spaceGraphName();
final String name = prefix + "-" + "";
final String name = prefix + "-" + this.graphName();

Check warning on line 88 in hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/CachedSchemaTransactionV2.java

View check run for this annotation

Codecov / codecov/patch

hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/CachedSchemaTransactionV2.java#L88 

Added line #L88 was not covered by tests
// NOTE: must disable schema cache-expire due to getAllSchema()
return CacheManager.instance().cache(name, capacity);
}
Expand Down
7 changes: 7 additions & 0 deletions hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/BaseCoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import org.apache.hugegraph.HugeGraph;
import org.apache.hugegraph.HugeGraphParams;
import org.apache.hugegraph.backend.cache.CacheManager;
import org.apache.hugegraph.backend.store.BackendFeatures;
import org.apache.hugegraph.dist.RegisterUtil;
import org.apache.hugegraph.masterelection.GlobalMasterInfo;
Expand Down Expand Up @@ -90,6 +91,7 @@ public static void clear() {
public void setup() {
this.clearData();
this.clearSchema();
this.clearCache();
}

@After
Expand Down Expand Up @@ -146,6 +148,11 @@ private void clearSchema() {
});
}

private void clearCache() {
CacheManager cacheManager = CacheManager.instance();
cacheManager.clearCache();
}

protected void mayCommitTx() {
// Commit tx probabilistically for test
if (new Random().nextBoolean()) {
Expand Down
14 changes: 7 additions & 7 deletions hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/MultiGraphsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ public void testCopySchemaWithMultiGraphs() {

SchemaManager schema = g1.schema();

schema.propertyKey("id").asInt().create();
schema.propertyKey("name").asText().create();
schema.propertyKey("age").asInt().valueSingle().create();
schema.propertyKey("city").asText().create();
schema.propertyKey("weight").asDouble().valueList().create();
schema.propertyKey("id").asInt().checkExist(false).create();
schema.propertyKey("name").asText().checkExist(false).create();
schema.propertyKey("age").asInt().valueSingle().checkExist(false).create();
schema.propertyKey("city").asText().checkExist(false).create();
schema.propertyKey("weight").asDouble().valueList().checkExist(false).create();
schema.propertyKey("born").asDate().ifNotExist().create();
schema.propertyKey("time").asDate().ifNotExist().create();

Expand Down Expand Up @@ -211,8 +211,8 @@ public void testCopySchemaWithMultiGraphsWithConflict() {
g1.serverStarted(GlobalMasterInfo.master("server-g1c"));
g2.serverStarted(GlobalMasterInfo.master("server-g2c"));

g1.schema().propertyKey("id").asInt().create();
g2.schema().propertyKey("id").asText().create();
g1.schema().propertyKey("id").asInt().checkExist(false).create();
g2.schema().propertyKey("id").asText().checkExist(false).create();

Assert.assertThrows(ExistedException.class, () -> {
g2.schema().copyFrom(g1.schema());
Expand Down
Loading