From 84d6e43f01ce57b8372462aa2d7efaac874640ce Mon Sep 17 00:00:00 2001 From: Petr Janouch Date: Fri, 11 Feb 2022 14:11:27 +0100 Subject: [PATCH] Deprecating apoc.warmup.run procedure Also changing tests of the procedure not to assert the exact number of loaded pages as this is extremely kernel-internals specific --- core/src/main/java/apoc/warmup/Warmup.java | 1 + core/src/test/java/apoc/warmup/WarmupTest.java | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/apoc/warmup/Warmup.java b/core/src/main/java/apoc/warmup/Warmup.java index 64081edf8e..0ae01c25e0 100644 --- a/core/src/main/java/apoc/warmup/Warmup.java +++ b/core/src/main/java/apoc/warmup/Warmup.java @@ -62,6 +62,7 @@ private String subPath(File file, String fromParent) { return sb.toString(); } + @Deprecated @Procedure @Description("apoc.warmup.run(loadProperties=false,loadDynamicProperties=false,loadIndexes=false) - quickly loads all nodes and rels into memory by skipping one page at a time") public Stream run(@Name(value = "loadProperties", defaultValue = "false") boolean loadProperties, @Name(value = "loadDynamicProperties", defaultValue = "false") boolean loadDynamicProperties, @Name(value = "loadIndexes", defaultValue = "false") boolean loadIndexes) throws IOException { diff --git a/core/src/test/java/apoc/warmup/WarmupTest.java b/core/src/test/java/apoc/warmup/WarmupTest.java index e31f4ec9ed..5ce3bf9b13 100644 --- a/core/src/test/java/apoc/warmup/WarmupTest.java +++ b/core/src/test/java/apoc/warmup/WarmupTest.java @@ -8,6 +8,7 @@ import org.neo4j.test.rule.ImpermanentDbmsRule; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; /** * @author Sascha Peukert @@ -37,9 +38,9 @@ public void setUp() throws Exception { public void testWarmup() throws Exception { TestUtil.testCall(db, "CALL apoc.warmup.run()", r -> { assertEquals(4L, r.get("nodesTotal")); - assertEquals(2L, r.get("nodePages")); + assertNotEquals(0L, r.get("nodePages")); assertEquals(2L, r.get("relsTotal")); - assertEquals(2L, r.get("relPages")); + assertNotEquals(0L, r.get("relPages")); }); } @@ -47,7 +48,7 @@ public void testWarmup() throws Exception { public void testWarmupProperties() throws Exception { TestUtil.testCall(db, "CALL apoc.warmup.run(true)", r -> { assertEquals(true, r.get("propertiesLoaded")); - assertEquals(5L, r.get("propPages")); + assertNotEquals(0L, r.get("propPages")); }); } @@ -56,7 +57,7 @@ public void testWarmupDynamicProperties() throws Exception { TestUtil.testCall(db, "CALL apoc.warmup.run(true,true)", r -> { assertEquals(true, r.get("propertiesLoaded")); assertEquals(true, r.get("dynamicPropertiesLoaded")); - assertEquals(5L, r.get("arrayPropPages")); + assertNotEquals(0L, r.get("arrayPropPages")); }); } @@ -64,7 +65,7 @@ public void testWarmupDynamicProperties() throws Exception { public void testWarmupIndexes() throws Exception { TestUtil.testCall(db, "CALL apoc.warmup.run(true,true,true)", r -> { assertEquals(true, r.get("indexesLoaded")); - assertEquals(6L, r.get("indexPages")); + assertNotEquals( 0L, r.get("indexPages") ); }); } }