From 975bba5786ba9c82d40290f798b836aa37f0691f Mon Sep 17 00:00:00 2001 From: VGalaxies Date: Thu, 4 Jul 2024 19:26:57 +0800 Subject: [PATCH] fix test --- .../org/apache/hugegraph/api/MetricsApiTest.java | 3 +++ .../org/apache/hugegraph/core/BaseCoreTest.java | 9 +++++++++ .../org/apache/hugegraph/core/EdgeCoreTest.java | 5 +++-- .../org/apache/hugegraph/core/MultiGraphsTest.java | 14 +++++++------- .../org/apache/hugegraph/core/VertexCoreTest.java | 11 +++++++++-- 5 files changed, 31 insertions(+), 11 deletions(-) diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/MetricsApiTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/MetricsApiTest.java index 0ff6151e30..e93373c1a3 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/MetricsApiTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/MetricsApiTest.java @@ -299,6 +299,9 @@ public void testMetricsBackend() { } } break; + case "hstore": + // TODO(metrics): check metrics info + break; default: Assert.fail("Unexpected backend " + backend); break; diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/BaseCoreTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/BaseCoreTest.java index dea160b080..a042533843 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/BaseCoreTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/BaseCoreTest.java @@ -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; @@ -90,6 +91,9 @@ public static void clear() { public void setup() { this.clearData(); this.clearSchema(); + // QUESTION: here we should consider to clear cache + // but with this line of code, many ci will fail + // this.clearCache(); } @After @@ -146,6 +150,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()) { diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/EdgeCoreTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/EdgeCoreTest.java index b1935488a5..1189356bf2 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/EdgeCoreTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/EdgeCoreTest.java @@ -517,7 +517,7 @@ public void testAddEdgeWithInvalidSortkey() { Assert.assertContains("Zero bytes may not occur in string " + "parameters", e.getCause().getMessage()); }); - } else if (backend.equals("rocksdb") || backend.equals("hbase")) { + } else if (ImmutableSet.of("rocksdb", "hbase", "hstore").contains(backend)) { Assert.assertThrows(IllegalArgumentException.class, () -> { james.addEdge("write", book, "time", "2017-5-27\u0000"); graph.tx().commit(); @@ -5195,6 +5195,7 @@ public void testScanEdgeInPaging() { query.scan(String.valueOf(Long.MIN_VALUE), String.valueOf(Long.MAX_VALUE)); } else { + // QUESTION：The query method may not be well adapted query.scan(BackendTable.ShardSplitter.START, BackendTable.ShardSplitter.END); } @@ -5822,7 +5823,7 @@ public void testAddEdgePropertyWithSpecialValueForSecondaryIndex() { String backend = graph.backend(); Set nonZeroBackends = ImmutableSet.of("postgresql", - "rocksdb", "hbase"); + "rocksdb", "hbase", "hstore"); if (nonZeroBackends.contains(backend)) { Assert.assertThrows(Exception.class, () -> { louise.addEdge("strike", sean, "id", 4, diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/MultiGraphsTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/MultiGraphsTest.java index 85c2e33c73..0849567988 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/MultiGraphsTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/MultiGraphsTest.java @@ -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(); @@ -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()); diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/VertexCoreTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/VertexCoreTest.java index 585734cf40..f009cec855 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/VertexCoreTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/VertexCoreTest.java @@ -76,6 +76,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.junit.After; import org.junit.Assume; import org.junit.Before; import org.junit.Test; @@ -156,6 +157,12 @@ public void initSchema() { .create(); } + @After + public void resetGraphMode() { + // In OLAP-related tests, if an error occurs midway, the graph mode will not be reset. + graph().readMode(GraphReadMode.OLTP_ONLY); + } + protected void initPersonIndex(boolean indexCity) { SchemaManager schema = graph().schema(); @@ -6247,7 +6254,7 @@ public void testAddVertexPropertyWithSpecialValueForSecondaryIndex() { String backend = graph.backend(); Set nonZeroBackends = ImmutableSet.of("postgresql", - "rocksdb", "hbase"); + "rocksdb", "hbase", "hstore"); if (nonZeroBackends.contains(backend)) { Assert.assertThrows(Exception.class, () -> { graph.addVertex(T.label, "person", "name", "0", @@ -9064,7 +9071,7 @@ public void testQueryBySearchIndexWithSpecialSymbol() { Assert.assertEquals(0, vertices.size()); String backend = graph.backend(); - if (ImmutableSet.of("rocksdb", "hbase").contains(backend)) { + if (ImmutableSet.of("rocksdb", "hbase", "hstore").contains(backend)) { Assert.assertThrows(Exception.class, () -> { graph.addVertex(T.label, "person", "name", "0", "city", "xyz\u0000efg", "age", 0);