Skip to content

Feat/fix codeql #2022

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

Merged
imbajin merged 5 commits into from
Nov 20, 2022
Merged

Feat/fix codeql #2022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e563ee0
fix CodeQL v1
z7658329 Nov 18, 2022
d9d42b1
fix ConfigUtil.java CodeQL
z7658329 Nov 19, 2022
1746c05
fix CodeQL v2
z7658329 Nov 18, 2022
3303b82
fix code checkstyle
z7658329 Nov 20, 2022
83af009
Merge branch 'master' into feat/fix_codeql_v2
javeme Nov 20, 2022
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: 2 additions & 2 deletions hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,13 +193,13 @@ public List<Shard> getSplits(Session session, long splitSize) {
count = 1;
}
long maxKey = this.maxKey();
double each = maxKey / count;
Double each = maxKey / count;

List<Shard> 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;
Expand Down
11 changes: 6 additions & 5 deletions hugegraph-core/src/main/java/com/baidu/hugegraph/util/ConfigUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -110,11 +109,13 @@ public static Map<String, String> scanGraphsDir(String graphsDirPath) {

public static String writeToFile(String dir, String graphName,
HugeConfig config) {
E.checkArgument(FileUtils.getFile(dir).exists(),
"The directory '%s' must exist", dir);
String fileName = Paths.get(dir, graphName + CONF_SUFFIX).toString();
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 {
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'",
Expand Down
3 changes: 2 additions & 1 deletion hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ private static Map<String, Object> 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,
Expand Down
7 changes: 5 additions & 2 deletions hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
}
Expand Down
22 changes: 11 additions & 11 deletions hugegraph-test/src/main/java/com/baidu/hugegraph/core/EdgeCoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5218,15 +5218,15 @@ 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);
} else {
Assert.assertEquals(1, size);
Assert.assertEquals(1, size.intValue());
}
page = TraversalUtil.page(iterator);
count += size;
count += size.intValue();
}
Assert.assertEquals(6, count);
}
Expand All @@ -5244,15 +5244,15 @@ 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);
} else {
Assert.assertEquals(1, size);
Assert.assertEquals(1, size.intValue());
}
page = TraversalUtil.page(iterator);
count += size;
count += size.intValue();
}
Assert.assertEquals(4, count);
}
Expand All @@ -5270,15 +5270,15 @@ 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);
} else {
Assert.assertEquals(1, size);
Assert.assertEquals(1, size.intValue());
}
page = TraversalUtil.page(iterator);
count += size;
count += size.intValue();
}
Assert.assertEquals(2, count);
}
Expand Down Expand Up @@ -7516,10 +7516,10 @@ private int traverseInPage(Function<String, GraphTraversal<?, ?>> 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;
}
Expand Down