forked from hugegraph/hugegraph-sync
Spelling corrections (#1798)
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>
This commit is contained in:
Josh Soref
GitHub
parent
b591f7d8b3
commit
5368f3205e
|
|
@ -37,7 +37,7 @@ To find the Java binary in your environment, run the appropriate command for you
|
|||
To build without executing tests:
|
||||
|
||||
1. Click on "File" -> "Open", choose your project location.
|
||||
2. Open maven view by click "View" -> "Tool Windows" -> "Maven Porjects".
|
||||
2. Open maven view by click "View" -> "Tool Windows" -> "Maven Projects".
|
||||
3. Choose root module "hugegraph: Distributed Graph Database", unfold the
|
||||
menu of "Lifecycle".
|
||||
4. Click the "Toggle 'Skip Tests' Mode" button which is located on the top
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ Before submitting the code, we need to do some preparation:
|
|||
|
||||
5. Sign the HugeGraph CLA: [https://cla-assistant.io/hugegraph/hugegraph](https://cla-assistant.io/hugegraph/hugegraph)
|
||||
|
||||
Optional: You can use [Github desktop](https://desktop.github.com/) to greatly simplify the commit and update process.
|
||||
Optional: You can use [GitHub desktop](https://desktop.github.com/) to greatly simplify the commit and update process.
|
||||
|
||||
## 2. Create an Issue on GitHub
|
||||
|
||||
|
|
@ -150,7 +150,7 @@ And push it to GitHub fork repo again:
|
|||
git push -f origin bugfix-branch:bugfix-branch
|
||||
```
|
||||
|
||||
Github will automatically update the Pull Request after we push it, just wait for code review.
|
||||
GitHub will automatically update the Pull Request after we push it, just wait for code review.
|
||||
|
||||
Any question please contact to us through [hugegraph@googlegroups.com](mailto:hugegraph@googlegroups.com) or [other contact information](https://hugegraph.github.io/hugegraph-doc/).
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
[](https://www.apache.org/licenses/LICENSE-2.0.html)
|
||||
[](https://github.com/hugegraph/hugegraph/actions/workflows/ci.yml)
|
||||
[](https://codecov.io/gh/hugegraph/hugegraph)
|
||||
[](https://github.com/hugegraph/hugegraph/releases)
|
||||
[](https://github.com/hugegraph/hugegraph/releases)
|
||||
|
||||
HugeGraph is a fast-speed and highly-scalable [graph database](https://en.wikipedia.org/wiki/Graph_database). Billions of vertices and edges can be easily stored into and queried from HugeGraph due to its excellent OLTP ability. As compliance to [Apache TinkerPop 3](https://tinkerpop.apache.org/) framework, various complicated graph queries can be accomplished through [Gremlin](https://tinkerpop.apache.org/gremlin.html)(a powerful graph traversal language).
|
||||
|
||||
|
|
|
|||
|
|
@ -143,9 +143,9 @@ public class API {
|
|||
}
|
||||
|
||||
protected static void checkCreatingBody(
|
||||
Collection<? extends Checkable> bodys) {
|
||||
E.checkArgumentNotNull(bodys, "The request body can't be empty");
|
||||
for (Checkable body : bodys) {
|
||||
Collection<? extends Checkable> bodies) {
|
||||
E.checkArgumentNotNull(bodies, "The request body can't be empty");
|
||||
for (Checkable body : bodies) {
|
||||
E.checkArgument(body != null,
|
||||
"The batch body can't contain null record");
|
||||
body.checkCreate(true);
|
||||
|
|
@ -153,9 +153,9 @@ public class API {
|
|||
}
|
||||
|
||||
protected static void checkUpdatingBody(
|
||||
Collection<? extends Checkable> bodys) {
|
||||
E.checkArgumentNotNull(bodys, "The request body can't be empty");
|
||||
for (Checkable body : bodys) {
|
||||
Collection<? extends Checkable> bodies) {
|
||||
E.checkArgumentNotNull(bodies, "The request body can't be empty");
|
||||
for (Checkable body : bodies) {
|
||||
E.checkArgumentNotNull(body,
|
||||
"The batch body can't contain null record");
|
||||
body.checkUpdate();
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ import com.baidu.hugegraph.backend.id.IdGenerator;
|
|||
import com.baidu.hugegraph.config.HugeConfig;
|
||||
import com.baidu.hugegraph.config.OptionSpace;
|
||||
import com.baidu.hugegraph.config.ServerOptions;
|
||||
import com.baidu.hugegraph.type.Namifiable;
|
||||
import com.baidu.hugegraph.type.Nameable;
|
||||
import com.baidu.hugegraph.util.E;
|
||||
import com.baidu.hugegraph.util.JsonUtil;
|
||||
|
||||
|
|
@ -432,7 +432,7 @@ public interface HugeAuthenticator extends Authenticator {
|
|||
}
|
||||
|
||||
public ResourceObject<?> resourceObject() {
|
||||
Namifiable elem = HugeResource.NameObject.ANY;
|
||||
Nameable elem = HugeResource.NameObject.ANY;
|
||||
return ResourceObject.of(this.owner, this.resource, elem);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ import com.baidu.hugegraph.task.TaskScheduler;
|
|||
import com.baidu.hugegraph.task.TaskStatus;
|
||||
import com.baidu.hugegraph.traversal.optimize.HugeScriptTraversal;
|
||||
import com.baidu.hugegraph.type.HugeType;
|
||||
import com.baidu.hugegraph.type.Namifiable;
|
||||
import com.baidu.hugegraph.type.Nameable;
|
||||
import com.baidu.hugegraph.type.define.GraphMode;
|
||||
import com.baidu.hugegraph.type.define.GraphReadMode;
|
||||
import com.baidu.hugegraph.type.define.NodeRole;
|
||||
|
|
@ -790,7 +790,7 @@ public final class HugeGraphAuthProxy implements HugeGraph {
|
|||
*/
|
||||
verifyResPermission(actionPerm, true, () -> {
|
||||
String graph = this.hugegraph.name();
|
||||
Namifiable elem = HugeResource.NameObject.ANY;
|
||||
Nameable elem = HugeResource.NameObject.ANY;
|
||||
return ResourceObject.of(graph, resType, elem);
|
||||
});
|
||||
}
|
||||
|
|
@ -869,7 +869,7 @@ public final class HugeGraphAuthProxy implements HugeGraph {
|
|||
ResourceType resType, String name) {
|
||||
verifyResPermission(actionPerm, true, () -> {
|
||||
String graph = this.hugegraph.name();
|
||||
Namifiable elem = HugeResource.NameObject.of(name);
|
||||
Nameable elem = HugeResource.NameObject.of(name);
|
||||
return ResourceObject.of(graph, resType, elem);
|
||||
});
|
||||
}
|
||||
|
|
@ -1105,7 +1105,7 @@ public final class HugeGraphAuthProxy implements HugeGraph {
|
|||
Object r = verifyResPermission(actionPerm, throwIfNoPerm, () -> {
|
||||
String graph = HugeGraphAuthProxy.this.hugegraph.name();
|
||||
String name = task.id().toString();
|
||||
Namifiable elem = HugeResource.NameObject.of(name);
|
||||
Nameable elem = HugeResource.NameObject.of(name);
|
||||
return ResourceObject.of(graph, ResourceType.TASK, elem);
|
||||
}, () -> {
|
||||
return hasTaskPermission(task);
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ public enum UpdateStrategy {
|
|||
SUM {
|
||||
@Override
|
||||
Object updatePropertyValue(Object oldProperty, Object newProperty) {
|
||||
// TODO: Improve preformance? (like write a method in common module)
|
||||
// TODO: Improve performance? (like write a method in common module)
|
||||
BigDecimal oldNumber = new BigDecimal(oldProperty.toString());
|
||||
BigDecimal newNumber = new BigDecimal(newProperty.toString());
|
||||
return oldNumber.add(newNumber);
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ public final class ApiVersion {
|
|||
* version 0.2:
|
||||
* [0.2] HugeGraph-527: First add the version to the hugegraph module
|
||||
* [0.3] HugeGraph-525: Add versions check of components and api
|
||||
* [0.4] HugeGraph-162: Add schema builder to seperate client and
|
||||
* [0.4] HugeGraph-162: Add schema builder to separate client and
|
||||
* inner interface.
|
||||
* [0.5] HugeGraph-498: Support three kind of id strategy
|
||||
*
|
||||
|
|
|
|||
|
|
@ -310,7 +310,7 @@ public abstract class CassandraStore
|
|||
iterators.add(table.query(this.session(), q));
|
||||
}
|
||||
entries = new MergeIterator<>(entries, iterators,
|
||||
BackendEntry::mergable);
|
||||
BackendEntry::mergeable);
|
||||
}
|
||||
return entries;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -90,10 +90,10 @@ public abstract class CassandraTable
|
|||
E.checkArgument(args.length == 1,
|
||||
"The args count of %s must be 1", meta);
|
||||
long splitSize = (long) args[0];
|
||||
CassandraShard spliter = new CassandraShard(session,
|
||||
CassandraShard splitter = new CassandraShard(session,
|
||||
session.keyspace(),
|
||||
this.table());
|
||||
return spliter.getSplits(0, splitSize);
|
||||
return splitter.getSplits(0, splitSize);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ import com.baidu.hugegraph.HugeException;
|
|||
import com.baidu.hugegraph.auth.SchemaDefine.AuthElement;
|
||||
import com.baidu.hugegraph.structure.HugeElement;
|
||||
import com.baidu.hugegraph.traversal.optimize.TraversalUtil;
|
||||
import com.baidu.hugegraph.type.Namifiable;
|
||||
import com.baidu.hugegraph.type.Typifiable;
|
||||
import com.baidu.hugegraph.type.Nameable;
|
||||
import com.baidu.hugegraph.type.Typeable;
|
||||
import com.baidu.hugegraph.util.JsonUtil;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
|
|
@ -124,7 +124,7 @@ public class HugeResource {
|
|||
return this.filter((AuthElement) resourceObject.operated());
|
||||
}
|
||||
if (resType.isSchema() || CHECK_NAME_RESS.contains(resType)) {
|
||||
return this.filter((Namifiable) resourceObject.operated());
|
||||
return this.filter((Nameable) resourceObject.operated());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -137,15 +137,15 @@ public class HugeResource {
|
|||
|
||||
private boolean filter(AuthElement element) {
|
||||
assert this.type.match(element.type());
|
||||
if (element instanceof Namifiable) {
|
||||
return this.filter((Namifiable) element);
|
||||
if (element instanceof Nameable) {
|
||||
return this.filter((Nameable) element);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private boolean filter(Namifiable element) {
|
||||
assert !(element instanceof Typifiable) || this.type.match(
|
||||
ResourceType.from(((Typifiable) element).type()));
|
||||
private boolean filter(Nameable element) {
|
||||
assert !(element instanceof Typeable) || this.type.match(
|
||||
ResourceType.from(((Typeable) element).type()));
|
||||
|
||||
return this.matchLabel(element.name());
|
||||
}
|
||||
|
|
@ -248,7 +248,7 @@ public class HugeResource {
|
|||
public static boolean allowed(ResourceObject<?> resourceObject) {
|
||||
// Allowed to access system(hidden) schema by anyone
|
||||
if (resourceObject.type().isSchema()) {
|
||||
Namifiable schema = (Namifiable) resourceObject.operated();
|
||||
Nameable schema = (Nameable) resourceObject.operated();
|
||||
return Hidden.isHidden(schema.name());
|
||||
}
|
||||
|
||||
|
|
@ -264,7 +264,7 @@ public class HugeResource {
|
|||
return JsonUtil.fromJson(resources, type);
|
||||
}
|
||||
|
||||
public static class NameObject implements Namifiable {
|
||||
public static class NameObject implements Nameable {
|
||||
|
||||
public static final NameObject ANY = new NameObject("*");
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ package com.baidu.hugegraph.auth;
|
|||
import com.baidu.hugegraph.auth.SchemaDefine.AuthElement;
|
||||
import com.baidu.hugegraph.schema.SchemaElement;
|
||||
import com.baidu.hugegraph.structure.HugeElement;
|
||||
import com.baidu.hugegraph.type.Namifiable;
|
||||
import com.baidu.hugegraph.type.Nameable;
|
||||
import com.baidu.hugegraph.util.E;
|
||||
|
||||
public class ResourceObject<V> {
|
||||
|
|
@ -89,7 +89,7 @@ public class ResourceObject<V> {
|
|||
}
|
||||
|
||||
public static ResourceObject<?> of(String graph, ResourceType type,
|
||||
Namifiable elem) {
|
||||
Nameable elem) {
|
||||
return new ResourceObject<>(graph, type, elem);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -240,9 +240,9 @@ public abstract class SchemaDefine {
|
|||
protected abstract Object[] asArray();
|
||||
}
|
||||
|
||||
// NOTE: travis-ci fails if class Entity implements Namifiable
|
||||
// NOTE: travis-ci fails if class Entity implements Nameable
|
||||
public static abstract class Entity extends AuthElement
|
||||
implements com.baidu.hugegraph.type.Namifiable {
|
||||
implements com.baidu.hugegraph.type.Nameable {
|
||||
|
||||
private static final long serialVersionUID = 4113319546914811762L;
|
||||
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ public class BinaryBackendEntry implements BackendEntry {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean mergable(BackendEntry other) {
|
||||
public boolean mergeable(BackendEntry other) {
|
||||
if (!(other instanceof BinaryBackendEntry)) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -275,7 +275,7 @@ public class TableBackendEntry implements BackendEntry {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean mergable(BackendEntry other) {
|
||||
public boolean mergeable(BackendEntry other) {
|
||||
if (!(other instanceof TableBackendEntry)) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -278,7 +278,7 @@ public class TextBackendEntry implements BackendEntry, Cloneable {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean mergable(BackendEntry other) {
|
||||
public boolean mergeable(BackendEntry other) {
|
||||
if (!(other instanceof TextBackendEntry)) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ public class TextSerializer extends AbstractSerializer {
|
|||
} else {
|
||||
if (!(value instanceof Collection)) {
|
||||
throw new BackendException(
|
||||
"Invalid value of non-sigle property: %s", colValue);
|
||||
"Invalid value of non-single property: %s", colValue);
|
||||
}
|
||||
for (Object v : (Collection<?>) value) {
|
||||
v = JsonUtil.castNumber(v, pkey.dataType().clazz());
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ public interface BackendEntry extends Idfiable {
|
|||
public void columns(BackendColumn... columns);
|
||||
|
||||
public void merge(BackendEntry other);
|
||||
public boolean mergable(BackendEntry other);
|
||||
public boolean mergeable(BackendEntry other);
|
||||
|
||||
public void clear();
|
||||
|
||||
|
|
|
|||
|
|
@ -120,9 +120,9 @@ public abstract class BackendTable<Session extends BackendSession, Entry> {
|
|||
|
||||
public abstract void eliminate(Session session, Entry entry);
|
||||
|
||||
/****************************** ShardSpliter ******************************/
|
||||
/****************************** ShardSplitter ******************************/
|
||||
|
||||
public static abstract class ShardSpliter<Session extends BackendSession> {
|
||||
public static abstract class ShardSplitter<Session extends BackendSession> {
|
||||
|
||||
// The min shard size should >= 1M to prevent too many number of shards
|
||||
protected static final int MIN_SHARD_SIZE = (int) Bytes.MB;
|
||||
|
|
@ -142,7 +142,7 @@ public abstract class BackendTable<Session extends BackendSession, Entry> {
|
|||
|
||||
private final String table;
|
||||
|
||||
public ShardSpliter(String table) {
|
||||
public ShardSplitter(String table) {
|
||||
this.table = table;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -57,18 +57,18 @@ public class InMemoryDBTable extends BackendTable<BackendSession,
|
|||
private static final Logger LOG = Log.logger(InMemoryDBTable.class);
|
||||
|
||||
protected final Map<Id, BackendEntry> store;
|
||||
private final InMemoryShardSpliter shardSpliter;
|
||||
private final InMemoryShardSplitter shardSplitter;
|
||||
|
||||
public InMemoryDBTable(HugeType type) {
|
||||
super(type.name());
|
||||
this.store = new ConcurrentHashMap<>();
|
||||
this.shardSpliter = new InMemoryShardSpliter(this.table());
|
||||
this.shardSplitter = new InMemoryShardSplitter(this.table());
|
||||
}
|
||||
|
||||
public InMemoryDBTable(HugeType type, Map<Id, BackendEntry> store) {
|
||||
super(type.name());
|
||||
this.store = store;
|
||||
this.shardSpliter = new InMemoryShardSpliter(this.table());
|
||||
this.shardSplitter = new InMemoryShardSplitter(this.table());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -77,7 +77,7 @@ public class InMemoryDBTable extends BackendTable<BackendSession,
|
|||
E.checkArgument(args.length == 1,
|
||||
"The args count of %s must be 1", meta);
|
||||
long splitSize = (long) args[0];
|
||||
return this.shardSpliter.getSplits(session, splitSize);
|
||||
return this.shardSplitter.getSplits(session, splitSize);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -328,9 +328,9 @@ public class InMemoryDBTable extends BackendTable<BackendSession,
|
|||
return false;
|
||||
}
|
||||
|
||||
private class InMemoryShardSpliter extends ShardSpliter<BackendSession> {
|
||||
private class InMemoryShardSplitter extends ShardSplitter<BackendSession> {
|
||||
|
||||
public InMemoryShardSpliter(String table) {
|
||||
public InMemoryShardSplitter(String table) {
|
||||
super(table);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ public class RaftGroupManagerImpl implements RaftGroupManager {
|
|||
Status status = this.raftNode.node().transferLeadershipTo(peerId);
|
||||
if (!status.isOk()) {
|
||||
throw new BackendException(
|
||||
"Failed to transafer leader to '%s', raft error: %s",
|
||||
"Failed to transfer leader to '%s', raft error: %s",
|
||||
endpoint, status.getErrorMsg());
|
||||
}
|
||||
return peerId.toString();
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ public final class StoreSerializer {
|
|||
buffer.write(entry.type().code());
|
||||
// write id
|
||||
buffer.writeBytes(entry.id().asBytes());
|
||||
// wirte subId
|
||||
// write subId
|
||||
if (entry.subId() != null) {
|
||||
buffer.writeId(entry.subId());
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ public final class StoreStateMachine extends StateMachineAdapter {
|
|||
future.get();
|
||||
}
|
||||
} catch (Throwable e) {
|
||||
String title = "StateMachine occured critical error";
|
||||
String title = "StateMachine occurred critical error";
|
||||
LOG.error("{}", title, e);
|
||||
Status status = new Status(RaftError.ESTATEMACHINE,
|
||||
"%s: %s", title, e.getMessage());
|
||||
|
|
@ -204,7 +204,7 @@ public final class StoreStateMachine extends StateMachineAdapter {
|
|||
return false;
|
||||
}
|
||||
/*
|
||||
* Snapshot load occured in RaftNode constructor, specifically at step
|
||||
* Snapshot load occurred in RaftNode constructor, specifically at step
|
||||
* `this.node = this.initRaftNode()`, at this time the NodeImpl is null
|
||||
* in RaftNode so we can't call `this.node().nodeId()`
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -356,7 +356,7 @@ public final class RamTable {
|
|||
assert vertex < Integer.MAX_VALUE;
|
||||
this.verticesHigh.put(vertex, position);
|
||||
} else {
|
||||
throw new HugeException("Out of vertices capaticy %s",
|
||||
throw new HugeException("Out of vertices capacity %s",
|
||||
this.verticesCapacity);
|
||||
}
|
||||
}
|
||||
|
|
@ -369,7 +369,7 @@ public final class RamTable {
|
|||
assert vertex < Integer.MAX_VALUE;
|
||||
return this.verticesHigh.get(vertex);
|
||||
} else {
|
||||
throw new HugeException("Out of vertices capaticy %s: %s",
|
||||
throw new HugeException("Out of vertices capacity %s: %s",
|
||||
this.verticesCapacity, vertex);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1393,7 +1393,7 @@ public class GraphTransaction extends IndexableTransaction {
|
|||
query, keys, HugeKeys.SORT_VALUES);
|
||||
query.query(conditions);
|
||||
/*
|
||||
* Reset all userprop since transfered to sort-keys, ignore other
|
||||
* Reset all userprop since transferred to sort-keys, ignore other
|
||||
* userprop(if exists) that it will be filtered by queryEdges(Query)
|
||||
*/
|
||||
query.resetUserpropConditions();
|
||||
|
|
@ -1544,7 +1544,7 @@ public class GraphTransaction extends IndexableTransaction {
|
|||
Collection<Id> missed = CollectionUtils.subtract(nonNullKeys, keys);
|
||||
HugeGraph graph = this.graph();
|
||||
E.checkArgument(false, "All non-null property keys %s of " +
|
||||
"vertex label '%s' must be setted, missed keys %s",
|
||||
"vertex label '%s' must be set, missed keys %s",
|
||||
graph.mapPkId2Name(nonNullKeys), vertexLabel.name(),
|
||||
graph.mapPkId2Name(missed));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ public class AuthOptions extends OptionHolder {
|
|||
public static final ConfigOption<String> AUTHENTICATOR =
|
||||
new ConfigOption<>(
|
||||
"auth.authenticator",
|
||||
"The class path of authenticator implemention. " +
|
||||
"The class path of authenticator implementation. " +
|
||||
"e.g., com.baidu.hugegraph.auth.StandardAuthenticator, " +
|
||||
"or com.baidu.hugegraph.auth.ConfigAuthenticator.",
|
||||
null,
|
||||
|
|
|
|||
|
|
@ -182,7 +182,7 @@ public class CoreOptions extends OptionHolder {
|
|||
public static final ConfigOption<Integer> RAFT_BACKEND_THREADS =
|
||||
new ConfigOption<>(
|
||||
"raft.backend_threads",
|
||||
"The thread number used to apply task to bakcend.",
|
||||
"The thread number used to apply task to backend.",
|
||||
rangeInt(0, Integer.MAX_VALUE),
|
||||
CPUS
|
||||
);
|
||||
|
|
@ -575,7 +575,7 @@ public class CoreOptions extends OptionHolder {
|
|||
|
||||
public static final ConfigOption<Long> SNOWFLAKE_DATACENTER_ID =
|
||||
new ConfigOption<>(
|
||||
"snowflake.datecenter_id",
|
||||
"snowflake.datacenter_id",
|
||||
"The datacenter id of snowflake id generator.",
|
||||
disallowEmpty(),
|
||||
0L
|
||||
|
|
|
|||
|
|
@ -411,7 +411,7 @@ public class HugeGraphSONModule extends TinkerPopJacksonModule {
|
|||
"for vertex '%s'", key, val, property.element());
|
||||
}
|
||||
};
|
||||
// End wirte properties
|
||||
// End write properties
|
||||
generator.writeEndObject();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ import com.baidu.hugegraph.backend.id.Id;
|
|||
import com.baidu.hugegraph.exception.NotSupportException;
|
||||
import com.baidu.hugegraph.schema.builder.SchemaBuilder;
|
||||
import com.baidu.hugegraph.type.HugeType;
|
||||
import com.baidu.hugegraph.type.Propfiable;
|
||||
import com.baidu.hugegraph.type.Propertiable;
|
||||
import com.baidu.hugegraph.type.define.AggregateType;
|
||||
import com.baidu.hugegraph.type.define.Cardinality;
|
||||
import com.baidu.hugegraph.type.define.DataType;
|
||||
|
|
@ -41,7 +41,7 @@ import com.baidu.hugegraph.type.define.WriteType;
|
|||
import com.baidu.hugegraph.util.E;
|
||||
import com.baidu.hugegraph.util.LongEncoding;
|
||||
|
||||
public class PropertyKey extends SchemaElement implements Propfiable {
|
||||
public class PropertyKey extends SchemaElement implements Propertiable {
|
||||
|
||||
private DataType dataType;
|
||||
private Cardinality cardinality;
|
||||
|
|
|
|||
|
|
@ -28,13 +28,13 @@ import com.baidu.hugegraph.HugeException;
|
|||
import com.baidu.hugegraph.HugeGraph;
|
||||
import com.baidu.hugegraph.backend.id.Id;
|
||||
import com.baidu.hugegraph.backend.id.IdGenerator;
|
||||
import com.baidu.hugegraph.type.Namifiable;
|
||||
import com.baidu.hugegraph.type.Typifiable;
|
||||
import com.baidu.hugegraph.type.Nameable;
|
||||
import com.baidu.hugegraph.type.Typeable;
|
||||
import com.baidu.hugegraph.type.define.SchemaStatus;
|
||||
import com.baidu.hugegraph.util.E;
|
||||
import com.google.common.base.Objects;
|
||||
|
||||
public abstract class SchemaElement implements Namifiable, Typifiable,
|
||||
public abstract class SchemaElement implements Nameable, Typeable,
|
||||
Cloneable {
|
||||
|
||||
public static final int MAX_PRIMITIVE_SYS_ID = 32;
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@ import com.baidu.hugegraph.HugeGraph;
|
|||
import com.baidu.hugegraph.backend.id.Id;
|
||||
import com.baidu.hugegraph.backend.id.IdGenerator;
|
||||
import com.baidu.hugegraph.type.HugeType;
|
||||
import com.baidu.hugegraph.type.Indexfiable;
|
||||
import com.baidu.hugegraph.type.Propfiable;
|
||||
import com.baidu.hugegraph.type.Indexable;
|
||||
import com.baidu.hugegraph.type.Propertiable;
|
||||
import com.baidu.hugegraph.util.E;
|
||||
import com.google.common.base.Objects;
|
||||
|
||||
public abstract class SchemaLabel extends SchemaElement
|
||||
implements Indexfiable, Propfiable {
|
||||
implements Indexable, Propertiable {
|
||||
|
||||
private final Set<Id> properties;
|
||||
private final Set<Id> nullableKeys;
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ public class HugeSecurityManager extends SecurityManager {
|
|||
"com.github.benmanes.caffeine.cache.BoundedLocalCache"
|
||||
);
|
||||
|
||||
private static final Set<String> WHITE_SYSTEM_PROPERTYS = ImmutableSet.of(
|
||||
private static final Set<String> WHITE_SYSTEM_PROPERTIES = ImmutableSet.of(
|
||||
"line.separator",
|
||||
"file.separator",
|
||||
"java.specification.version", // Sofa
|
||||
|
|
@ -350,7 +350,7 @@ public class HugeSecurityManager extends SecurityManager {
|
|||
@Override
|
||||
public void checkPropertyAccess(String key) {
|
||||
if (!callFromAcceptClassLoaders() && callFromGremlin() &&
|
||||
!WHITE_SYSTEM_PROPERTYS.contains(key) && !callFromBackendHbase() &&
|
||||
!WHITE_SYSTEM_PROPERTIES.contains(key) && !callFromBackendHbase() &&
|
||||
!callFromSnapshot() && !callFromRaft() &&
|
||||
!callFromSofaRpc()) {
|
||||
throw newSecurityException(
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
|
||||
package com.baidu.hugegraph.structure;
|
||||
|
||||
import com.baidu.hugegraph.type.Namifiable;
|
||||
import com.baidu.hugegraph.type.Typifiable;
|
||||
import com.baidu.hugegraph.type.Nameable;
|
||||
import com.baidu.hugegraph.type.Typeable;
|
||||
|
||||
public interface GraphType extends Namifiable, Typifiable {
|
||||
public interface GraphType extends Nameable, Typeable {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -295,7 +295,7 @@ public class HugeVertex extends HugeElement implements Vertex, Cloneable {
|
|||
// Check sortKeys
|
||||
List<Id> keys = this.graph().mapPkName2Id(elemKeys.keys());
|
||||
E.checkArgument(keys.containsAll(edgeLabel.sortKeys()),
|
||||
"The sort key(s) must be setted for the edge " +
|
||||
"The sort key(s) must be set for the edge " +
|
||||
"with label: '%s'", edgeLabel.name());
|
||||
|
||||
// Check whether passed all non-null props
|
||||
|
|
@ -307,7 +307,7 @@ public class HugeVertex extends HugeElement implements Vertex, Cloneable {
|
|||
@SuppressWarnings("unchecked")
|
||||
Collection<Id> missed = CollectionUtils.subtract(nonNullKeys, keys);
|
||||
E.checkArgument(false, "All non-null property keys: %s " +
|
||||
"of edge label '%s' must be setted, " +
|
||||
"of edge label '%s' must be set, " +
|
||||
"but missed keys: %s",
|
||||
this.graph().mapPkId2Name(nonNullKeys),
|
||||
edgeLabel.name(),
|
||||
|
|
|
|||
|
|
@ -697,8 +697,8 @@ public final class TraversalUtil {
|
|||
return validValue;
|
||||
}
|
||||
|
||||
public static void retriveSysprop(List<HasContainer> hasContainers,
|
||||
Function<HasContainer, Boolean> func) {
|
||||
public static void retrieveSysprop(List<HasContainer> hasContainers,
|
||||
Function<HasContainer, Boolean> func) {
|
||||
for (Iterator<HasContainer> iter = hasContainers.iterator();
|
||||
iter.hasNext();) {
|
||||
HasContainer container = iter.next();
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import java.util.Set;
|
|||
|
||||
import com.baidu.hugegraph.backend.id.Id;
|
||||
|
||||
public interface Indexfiable {
|
||||
public interface Indexable {
|
||||
|
||||
public Set<Id> indexLabels();
|
||||
}
|
||||
|
|
@ -19,7 +19,7 @@ package com.baidu.hugegraph.type;
|
|||
*
|
||||
* @author Matthias Broecheler (me@matthiasb.com)
|
||||
*/
|
||||
public interface Namifiable {
|
||||
public interface Nameable {
|
||||
/**
|
||||
* Returns the unique name of this entity.
|
||||
*
|
||||
|
|
@ -23,7 +23,7 @@ import java.util.Set;
|
|||
|
||||
import com.baidu.hugegraph.backend.id.Id;
|
||||
|
||||
public interface Propfiable {
|
||||
public interface Propertiable {
|
||||
|
||||
public Set<Id> properties();
|
||||
}
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
package com.baidu.hugegraph.type;
|
||||
|
||||
public interface Typifiable {
|
||||
public interface Typeable {
|
||||
|
||||
// Return schema/data type
|
||||
public HugeType type();
|
||||
|
|
@ -26,7 +26,7 @@ public enum HugeKeys {
|
|||
/* Column names of schema type (common) */
|
||||
ID(1, "id"),
|
||||
NAME(2, "name"),
|
||||
TIMESTANMP(3, "timestamp"),
|
||||
TIMESTAMP(3, "timestamp"),
|
||||
SCHEMA_TYPE(4, "schema_type"),
|
||||
|
||||
USER_DATA(10, "user_data"),
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ public final class ConfigUtil {
|
|||
}
|
||||
|
||||
public static Map<String, String> scanGraphsDir(String graphsDirPath) {
|
||||
LOG.info("Scaning option 'graphs' directory '{}'", graphsDirPath);
|
||||
LOG.info("Scanning option 'graphs' directory '{}'", graphsDirPath);
|
||||
File graphsDir = new File(graphsDirPath);
|
||||
E.checkArgument(graphsDir.exists() && graphsDir.isDirectory(),
|
||||
"Please ensure the path '%s' of option 'graphs' " +
|
||||
|
|
|
|||
|
|
@ -97,8 +97,8 @@ status() {
|
|||
|
||||
# Get status of HugeGraphServer to ensure it is alive
|
||||
get_status() {
|
||||
HTPP_CODE=`curl -I -s -w "%{http_code}" -o /dev/null $DETECT_URL`
|
||||
if [ $HTPP_CODE = 200 ]; then
|
||||
HTTP_CODE=`curl -I -s -w "%{http_code}" -o /dev/null $DETECT_URL`
|
||||
if [ $HTTP_CODE = 200 ]; then
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ character_set_server="utf8"
|
|||
collation_server="utf8_bin"
|
||||
|
||||
# Ensure operations involving astral characters fail loudly,
|
||||
# rather than mysql silently replacing each each byte of the
|
||||
# rather than mysql silently replacing each byte of the
|
||||
# original character with a U+FFFD replacement character.
|
||||
# See bug 1275425.
|
||||
sql_mode="NO_ENGINE_SUBSTITUTION,STRICT_ALL_TABLES"
|
||||
|
|
|
|||
|
|
@ -57,9 +57,9 @@ public class Example2 {
|
|||
|
||||
GraphTraversalSource g = graph.traversal();
|
||||
|
||||
GraphTraversal<Vertex, Vertex> vertexs = g.V();
|
||||
GraphTraversal<Vertex, Vertex> vertices = g.V();
|
||||
System.out.println(">>>> query all vertices: size=" +
|
||||
vertexs.toList().size());
|
||||
vertices.toList().size());
|
||||
|
||||
List<Edge> edges = g.E().toList();
|
||||
System.out.println(">>>> query all edges: size=" +
|
||||
|
|
|
|||
|
|
@ -90,10 +90,10 @@ public class PerfExample1 extends PerfExampleBase {
|
|||
Random random = new Random();
|
||||
int age = random.nextInt(70);
|
||||
String name = "P" + random.nextInt();
|
||||
Vertex vetex = graph.addVertex(T.label, "person",
|
||||
"name", name, "age", age);
|
||||
personIds.add(vetex.id());
|
||||
LOG.debug("Add person: {}", vetex);
|
||||
Vertex vertex = graph.addVertex(T.label, "person",
|
||||
"name", name, "age", age);
|
||||
personIds.add(vertex.id());
|
||||
LOG.debug("Add person: {}", vertex);
|
||||
}
|
||||
|
||||
LOG.debug("============== random software vertex ============");
|
||||
|
|
@ -101,11 +101,11 @@ public class PerfExample1 extends PerfExampleBase {
|
|||
Random random = new Random();
|
||||
int price = random.nextInt(10000) + 1;
|
||||
String name = "S" + random.nextInt();
|
||||
Vertex vetex = graph.addVertex(T.label, "software",
|
||||
"name", name, "lang", "java",
|
||||
"price", price);
|
||||
softwareIds.add(vetex.id());
|
||||
LOG.debug("Add software: {}", vetex);
|
||||
Vertex vertex = graph.addVertex(T.label, "software",
|
||||
"name", name, "lang", "java",
|
||||
"price", price);
|
||||
softwareIds.add(vertex.id());
|
||||
LOG.debug("Add software: {}", vertex);
|
||||
}
|
||||
|
||||
LOG.debug("========== random knows & created edges ==========");
|
||||
|
|
|
|||
|
|
@ -79,16 +79,16 @@ public class PerfExample2 extends PerfExampleBase {
|
|||
for (int time = 0; time < times; time++) {
|
||||
LOG.debug("============== random person vertex ===============");
|
||||
for (int i = 0; i < PERSON_NUM * multiple; i++) {
|
||||
Vertex vetex = graph.addVertex(T.label, "person");
|
||||
personIds.add(vetex.id());
|
||||
LOG.debug("Add person: {}", vetex);
|
||||
Vertex vertex = graph.addVertex(T.label, "person");
|
||||
personIds.add(vertex.id());
|
||||
LOG.debug("Add person: {}", vertex);
|
||||
}
|
||||
|
||||
LOG.debug("============== random software vertex ============");
|
||||
for (int i = 0; i < SOFTWARE_NUM * multiple; i++) {
|
||||
Vertex vetex = graph.addVertex(T.label, "software");
|
||||
softwareIds.add(vetex.id());
|
||||
LOG.debug("Add software: {}", vetex);
|
||||
Vertex vertex = graph.addVertex(T.label, "software");
|
||||
softwareIds.add(vertex.id());
|
||||
LOG.debug("Add software: {}", vertex);
|
||||
}
|
||||
|
||||
LOG.debug("========== random knows & created edges ==========");
|
||||
|
|
|
|||
|
|
@ -222,14 +222,14 @@ public abstract class PerfExampleBase {
|
|||
continue;
|
||||
}
|
||||
|
||||
LOG.debug("Qeury vertex {}: {}", i, id);
|
||||
LOG.debug("Query vertex {}: {}", i, id);
|
||||
Vertex vertex = graph.queryVertex(id);
|
||||
if (!vertex.id().equals(id)) {
|
||||
LOG.warn("Qeury vertex by id {} returned {}", id, vertex);
|
||||
LOG.warn("Query vertex by id {} returned {}", id, vertex);
|
||||
}
|
||||
total++;
|
||||
}
|
||||
LOG.debug("Qeury vertices with thread({}): {}", thread, total);
|
||||
LOG.debug("Query vertices with thread({}): {}", thread, total);
|
||||
}
|
||||
|
||||
protected void testQueryEdge(GraphManager graph,
|
||||
|
|
@ -248,7 +248,7 @@ public abstract class PerfExampleBase {
|
|||
continue;
|
||||
}
|
||||
|
||||
LOG.debug("Qeury vertex {}: {}", i, id);
|
||||
LOG.debug("Query vertex {}: {}", i, id);
|
||||
Iterator<Edge> edges = graph.queryVertexEdge(id, Directions.OUT);
|
||||
while (edges.hasNext()) {
|
||||
totalE++;
|
||||
|
|
@ -256,7 +256,7 @@ public abstract class PerfExampleBase {
|
|||
}
|
||||
totalV++;
|
||||
}
|
||||
LOG.debug("Qeury edges of vertices({}) with thread({}): {}",
|
||||
LOG.debug("Query edges of vertices({}) with thread({}): {}",
|
||||
totalV, thread, totalE);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ public class TaskExample {
|
|||
|
||||
@Override
|
||||
public Integer call() throws Exception {
|
||||
System.out.println(">>>> runing task with parameter: " +
|
||||
System.out.println(">>>> running task with parameter: " +
|
||||
this.task().input());
|
||||
for (int i = this.task().progress(); i <= 100 && this.run; i++) {
|
||||
System.out.println(">>>> progress " + i);
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ public class HbaseSessions extends BackendSessionPool {
|
|||
|
||||
private static final String COPROCESSOR_AGGR =
|
||||
"org.apache.hadoop.hbase.coprocessor.AggregateImplementation";
|
||||
private static final long SCANNER_CACHEING = 1000L;
|
||||
private static final long SCANNER_CACHING = 1000L;
|
||||
|
||||
private final String namespace;
|
||||
private Connection hbase;
|
||||
|
|
@ -113,7 +113,7 @@ public class HbaseSessions extends BackendSessionPool {
|
|||
hConfig = HBaseConfiguration.create(hConfig);
|
||||
long timeout = this.config().get(HbaseOptions.AGGR_TIMEOUT);
|
||||
hConfig.setLong("hbase.rpc.timeout", timeout * 1000L);
|
||||
hConfig.setLong("hbase.client.scanner.caching", SCANNER_CACHEING);
|
||||
hConfig.setLong("hbase.client.scanner.caching", SCANNER_CACHING);
|
||||
return new AggregationClient(hConfig);
|
||||
}
|
||||
|
||||
|
|
@ -373,11 +373,11 @@ public class HbaseSessions extends BackendSessionPool {
|
|||
}
|
||||
|
||||
/**
|
||||
* Scan records by multi rowkey prefixs from a table
|
||||
* Scan records by multi rowkey prefixes from a table
|
||||
*/
|
||||
public default R scan(String table, Set<byte[]> prefixs) {
|
||||
public default R scan(String table, Set<byte[]> prefixes) {
|
||||
FilterList orFilters = new FilterList(Operator.MUST_PASS_ONE);
|
||||
for (byte[] prefix : prefixs) {
|
||||
for (byte[] prefix : prefixes) {
|
||||
FilterList andFilters = new FilterList(Operator.MUST_PASS_ALL);
|
||||
List<RowRange> ranges = new ArrayList<>();
|
||||
ranges.add(new RowRange(prefix, true, null, true));
|
||||
|
|
|
|||
|
|
@ -77,11 +77,11 @@ public class HbaseTable extends BackendTable<Session, BackendEntry> {
|
|||
|
||||
protected static final byte[] CF = "f".getBytes();
|
||||
|
||||
private final HbaseShardSpliter shardSpliter;
|
||||
private final HbaseShardSplitter shardSplitter;
|
||||
|
||||
public HbaseTable(String table) {
|
||||
super(table);
|
||||
this.shardSpliter = new HbaseShardSpliter(this.table());
|
||||
this.shardSplitter = new HbaseShardSplitter(this.table());
|
||||
}
|
||||
|
||||
public static List<byte[]> cfs() {
|
||||
|
|
@ -94,7 +94,7 @@ public class HbaseTable extends BackendTable<Session, BackendEntry> {
|
|||
E.checkArgument(args.length == 1,
|
||||
"The args count of %s must be 1", meta);
|
||||
long splitSize = (long) args[0];
|
||||
return this.shardSpliter.getSplits(session, splitSize);
|
||||
return this.shardSplitter.getSplits(session, splitSize);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -245,8 +245,8 @@ public class HbaseTable extends BackendTable<Session, BackendEntry> {
|
|||
|
||||
protected <R> R queryByRange(HbaseSession<R> session,
|
||||
Shard shard, String page) {
|
||||
byte[] start = this.shardSpliter.position(shard.start());
|
||||
byte[] end = this.shardSpliter.position(shard.end());
|
||||
byte[] start = this.shardSplitter.position(shard.start());
|
||||
byte[] end = this.shardSplitter.position(shard.end());
|
||||
if (page != null && !page.isEmpty()) {
|
||||
byte[] position = PageState.fromString(page).position();
|
||||
E.checkArgument(start == null ||
|
||||
|
|
@ -286,9 +286,9 @@ public class HbaseTable extends BackendTable<Session, BackendEntry> {
|
|||
}
|
||||
}
|
||||
|
||||
private static class HbaseShardSpliter extends ShardSpliter<Session> {
|
||||
private static class HbaseShardSplitter extends ShardSplitter<Session> {
|
||||
|
||||
public HbaseShardSpliter(String table) {
|
||||
public HbaseShardSplitter(String table) {
|
||||
super(table);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ public class MysqlSerializer extends TableSerializer {
|
|||
protected void parseProperties(HugeElement element,
|
||||
TableBackendEntry.Row row) {
|
||||
String properties = row.column(HugeKeys.PROPERTIES);
|
||||
// Query edge will wraped by a vertex, whose properties is empty
|
||||
// Query edge will wrapped by a vertex, whose properties is empty
|
||||
if (properties.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,14 +65,14 @@ public abstract class MysqlTable
|
|||
private String insertTemplateTtl;
|
||||
private String deleteTemplate;
|
||||
|
||||
private final MysqlShardSpliter shardSpliter;
|
||||
private final MysqlShardSplitter shardSplitter;
|
||||
|
||||
public MysqlTable(String table) {
|
||||
super(table);
|
||||
this.insertTemplate = null;
|
||||
this.insertTemplateTtl = null;
|
||||
this.deleteTemplate = null;
|
||||
this.shardSpliter = new MysqlShardSpliter(this.table());
|
||||
this.shardSplitter = new MysqlShardSplitter(this.table());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -81,7 +81,7 @@ public abstract class MysqlTable
|
|||
E.checkArgument(args.length == 1,
|
||||
"The args count of %s must be 1", meta);
|
||||
long splitSize = (long) args[0];
|
||||
return this.shardSpliter.getSplits(session, splitSize);
|
||||
return this.shardSplitter.getSplits(session, splitSize);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -445,8 +445,8 @@ public abstract class MysqlTable
|
|||
Shard shard = (Shard) scan.value();
|
||||
|
||||
String page = query.page();
|
||||
if (MysqlShardSpliter.START.equals(shard.start()) &&
|
||||
MysqlShardSpliter.END.equals(shard.end()) &&
|
||||
if (MysqlShardSplitter.START.equals(shard.start()) &&
|
||||
MysqlShardSplitter.END.equals(shard.end()) &&
|
||||
(page == null || page.isEmpty())) {
|
||||
this.wrapLimit(select, query);
|
||||
return select;
|
||||
|
|
@ -459,7 +459,7 @@ public abstract class MysqlTable
|
|||
this.wrapPage(select, query, true);
|
||||
// < end
|
||||
WhereBuilder where = this.newWhereBuilder(false);
|
||||
if (!MysqlShardSpliter.END.equals(shard.end())) {
|
||||
if (!MysqlShardSplitter.END.equals(shard.end())) {
|
||||
where.and();
|
||||
where.lt(formatKey(partitionKey), shard.end());
|
||||
}
|
||||
|
|
@ -468,12 +468,12 @@ public abstract class MysqlTable
|
|||
// >= start
|
||||
WhereBuilder where = this.newWhereBuilder();
|
||||
boolean hasStart = false;
|
||||
if (!MysqlShardSpliter.START.equals(shard.start())) {
|
||||
if (!MysqlShardSplitter.START.equals(shard.start())) {
|
||||
where.gte(formatKey(partitionKey), shard.start());
|
||||
hasStart = true;
|
||||
}
|
||||
// < end
|
||||
if (!MysqlShardSpliter.END.equals(shard.end())) {
|
||||
if (!MysqlShardSplitter.END.equals(shard.end())) {
|
||||
if (hasStart) {
|
||||
where.and();
|
||||
}
|
||||
|
|
@ -698,14 +698,14 @@ public abstract class MysqlTable
|
|||
return names;
|
||||
}
|
||||
|
||||
private static class MysqlShardSpliter extends ShardSpliter<Session> {
|
||||
private static class MysqlShardSplitter extends ShardSplitter<Session> {
|
||||
|
||||
private static final String BASE64 =
|
||||
"0123456789=?ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
|
||||
"abcdefghijklmnopqrstuvwxyz";
|
||||
private static final int COUNT = 64;
|
||||
|
||||
public MysqlShardSpliter(String table) {
|
||||
public MysqlShardSplitter(String table) {
|
||||
super(table);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -192,8 +192,8 @@ public class WhereBuilder {
|
|||
|
||||
int size = clauses.size();
|
||||
int i = 0;
|
||||
for (StringBuilder cluase : clauses) {
|
||||
this.builder.append(cluase);
|
||||
for (StringBuilder clause : clauses) {
|
||||
this.builder.append(clause);
|
||||
if (++i != size) {
|
||||
this.builder.append(" AND ");
|
||||
}
|
||||
|
|
@ -204,7 +204,7 @@ public class WhereBuilder {
|
|||
/**
|
||||
* Concat as: key in (value1, value2...)
|
||||
* @param key the key to be concatted with 'IN' operator
|
||||
* @param values the values to be concated with ',' and wappred by '()'
|
||||
* @param values the values to be concated with ',' and wrapped by '()'
|
||||
* @return WhereBuilder
|
||||
*/
|
||||
public WhereBuilder in(String key, List<Object> values) {
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ public class PaloOptions extends OptionHolder {
|
|||
public static final ConfigOption<Integer> PALO_POLL_INTERVAL =
|
||||
new ConfigOption<>(
|
||||
"palo.poll_interval",
|
||||
"The execution peroid of the background thread that " +
|
||||
"The execution period of the background thread that " +
|
||||
"check whether need to load file data into Palo.",
|
||||
rangeInt(5, Integer.MAX_VALUE),
|
||||
5
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ public class PostgresqlSessions extends MysqlSessions {
|
|||
try {
|
||||
conn.createStatement().execute(sql);
|
||||
} catch (PSQLException e) {
|
||||
// CockroackDB not support 'template' arg of CREATE DATABASE
|
||||
// CockroachDB not support 'template' arg of CREATE DATABASE
|
||||
if (e.getMessage().contains("syntax error at or near " +
|
||||
"\"template\"")) {
|
||||
sql = String.format(COCKROACH_DB_CREATE, this.database());
|
||||
|
|
|
|||
|
|
@ -505,7 +505,7 @@ public abstract class RocksDBStore extends AbstractBackendStore<Session> {
|
|||
iterators.add(table.query(this.session(HugeType.OLAP), q));
|
||||
}
|
||||
entries = new MergeIterator<>(entries, iterators,
|
||||
BackendEntry::mergable);
|
||||
BackendEntry::mergeable);
|
||||
}
|
||||
return entries;
|
||||
} finally {
|
||||
|
|
|
|||
|
|
@ -62,11 +62,11 @@ public class RocksDBTable extends BackendTable<Session, BackendEntry> {
|
|||
|
||||
private static final Logger LOG = Log.logger(RocksDBStore.class);
|
||||
|
||||
private final RocksDBShardSpliter shardSpliter;
|
||||
private final RocksDBShardSplitter shardSplitter;
|
||||
|
||||
public RocksDBTable(String database, String table) {
|
||||
super(String.format("%s+%s", database, table));
|
||||
this.shardSpliter = new RocksDBShardSpliter(this.table());
|
||||
this.shardSplitter = new RocksDBShardSplitter(this.table());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -75,7 +75,7 @@ public class RocksDBTable extends BackendTable<Session, BackendEntry> {
|
|||
E.checkArgument(args.length == 1,
|
||||
"The args count of %s must be 1", meta);
|
||||
long splitSize = (long) args[0];
|
||||
return this.shardSpliter.getSplits(session, splitSize);
|
||||
return this.shardSplitter.getSplits(session, splitSize);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -261,8 +261,8 @@ public class RocksDBTable extends BackendTable<Session, BackendEntry> {
|
|||
|
||||
protected BackendColumnIterator queryByRange(Session session, Shard shard,
|
||||
String page) {
|
||||
byte[] start = this.shardSpliter.position(shard.start());
|
||||
byte[] end = this.shardSpliter.position(shard.end());
|
||||
byte[] start = this.shardSplitter.position(shard.start());
|
||||
byte[] end = this.shardSplitter.position(shard.end());
|
||||
if (page != null && !page.isEmpty()) {
|
||||
byte[] position = PageState.fromString(page).position();
|
||||
E.checkArgument(start == null ||
|
||||
|
|
@ -271,7 +271,7 @@ public class RocksDBTable extends BackendTable<Session, BackendEntry> {
|
|||
start = position;
|
||||
}
|
||||
if (start == null) {
|
||||
start = ShardSpliter.START_BYTES;
|
||||
start = ShardSplitter.START_BYTES;
|
||||
}
|
||||
int type = Session.SCAN_GTE_BEGIN;
|
||||
if (end != null) {
|
||||
|
|
@ -304,14 +304,14 @@ public class RocksDBTable extends BackendTable<Session, BackendEntry> {
|
|||
return BinaryEntryIterator.sizeOfEntry(entry);
|
||||
}
|
||||
|
||||
private static class RocksDBShardSpliter extends ShardSpliter<Session> {
|
||||
private static class RocksDBShardSplitter extends ShardSplitter<Session> {
|
||||
|
||||
private static final String MEM_SIZE = "rocksdb.size-all-mem-tables";
|
||||
private static final String SST_SIZE = "rocksdb.total-sst-files-size";
|
||||
|
||||
private static final String NUM_KEYS = "rocksdb.estimate-num-keys";
|
||||
|
||||
public RocksDBShardSpliter(String table) {
|
||||
public RocksDBShardSplitter(String table) {
|
||||
super(table);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -448,7 +448,7 @@ public class BaseApiTest {
|
|||
|
||||
List<Map> vertices = readList(content, "vertices", Map.class);
|
||||
|
||||
Map<String, String> vertextName2Ids = new HashMap<>();
|
||||
Map<String, String> vertexName2Ids = new HashMap<>();
|
||||
for (Map vertex : vertices) {
|
||||
Map properties = (Map) vertex.get("properties");
|
||||
if (properties == null ||
|
||||
|
|
@ -466,10 +466,10 @@ public class BaseApiTest {
|
|||
continue;
|
||||
}
|
||||
|
||||
vertextName2Ids.put(name, id);
|
||||
vertexName2Ids.put(name, id);
|
||||
}
|
||||
|
||||
return vertextName2Ids;
|
||||
return vertexName2Ids;
|
||||
}
|
||||
|
||||
protected static String id2Json(String params) {
|
||||
|
|
|
|||
|
|
@ -2634,7 +2634,7 @@ public class EdgeCoreTest extends BaseCoreTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testQueryEdgesByIdWithGraphAPIAndNotCommitedUpdate() {
|
||||
public void testQueryEdgesByIdWithGraphAPIAndNotCommittedUpdate() {
|
||||
HugeGraph graph = graph();
|
||||
init18Edges();
|
||||
|
||||
|
|
@ -2655,7 +2655,7 @@ public class EdgeCoreTest extends BaseCoreTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testQueryEdgesByIdWithGraphAPIAndNotCommitedRemoved() {
|
||||
public void testQueryEdgesByIdWithGraphAPIAndNotCommittedRemoved() {
|
||||
HugeGraph graph = graph();
|
||||
init18Edges();
|
||||
|
||||
|
|
@ -3310,7 +3310,7 @@ public class EdgeCoreTest extends BaseCoreTest {
|
|||
Assert.assertEquals("designer", vertices.get(0).label());
|
||||
|
||||
Assert.assertThrows(HugeException.class, () -> {
|
||||
// try to override vertex designer-456 wirh programmer-456
|
||||
// try to override vertex designer-456 with programmer-456
|
||||
graph.addVertex(T.label, "programmer", T.id, "456",
|
||||
"name", "marko", "age", 20, "city", "Beijing");
|
||||
graph.tx().commit();
|
||||
|
|
@ -3326,7 +3326,7 @@ public class EdgeCoreTest extends BaseCoreTest {
|
|||
"checkCustomVertexExist", false);
|
||||
params().graphEventHub().notify(Events.CACHE, "clear", null).get();
|
||||
try {
|
||||
// override vertex designer-456 wirh programmer-456
|
||||
// override vertex designer-456 with programmer-456
|
||||
graph.addVertex(T.label, "programmer", T.id, "456",
|
||||
"name", "marko", "age", 21, "city", "Beijing");
|
||||
graph.tx().commit();
|
||||
|
|
@ -5147,8 +5147,8 @@ public class EdgeCoreTest extends BaseCoreTest {
|
|||
query.scan(String.valueOf(Long.MIN_VALUE),
|
||||
String.valueOf(Long.MAX_VALUE));
|
||||
} else {
|
||||
query.scan(BackendTable.ShardSpliter.START,
|
||||
BackendTable.ShardSpliter.END);
|
||||
query.scan(BackendTable.ShardSplitter.START,
|
||||
BackendTable.ShardSplitter.END);
|
||||
}
|
||||
|
||||
query.limit(1);
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ public class MultiGraphsTest {
|
|||
graph.initBackend();
|
||||
graph.clearBackend();
|
||||
}
|
||||
destoryGraphs(graphs);
|
||||
destroyGraphs(graphs);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -184,7 +184,7 @@ public class MultiGraphsTest {
|
|||
for (HugeGraph graph : graphs) {
|
||||
graph.clearBackend();
|
||||
}
|
||||
destoryGraphs(graphs);
|
||||
destroyGraphs(graphs);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -211,7 +211,7 @@ public class MultiGraphsTest {
|
|||
for (HugeGraph graph : graphs) {
|
||||
graph.clearBackend();
|
||||
}
|
||||
destoryGraphs(graphs);
|
||||
destroyGraphs(graphs);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -273,7 +273,7 @@ public class MultiGraphsTest {
|
|||
g2.clearBackend();
|
||||
g3.clearBackend();
|
||||
|
||||
destoryGraphs(ImmutableList.of(g1, g2, g3));
|
||||
destroyGraphs(ImmutableList.of(g1, g2, g3));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -301,7 +301,7 @@ public class MultiGraphsTest {
|
|||
g2.clearBackend();
|
||||
graph.clearBackend();
|
||||
|
||||
destoryGraphs(ImmutableList.of(g1, g2, graph));
|
||||
destroyGraphs(ImmutableList.of(g1, g2, graph));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -343,7 +343,7 @@ public class MultiGraphsTest {
|
|||
root.getMessage());
|
||||
});
|
||||
|
||||
destoryGraphs(ImmutableList.of(g1));
|
||||
destroyGraphs(ImmutableList.of(g1));
|
||||
}
|
||||
|
||||
private static List<HugeGraph> openGraphs(String... graphNames) {
|
||||
|
|
@ -355,7 +355,7 @@ public class MultiGraphsTest {
|
|||
return graphs;
|
||||
}
|
||||
|
||||
private static void destoryGraphs(List<HugeGraph> graphs) {
|
||||
private static void destroyGraphs(List<HugeGraph> graphs) {
|
||||
for (HugeGraph graph : graphs) {
|
||||
try {
|
||||
graph.close();
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ public class VertexCoreTest extends BaseCoreTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testAddVertexWithInvalidPropertValueOfInt() {
|
||||
public void testAddVertexWithInvalidPropertyValueOfInt() {
|
||||
HugeGraph graph = graph();
|
||||
|
||||
SchemaManager schema = graph.schema();
|
||||
|
|
@ -256,7 +256,7 @@ public class VertexCoreTest extends BaseCoreTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testAddVertexWithInvalidPropertValueOfLong() {
|
||||
public void testAddVertexWithInvalidPropertyValueOfLong() {
|
||||
HugeGraph graph = graph();
|
||||
|
||||
SchemaManager schema = graph.schema();
|
||||
|
|
@ -276,7 +276,7 @@ public class VertexCoreTest extends BaseCoreTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testAddVertexWithInvalidPropertValueOfFloat() {
|
||||
public void testAddVertexWithInvalidPropertyValueOfFloat() {
|
||||
HugeGraph graph = graph();
|
||||
|
||||
SchemaManager schema = graph.schema();
|
||||
|
|
@ -298,7 +298,7 @@ public class VertexCoreTest extends BaseCoreTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testAddVertexWithInvalidPropertValueOfDouble() {
|
||||
public void testAddVertexWithInvalidPropertyValueOfDouble() {
|
||||
HugeGraph graph = graph();
|
||||
|
||||
SchemaManager schema = graph.schema();
|
||||
|
|
@ -2952,7 +2952,7 @@ public class VertexCoreTest extends BaseCoreTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testQueryByIdWithGraphAPIAndNotCommitedUpdate() {
|
||||
public void testQueryByIdWithGraphAPIAndNotCommittedUpdate() {
|
||||
HugeGraph graph = graph();
|
||||
init10Vertices();
|
||||
|
||||
|
|
@ -2975,7 +2975,7 @@ public class VertexCoreTest extends BaseCoreTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testQueryByIdWithGraphAPIAndNotCommitedRemoved() {
|
||||
public void testQueryByIdWithGraphAPIAndNotCommittedRemoved() {
|
||||
HugeGraph graph = graph();
|
||||
init10Vertices();
|
||||
|
||||
|
|
@ -3692,7 +3692,7 @@ public class VertexCoreTest extends BaseCoreTest {
|
|||
.remove(); // avoid merge property mode
|
||||
graph.tx().commit();
|
||||
|
||||
// qeury again after commit
|
||||
// query again after commit
|
||||
vertices = graph.traversal().V().hasLabel("person")
|
||||
.has("age", P.between(-1, 21)).toList();
|
||||
Assert.assertEquals(3, vertices.size());
|
||||
|
|
@ -7408,8 +7408,8 @@ public class VertexCoreTest extends BaseCoreTest {
|
|||
query.scan(String.valueOf(Long.MIN_VALUE),
|
||||
String.valueOf(Long.MAX_VALUE));
|
||||
} else {
|
||||
query.scan(BackendTable.ShardSpliter.START,
|
||||
BackendTable.ShardSpliter.END);
|
||||
query.scan(BackendTable.ShardSplitter.START,
|
||||
BackendTable.ShardSplitter.END);
|
||||
}
|
||||
|
||||
query.limit(1);
|
||||
|
|
@ -7835,7 +7835,7 @@ public class VertexCoreTest extends BaseCoreTest {
|
|||
Assert.assertThrows(IllegalArgumentException.class, () -> {
|
||||
/*
|
||||
* When query vertices/edge in page, the limit will be regard
|
||||
* as page size, it shoudn't exceed capacity
|
||||
* as page size, it shouldn't exceed capacity
|
||||
*/
|
||||
g.V().has("~page", "").limit(capacity + 1).toList();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ public class CassandraTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testParseRepilcaWithSimpleStrategy() {
|
||||
public void testParseReplicaWithSimpleStrategy() {
|
||||
String strategy = CassandraOptions.CASSANDRA_STRATEGY.name();
|
||||
String replica = CassandraOptions.CASSANDRA_REPLICATION.name();
|
||||
|
||||
|
|
@ -73,7 +73,7 @@ public class CassandraTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testParseRepilcaWithNetworkTopologyStrategy() {
|
||||
public void testParseReplicaWithNetworkTopologyStrategy() {
|
||||
String strategy = CassandraOptions.CASSANDRA_STRATEGY.name();
|
||||
String replica = CassandraOptions.CASSANDRA_REPLICATION.name();
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ public class CassandraTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testParseRepilcaWithSimpleStrategyAndEmptyReplica() {
|
||||
public void testParseReplicaWithSimpleStrategyAndEmptyReplica() {
|
||||
String strategy = CassandraOptions.CASSANDRA_STRATEGY.name();
|
||||
String replica = CassandraOptions.CASSANDRA_REPLICATION.name();
|
||||
|
||||
|
|
@ -117,7 +117,7 @@ public class CassandraTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testParseRepilcaWithSimpleStrategyAndDoubleReplica() {
|
||||
public void testParseReplicaWithSimpleStrategyAndDoubleReplica() {
|
||||
String strategy = CassandraOptions.CASSANDRA_STRATEGY.name();
|
||||
String replica = CassandraOptions.CASSANDRA_REPLICATION.name();
|
||||
|
||||
|
|
@ -136,7 +136,7 @@ public class CassandraTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testParseRepilcaWithSimpleStrategyAndStringReplica() {
|
||||
public void testParseReplicaWithSimpleStrategyAndStringReplica() {
|
||||
String strategy = CassandraOptions.CASSANDRA_STRATEGY.name();
|
||||
String replica = CassandraOptions.CASSANDRA_REPLICATION.name();
|
||||
|
||||
|
|
@ -155,7 +155,7 @@ public class CassandraTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testParseRepilcaWithNetworkTopologyStrategyAndStringReplica() {
|
||||
public void testParseReplicaWithNetworkTopologyStrategyAndStringReplica() {
|
||||
String strategy = CassandraOptions.CASSANDRA_STRATEGY.name();
|
||||
String replica = CassandraOptions.CASSANDRA_REPLICATION.name();
|
||||
|
||||
|
|
@ -174,7 +174,7 @@ public class CassandraTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testParseRepilcaWithNetworkTopologyStrategyWithoutDatacenter() {
|
||||
public void testParseReplicaWithNetworkTopologyStrategyWithoutDatacenter() {
|
||||
String strategy = CassandraOptions.CASSANDRA_STRATEGY.name();
|
||||
String replica = CassandraOptions.CASSANDRA_REPLICATION.name();
|
||||
|
||||
|
|
@ -193,7 +193,7 @@ public class CassandraTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testParseRepilcaWithNetworkTopologyStrategyAndEmptyReplica() {
|
||||
public void testParseReplicaWithNetworkTopologyStrategyAndEmptyReplica() {
|
||||
String strategy = CassandraOptions.CASSANDRA_STRATEGY.name();
|
||||
String replica = CassandraOptions.CASSANDRA_REPLICATION.name();
|
||||
|
||||
|
|
@ -212,7 +212,7 @@ public class CassandraTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testParseRepilcaWithNetworkTopologyStrategyAndDoubleReplica() {
|
||||
public void testParseReplicaWithNetworkTopologyStrategyAndDoubleReplica() {
|
||||
String strategy = CassandraOptions.CASSANDRA_STRATEGY.name();
|
||||
String replica = CassandraOptions.CASSANDRA_REPLICATION.name();
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ import org.junit.After;
|
|||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import com.baidu.hugegraph.backend.store.BackendTable.ShardSpliter.Range;
|
||||
import com.baidu.hugegraph.backend.store.BackendTable.ShardSplitter.Range;
|
||||
import com.baidu.hugegraph.backend.store.Shard;
|
||||
import com.baidu.hugegraph.testutil.Assert;
|
||||
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue