From e563ee03288597f631443036cf7ac738d2d7e6b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9D=92=E5=B9=B4?= <1043706593@qq.com> Date: Fri, 18 Nov 2022 22:06:48 +0800 Subject: [PATCH 1/4] fix CodeQL v1 --- .../hugegraph/backend/store/BackendTable.java | 4 ++-- .../com/baidu/hugegraph/util/ConfigUtil.java | 6 ++++-- .../backend/store/hbase/HbaseMetrics.java | 3 ++- .../backend/store/hbase/HbaseSessions.java | 7 +++++-- .../com/baidu/hugegraph/core/EdgeCoreTest.java | 16 ++++++++-------- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendTable.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendTable.java index f8ec5fe238..6fb564df04 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendTable.java +++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendTable.java @@ -193,13 +193,13 @@ public List getSplits(Session session, long splitSize) { count = 1; } long maxKey = this.maxKey(); - double each = maxKey / count; + Double each = maxKey / count; List splits = new ArrayList<>((int) count); String last = START; long offset = 0L; while (offset < maxKey) { - offset += each; + offset += each.longValue(); if (offset > maxKey) { splits.add(new Shard(last, END, 0L)); break; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/ConfigUtil.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/util/ConfigUtil.java index 5dea629106..e2ec19a233 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/ConfigUtil.java +++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/util/ConfigUtil.java @@ -110,9 +110,11 @@ public static Map scanGraphsDir(String graphsDirPath) { public static String writeToFile(String dir, String graphName, HugeConfig config) { - E.checkArgument(FileUtils.getFile(dir).exists(), + File file = FileUtils.getFile(dir); + E.checkArgument(file.exists(), "The directory '%s' must exist", dir); - String fileName = Paths.get(dir, graphName + CONF_SUFFIX).toString(); + String tmpGraphName = graphName + CONF_SUFFIX; + String fileName = Paths.get(dir, tmpGraphName).toString(); try { config.save(new File(fileName)); LOG.info("Write HugeConfig to file: '{}'", fileName); diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseMetrics.java b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseMetrics.java index ed17ff0be3..beeca6fc4c 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseMetrics.java +++ b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseMetrics.java @@ -127,7 +127,8 @@ private static Map formatMetrics( .values(); long fileSizeBytes = 0L; for (RegionMetrics region : regions) { - fileSizeBytes += region.getStoreFileSize().get(Size.Unit.BYTE); + Double tempValue = region.getStoreFileSize().get(Size.Unit.BYTE); + fileSizeBytes += tempValue.longValue(); } metrics.put(DISK_USAGE, UnitUtil.bytesToGB(fileSizeBytes)); metrics.put(DISK_USAGE + READABLE, diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java index 89f82d63c5..12631a85c8 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java +++ b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java @@ -315,8 +315,11 @@ public long storeSize(String table) throws IOException { //total += load.getMemStoreSizeMB() * Bytes.MB; TableName tableName = TableName.valueOf(this.namespace, table); for (RegionMetrics m : admin.getRegionMetrics(rs, tableName)) { - total += m.getStoreFileSize().get(Size.Unit.BYTE); - total += m.getMemStoreSize().get(Size.Unit.BYTE); + Double storeFileSize = m.getStoreFileSize().get(Size.Unit.BYTE); + total += storeFileSize.longValue(); + + Double memStoreFileSize = m.getMemStoreSize().get(Size.Unit.BYTE); + total += memStoreFileSize.longValue(); } } } diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/EdgeCoreTest.java b/hugegraph-test/src/main/java/com/baidu/hugegraph/core/EdgeCoreTest.java index 5bfed17e4c..ae25759be2 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/EdgeCoreTest.java +++ b/hugegraph-test/src/main/java/com/baidu/hugegraph/core/EdgeCoreTest.java @@ -5218,7 +5218,7 @@ public void testQueryBothEdgesOfVertexInPaging() { while (page != null) { GraphTraversal iterator = graph.traversal().V(james).bothE() .has("~page", page).limit(1); - long size = IteratorUtils.count(iterator); + Long size = IteratorUtils.count(iterator); if (size == 0L) { // The last page is empty Assert.assertEquals(6, count); @@ -5226,7 +5226,7 @@ public void testQueryBothEdgesOfVertexInPaging() { Assert.assertEquals(1, size); } page = TraversalUtil.page(iterator); - count += size; + count += size.intValue(); } Assert.assertEquals(6, count); } @@ -5244,7 +5244,7 @@ public void testQueryOutEdgesOfVertexInPaging() { while (page != null) { GraphTraversal iterator = graph.traversal().V(james).outE() .has("~page", page).limit(1); - long size = IteratorUtils.count(iterator); + Long size = IteratorUtils.count(iterator); if (size == 0L) { // The last page is empty Assert.assertEquals(4, count); @@ -5252,7 +5252,7 @@ public void testQueryOutEdgesOfVertexInPaging() { Assert.assertEquals(1, size); } page = TraversalUtil.page(iterator); - count += size; + count += size.intValue(); } Assert.assertEquals(4, count); } @@ -5270,7 +5270,7 @@ public void testQueryInEdgesOfVertexInPaging() { while (page != null) { GraphTraversal iterator = graph.traversal().V(james).inE() .has("~page", page).limit(1); - long size = IteratorUtils.count(iterator); + Long size = IteratorUtils.count(iterator); if (size == 0L) { // The last page is empty Assert.assertEquals(2, count); @@ -5278,7 +5278,7 @@ public void testQueryInEdgesOfVertexInPaging() { Assert.assertEquals(1, size); } page = TraversalUtil.page(iterator); - count += size; + count += size.intValue(); } Assert.assertEquals(2, count); } @@ -7516,10 +7516,10 @@ private int traverseInPage(Function> fetcher) { int count = 0; while (page != null) { GraphTraversal iterator = fetcher.apply(page); - long size = IteratorUtils.count(iterator); + Long size = IteratorUtils.count(iterator); Assert.assertLte(1L, size); page = TraversalUtil.page(iterator); - count += size; + count += size.intValue(); } return count; } From d9d42b19b297946fdb4d963763a8b8b7f6126712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9D=92=E5=B9=B4?= <1043706593@qq.com> Date: Sat, 19 Nov 2022 22:04:02 +0800 Subject: [PATCH 2/4] fix ConfigUtil.java CodeQL --- .../main/java/com/baidu/hugegraph/util/ConfigUtil.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/ConfigUtil.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/util/ConfigUtil.java index e2ec19a233..b99ed45870 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/ConfigUtil.java +++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/util/ConfigUtil.java @@ -112,15 +112,15 @@ public static String writeToFile(String dir, String graphName, HugeConfig config) { File file = FileUtils.getFile(dir); E.checkArgument(file.exists(), - "The directory '%s' must exist", dir); - String tmpGraphName = graphName + CONF_SUFFIX; - String fileName = Paths.get(dir, tmpGraphName).toString(); + "The directory '%s' must exist", dir); + String fileName = file.getPath() + File.separator + graphName + CONF_SUFFIX; try { - config.save(new File(fileName)); + File newFile = FileUtils.getFile(fileName); + config.save(newFile); LOG.info("Write HugeConfig to file: '{}'", fileName); } catch (ConfigurationException e) { throw new HugeException("Failed to write HugeConfig to file '%s'", - e, fileName); + e, fileName); } return fileName; From 1746c055e789618b115da71d076f87f13bf59e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9D=92=E5=B9=B4?= <1043706593@qq.com> Date: Fri, 18 Nov 2022 22:16:58 +0800 Subject: [PATCH 3/4] fix CodeQL v2 --- .../main/java/com/baidu/hugegraph/core/EdgeCoreTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/EdgeCoreTest.java b/hugegraph-test/src/main/java/com/baidu/hugegraph/core/EdgeCoreTest.java index ae25759be2..701fa31286 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/EdgeCoreTest.java +++ b/hugegraph-test/src/main/java/com/baidu/hugegraph/core/EdgeCoreTest.java @@ -5223,7 +5223,7 @@ public void testQueryBothEdgesOfVertexInPaging() { // The last page is empty Assert.assertEquals(6, count); } else { - Assert.assertEquals(1, size); + Assert.assertEquals(1, size.intValue()); } page = TraversalUtil.page(iterator); count += size.intValue(); @@ -5249,7 +5249,7 @@ public void testQueryOutEdgesOfVertexInPaging() { // The last page is empty Assert.assertEquals(4, count); } else { - Assert.assertEquals(1, size); + Assert.assertEquals(1, size.intValue()); } page = TraversalUtil.page(iterator); count += size.intValue(); @@ -5275,7 +5275,7 @@ public void testQueryInEdgesOfVertexInPaging() { // The last page is empty Assert.assertEquals(2, count); } else { - Assert.assertEquals(1, size); + Assert.assertEquals(1, size.intValue()); } page = TraversalUtil.page(iterator); count += size.intValue(); From 3303b821f076d4a5491ef3dd7f89178dedfcf7ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9D=92=E5=B9=B4?= <1043706593@qq.com> Date: Sun, 20 Nov 2022 12:42:44 +0800 Subject: [PATCH 4/4] fix code checkstyle --- .../java/com/baidu/hugegraph/util/ConfigUtil.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/ConfigUtil.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/util/ConfigUtil.java index b99ed45870..57462e7b99 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/ConfigUtil.java +++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/util/ConfigUtil.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.io.Reader; import java.io.StringReader; -import java.nio.file.Paths; import java.util.List; import java.util.Map; @@ -110,17 +109,17 @@ public static Map scanGraphsDir(String graphsDirPath) { public static String writeToFile(String dir, String graphName, HugeConfig config) { - File file = FileUtils.getFile(dir); - E.checkArgument(file.exists(), - "The directory '%s' must exist", dir); - String fileName = file.getPath() + File.separator + graphName + CONF_SUFFIX; + File path = FileUtils.getFile(dir); + E.checkArgument(path.exists(), + "The directory '%s' must exist", dir); + String fileName = path.getPath() + File.separator + graphName + CONF_SUFFIX; try { File newFile = FileUtils.getFile(fileName); config.save(newFile); LOG.info("Write HugeConfig to file: '{}'", fileName); } catch (ConfigurationException e) { throw new HugeException("Failed to write HugeConfig to file '%s'", - e, fileName); + e, fileName); } return fileName;