Skip to content

Commit cf94c91

Browse files
committed
format&clean scylladb
1 parent 882186b commit cf94c91

File tree

3 files changed

+30
-31
lines changed

3 files changed

+30
-31
lines changed

hugegraph-server/hugegraph-scylladb/src/main/java/org/apache/hugegraph/backend/store/scylladb/ScyllaDBMetrics.java

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.Map;
2121

2222
import org.apache.cassandra.tools.NodeProbe;
23-
2423
import org.apache.hugegraph.backend.store.cassandra.CassandraMetrics;
2524
import org.apache.hugegraph.backend.store.cassandra.CassandraSessionPool;
2625
import org.apache.hugegraph.config.HugeConfig;

hugegraph-server/hugegraph-scylladb/src/main/java/org/apache/hugegraph/backend/store/scylladb/ScyllaDBStoreProvider.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
package org.apache.hugegraph.backend.store.scylladb;
1919

20-
import org.slf4j.Logger;
21-
2220
import org.apache.hugegraph.backend.store.BackendFeatures;
2321
import org.apache.hugegraph.backend.store.BackendStore;
2422
import org.apache.hugegraph.backend.store.BackendStoreProvider;
@@ -30,6 +28,7 @@
3028
import org.apache.hugegraph.type.HugeType;
3129
import org.apache.hugegraph.util.E;
3230
import org.apache.hugegraph.util.Log;
31+
import org.slf4j.Logger;
3332

3433
public class ScyllaDBStoreProvider extends CassandraStoreProvider {
3534

@@ -94,7 +93,7 @@ public BackendStore loadSystemStore(HugeConfig config) {
9493
}
9594

9695
public static class ScyllaDBSchemaStore
97-
extends CassandraStore.CassandraSchemaStore {
96+
extends CassandraStore.CassandraSchemaStore {
9897

9998
public ScyllaDBSchemaStore(BackendStoreProvider provider,
10099
String keyspace, String store) {
@@ -124,7 +123,7 @@ protected CassandraMetrics createMetrics(HugeConfig conf,
124123
}
125124

126125
public static class ScyllaDBGraphStore
127-
extends CassandraStore.CassandraGraphStore {
126+
extends CassandraStore.CassandraGraphStore {
128127

129128
public ScyllaDBGraphStore(BackendStoreProvider provider,
130129
String keyspace, String store) {
@@ -152,7 +151,7 @@ protected CassandraMetrics createMetrics(HugeConfig conf,
152151
}
153152

154153
public static class ScyllaDBSystemStore
155-
extends CassandraStore.CassandraSystemStore {
154+
extends CassandraStore.CassandraSystemStore {
156155

157156
public ScyllaDBSystemStore(BackendStoreProvider provider,
158157
String keyspace, String store) {

hugegraph-server/hugegraph-scylladb/src/main/java/org/apache/hugegraph/backend/store/scylladb/ScyllaDBTablesWithMV.java

+26-25
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.apache.hugegraph.backend.store.cassandra.CassandraTables;
3030
import org.apache.hugegraph.type.define.Directions;
3131
import org.apache.hugegraph.type.define.HugeKeys;
32+
3233
import com.datastax.driver.core.querybuilder.Select;
3334

3435
public class ScyllaDBTablesWithMV {
@@ -62,17 +63,17 @@ private static String mvLabelTable(String table) {
6263
}
6364

6465
private static void createSchemaIndexTable(
65-
CassandraSessionPool.Session session,
66-
String mvName, String table) {
66+
CassandraSessionPool.Session session,
67+
String mvName, String table) {
6768
final String NAME = CassandraTable.formatKey(HugeKeys.NAME);
6869
final String ID = CassandraTable.formatKey(HugeKeys.ID);
6970
String cql = String.format(
70-
"CREATE MATERIALIZED VIEW IF NOT EXISTS %s AS " +
71-
" SELECT * FROM %s " +
72-
" WHERE %s IS NOT NULL " +
73-
" PRIMARY KEY(%s, %s)",
74-
mvName, table, NAME,
75-
NAME, ID);
71+
"CREATE MATERIALIZED VIEW IF NOT EXISTS %s AS " +
72+
" SELECT * FROM %s " +
73+
" WHERE %s IS NOT NULL " +
74+
" PRIMARY KEY(%s, %s)",
75+
mvName, table, NAME,
76+
NAME, ID);
7677
session.execute(cql);
7778
}
7879

@@ -206,11 +207,11 @@ protected void createIndex(CassandraSessionPool.Session session,
206207
final String LABEL = CassandraTable.formatKey(HugeKeys.LABEL);
207208
final String ID = CassandraTable.formatKey(HugeKeys.ID);
208209
String cql = String.format(
209-
"CREATE MATERIALIZED VIEW IF NOT EXISTS %s AS " +
210-
" SELECT * FROM %s " +
211-
" WHERE %s IS NOT NULL " +
212-
" PRIMARY KEY(%s, %s)",
213-
mvLabel2Vertex, this.table(), LABEL, LABEL, ID);
210+
"CREATE MATERIALIZED VIEW IF NOT EXISTS %s AS " +
211+
" SELECT * FROM %s " +
212+
" WHERE %s IS NOT NULL " +
213+
" PRIMARY KEY(%s, %s)",
214+
mvLabel2Vertex, this.table(), LABEL, LABEL, ID);
214215
session.execute(cql);
215216
}
216217

@@ -240,13 +241,13 @@ public static class Edge extends CassandraTables.Edge {
240241

241242
private static final String LABEL = CassandraTable.formatKey(HugeKeys.LABEL);
242243
private final List<String> keys = this.idColumnName().stream()
243-
.filter(k -> k != HugeKeys.LABEL)
244-
.map(k -> CassandraTable.formatKey(k))
245-
.collect(Collectors.toList());
244+
.filter(k -> k != HugeKeys.LABEL)
245+
.map(k -> CassandraTable.formatKey(k))
246+
.collect(Collectors.toList());
246247
private final String prKeys = this.keys.stream()
247-
.collect(Collectors.joining(","));
248+
.collect(Collectors.joining(","));
248249
private final String prkeysNn = this.keys.stream().collect(
249-
Collectors.joining(" IS NOT NULL AND "));
250+
Collectors.joining(" IS NOT NULL AND "));
250251

251252
public Edge(String store, Directions direction) {
252253
super(store, direction);
@@ -257,13 +258,13 @@ protected void createIndex(CassandraSessionPool.Session session,
257258
String indexLabel,
258259
HugeKeys column) {
259260
String cql = String.format(
260-
"CREATE MATERIALIZED VIEW IF NOT EXISTS %s AS " +
261-
" SELECT * FROM %s " +
262-
" WHERE %s IS NOT NULL AND %s IS NOT NULL " +
263-
" PRIMARY KEY(%s, %s)",
264-
mvLabel2Edge, this.table(),
265-
this.LABEL, this.prkeysNn,
266-
this.LABEL, this.prKeys);
261+
"CREATE MATERIALIZED VIEW IF NOT EXISTS %s AS " +
262+
" SELECT * FROM %s " +
263+
" WHERE %s IS NOT NULL AND %s IS NOT NULL " +
264+
" PRIMARY KEY(%s, %s)",
265+
mvLabel2Edge, this.table(),
266+
LABEL, this.prkeysNn,
267+
LABEL, this.prKeys);
267268
session.execute(cql);
268269
}
269270

0 commit comments

Comments
 (0)