From db1fa5401f5d810ae9f8ec6b30da6b2f05c50e3c Mon Sep 17 00:00:00 2001 From: z7658329 <1043706593@qq.com> Date: Mon, 18 Apr 2022 22:55:44 +0800 Subject: [PATCH 1/3] fix cassandra code checkstyle --- .../store/cassandra/CassandraSessionPool.java | 4 +++- .../backend/store/cassandra/CassandraShard.java | 4 ++-- .../backend/store/cassandra/CassandraStore.java | 10 +++++----- .../backend/store/cassandra/CassandraTable.java | 12 ++++++------ 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraSessionPool.java b/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraSessionPool.java index 42dfb936e5..c02bf3f0b3 100644 --- a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraSessionPool.java +++ b/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraSessionPool.java @@ -206,7 +206,9 @@ private void tryOpen() { assert this.session == null; try { this.open(); - } catch (InvalidQueryException ignored) {} + } catch (InvalidQueryException ignored) { + // ignore + } } @Override diff --git a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraShard.java b/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraShard.java index 4e3387b995..b0e970b965 100644 --- a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraShard.java +++ b/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraShard.java @@ -208,8 +208,8 @@ private Map getSubSplits(TokenRange tokenRange, private Map> getRangeMap() { Metadata metadata = this.session.metadata(); return metadata.getTokenRanges().stream().collect(Collectors.toMap( - p -> p, - p -> metadata.getReplicas('"' + this.keyspace + '"', p))); + p -> p, + p -> metadata.getReplicas('"' + this.keyspace + '"', p))); } private static Map describeSplits( diff --git a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraStore.java b/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraStore.java index 0f37c92f89..90dcd5af49 100644 --- a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraStore.java +++ b/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraStore.java @@ -475,12 +475,12 @@ protected boolean existsKeyspace() { } protected boolean existsTable(String table) { - KeyspaceMetadata keyspace = this.cluster().getMetadata() + KeyspaceMetadata keyspace = this.cluster().getMetadata() .getKeyspace(this.keyspace); - if (keyspace != null && keyspace.getTable(table) != null) { - return true; - } - return false; + if (keyspace != null && keyspace.getTable(table) != null) { + return true; + } + return false; } protected void initKeyspace() { diff --git a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraTable.java b/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraTable.java index 299f5eea0f..548726b4a4 100644 --- a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraTable.java +++ b/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraTable.java @@ -107,12 +107,12 @@ public Number queryNumber(CassandraSessionPool.Session session, statement.setReadTimeoutMillis(timeout * 1000); return session.query(statement); }, (q, rs) -> { - Row row = rs.one(); - if (row == null) { - return IteratorUtils.of(aggregate.defaultValue()); - } - return IteratorUtils.of(row.getLong(0)); - }); + Row row = rs.one(); + if (row == null) { + return IteratorUtils.of(aggregate.defaultValue()); + } + return IteratorUtils.of(row.getLong(0)); + }); return aggregate.reduce(results); } From 717adefeec289821b4a4cf3f60545ad547bcc461 Mon Sep 17 00:00:00 2001 From: z7658329 <1043706593@qq.com> Date: Sun, 24 Apr 2022 22:09:50 +0800 Subject: [PATCH 2/3] empty commit From 0699970cf0662a3680ba5439813c7bbb6b675b18 Mon Sep 17 00:00:00 2001 From: z7658329 <1043706593@qq.com> Date: Mon, 25 Apr 2022 22:48:39 +0800 Subject: [PATCH 3/3] empty commit