diff --git a/.gitignore b/.gitignore index f7bcdbf5a..782c85270 100644 --- a/.gitignore +++ b/.gitignore @@ -64,6 +64,7 @@ output/ *.tar.gz tree.txt *.versionsBackup +.flattened-pom.xml # eclipse ignore .settings/ diff --git a/hugegraph-api/pom.xml b/hugegraph-api/pom.xml index d7f2ce7b3..bdf5c3e59 100644 --- a/hugegraph-api/pom.xml +++ b/hugegraph-api/pom.xml @@ -19,23 +19,28 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + org.apache.hugegraph hugegraph - com.baidu.hugegraph - 0.13.0 + ${revision} + ../pom.xml 4.0.0 hugegraph-api + + 1.0.0 + + - com.baidu.hugegraph + org.apache.hugegraph hugegraph-core - ${project.version} + ${hugegraph-core-version} - com.baidu.hugegraph + org.apache.hugegraph hugegraph-rpc diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeFactoryAuthProxy.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeFactoryAuthProxy.java deleted file mode 100644 index 2fd14536d..000000000 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeFactoryAuthProxy.java +++ /dev/null @@ -1,335 +0,0 @@ -/* - * Copyright 2017 HugeGraph Authors - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with this - * work for additional information regarding copyright ownership. The ASF - * licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ - -package com.baidu.hugegraph.auth; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.StandardHugeGraph; -import com.baidu.hugegraph.backend.cache.CacheManager; -import com.baidu.hugegraph.backend.tx.AbstractTransaction; -import com.baidu.hugegraph.concurrent.LockManager; -import com.baidu.hugegraph.license.LicenseVerifier; -import com.baidu.hugegraph.metrics.ServerReporter; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.builder.EdgeLabelBuilder; -import com.baidu.hugegraph.schema.builder.IndexLabelBuilder; -import com.baidu.hugegraph.schema.builder.PropertyKeyBuilder; -import com.baidu.hugegraph.schema.builder.VertexLabelBuilder; -import com.baidu.hugegraph.serializer.JsonSerializer; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeProperty; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.task.HugeTask; -import com.baidu.hugegraph.task.StandardTaskScheduler; -import com.baidu.hugegraph.task.TaskCallable; -import com.baidu.hugegraph.task.TaskCallable.SysTaskCallable; -import com.baidu.hugegraph.task.TaskManager; -import com.baidu.hugegraph.traversal.optimize.HugeCountStepStrategy; -import com.baidu.hugegraph.traversal.optimize.HugeGraphStepStrategy; -import com.baidu.hugegraph.traversal.optimize.HugeVertexStepStrategy; -import com.baidu.hugegraph.util.Reflection; -import com.baidu.hugegraph.variables.HugeVariables; -import com.google.common.collect.ImmutableSet; -import org.apache.commons.configuration2.Configuration; - -public final class HugeFactoryAuthProxy { - - public static final String GRAPH_FACTORY = - "gremlin.graph=com.baidu.hugegraph.auth.HugeFactoryAuthProxy"; - - private static final Set PROTECT_METHODS = ImmutableSet.of( - "instance"); - - private static final Map GRAPHS = new HashMap<>(); - - static { - HugeGraphAuthProxy.setContext(HugeGraphAuthProxy.Context.admin()); - HugeFactoryAuthProxy.registerPrivateActions(); - } - - public static synchronized HugeGraph open(Configuration config) { - /* - * Inject authentication (replace HugeGraph with HugeGraphAuthProxy) - * TODO: Add verify to StandardHugeGraph() to prevent dynamic creation - */ - HugeGraph graph = HugeFactory.open(config); - HugeGraph proxy = GRAPHS.get(graph); - if (proxy == null) { - proxy = new HugeGraphAuthProxy(graph); - GRAPHS.put(graph, proxy); - } - return proxy; - } - - private static void registerPrivateActions() { - // Thread - Reflection.registerFieldsToFilter(java.lang.Thread.class, "name", "priority", "threadQ", "eetop", "single_step", "daemon", "stillborn", "target", "group", "contextClassLoader", "inheritedAccessControlContext", "threadInitNumber", "threadLocals", "inheritableThreadLocals", "stackSize", "nativeParkEventPointer", "tid", "threadSeqNumber", "threadStatus", "parkBlocker", "blocker", "blockerLock", "EMPTY_STACK_TRACE", "SUBCLASS_IMPLEMENTATION_PERMISSION", "uncaughtExceptionHandler", "defaultUncaughtExceptionHandler", "threadLocalRandomSeed", "threadLocalRandomSecondarySeed"); - Reflection.registerMethodsToFilter(java.lang.Thread.class, "exit", "dispatchUncaughtException", "clone", "isInterrupted", "registerNatives", "init", "init", "nextThreadNum", "nextThreadID", "blockedOn", "start0", "isCCLOverridden", "auditSubclass", "dumpThreads", "getThreads", "processQueue", "setPriority0", "stop0", "suspend0", "resume0", "interrupt0", "setNativeName"); - Reflection.registerFieldsToFilter(java.lang.ThreadLocal.class, "threadLocalHashCode", "nextHashCode", "HASH_INCREMENT"); - Reflection.registerMethodsToFilter(java.lang.ThreadLocal.class, "access$400", "createInheritedMap", "nextHashCode", "initialValue", "setInitialValue", "getMap", "createMap", "childValue"); - Reflection.registerMethodsToFilter(java.lang.InheritableThreadLocal.class, "getMap", "createMap", "childValue"); - - // HugeGraph - Reflection.registerFieldsToFilter(com.baidu.hugegraph.auth.StandardAuthenticator.class, "graph"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.auth.StandardAuthenticator.class, "initAdminUser", "inputPassword", "graph"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.auth.ConfigAuthenticator.class, "tokens"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.auth.HugeFactoryAuthProxy.class, "PROTECT_METHODS"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.auth.HugeFactoryAuthProxy.class, "genRegisterPrivateActions", "registerClass", "registerPrivateActions", "registerPrivateActions", "c"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.auth.HugeAuthenticator.User.class, "role", "client"); - Reflection.registerFieldsToFilter(org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser.class, "name"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.auth.HugeGraphAuthProxy.class, "LOG", "hugegraph", "taskScheduler", "authManager", "contexts", "$assertionsDisabled"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.auth.HugeGraphAuthProxy.class, "lambda$0", "access$3", "access$4", "access$2", "access$5", "resetContext", "logUser", "verifyAdminPermission", "verifyStatusPermission", "verifyPermission", "verifySchemaPermission", "verifySchemaPermission", "verifySchemaPermission", "verifySchemaPermission", "verifyNamePermission", "verifyNameExistsPermission", "verifyElemPermission", "verifyElemPermission", "verifyElemPermission", "verifyElemPermission", "verifyResPermission", "verifyResPermission", "verifyUserPermission", "verifyUserPermission", "verifyUserPermission", "getContextString", "access$6", "access$7", "lambda$1", "lambda$2", "lambda$3", "lambda$4", "lambda$5", "lambda$6", "lambda$7", "lambda$8", "lambda$9", "lambda$10", "lambda$11", "lambda$12", "lambda$13", "lambda$14", "lambda$15", "lambda$16", "lambda$17", "lambda$18", "lambda$19", "lambda$20", "lambda$21", "lambda$22", "lambda$23", "lambda$24", "access$8", "access$9", "access$10", "setContext", "getContext"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.auth.HugeGraphAuthProxy.AuthManagerProxy.class, "authManager", "this$0"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.auth.HugeGraphAuthProxy.AuthManagerProxy.class, "currentUsername", "updateCreator"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.auth.HugeGraphAuthProxy.TaskSchedulerProxy.class, "taskScheduler", "this$0"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.auth.HugeGraphAuthProxy.TaskSchedulerProxy.class, "lambda$0", "lambda$1", "lambda$2", "verifyTaskPermission", "verifyTaskPermission", "verifyTaskPermission", "verifyTaskPermission", "hasTaskPermission"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.auth.HugeGraphAuthProxy.GraphTraversalSourceProxy.class, "this$0"); - Reflection.registerFieldsToFilter(org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource.class, "connection", "graph", "strategies", "bytecode"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.auth.HugeGraphAuthProxy.TraversalStrategiesProxy.class, "REST_WOEKER", "serialVersionUID", "strategies", "this$0"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.auth.HugeGraphAuthProxy.TraversalStrategiesProxy.class, "translate"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.auth.HugeGraphAuthProxy.VariablesProxy.class, "variables", "this$0"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.auth.HugeGraphAuthProxy.Context.class, "ADMIN", "user"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.auth.HugeGraphAuthProxy.ContextTask.class, "runner", "context"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.StandardHugeGraph.class, "LOG", "started", "closed", "mode", "variables", "name", "params", "configuration", "schemaEventHub", "graphEventHub", "indexEventHub", "writeRateLimiter", "readRateLimiter", "taskManager", "authManager", "features", "storeProvider", "tx", "ramtable", "$assertionsDisabled"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.StandardHugeGraph.class, "lambda$0", "access$3", "access$4", "access$2", "access$5", "access$6", "access$7", "waitUntilAllTasksCompleted", "access$8", "loadStoreProvider", "graphTransaction", "schemaTransaction", "openSchemaTransaction", "checkGraphNotClosed", "openSystemTransaction", "openGraphTransaction", "systemTransaction", "access$9", "access$10", "access$11", "access$12", "access$13", "access$14", "access$15", "access$16", "access$17", "access$18", "serializer", "loadSchemaStore", "loadSystemStore", "loadGraphStore", "closeTx", "analyzer", "serverInfoManager", "reloadRamtable", "reloadRamtable", "access$19", "access$20", "access$21"); - Reflection.registerFieldsToFilter(loadClass("com.baidu.hugegraph.StandardHugeGraph$StandardHugeGraphParams"), "graph", "this$0"); - Reflection.registerMethodsToFilter(loadClass("com.baidu.hugegraph.StandardHugeGraph$StandardHugeGraphParams"), "access$1", "graph"); - Reflection.registerFieldsToFilter(loadClass("com.baidu.hugegraph.StandardHugeGraph$TinkerPopTransaction"), "refs", "opened", "transactions", "this$0", "$assertionsDisabled"); - Reflection.registerMethodsToFilter(loadClass("com.baidu.hugegraph.StandardHugeGraph$TinkerPopTransaction"), "lambda$0", "access$3", "access$2", "lambda$1", "graphTransaction", "schemaTransaction", "systemTransaction", "access$1", "setOpened", "doCommit", "verifyOpened", "doRollback", "doClose", "destroyTransaction", "doOpen", "setClosed", "getOrNewTransaction", "access$0", "resetState"); - Reflection.registerFieldsToFilter(org.apache.tinkerpop.gremlin.structure.util.AbstractThreadLocalTransaction.class, "readWriteConsumerInternal", "closeConsumerInternal", "transactionListeners"); - Reflection.registerMethodsToFilter(org.apache.tinkerpop.gremlin.structure.util.AbstractThreadLocalTransaction.class, "doClose", "fireOnCommit", "fireOnRollback", "doReadWrite", "lambda$fireOnRollback$1", "lambda$fireOnCommit$0"); - Reflection.registerFieldsToFilter(org.apache.tinkerpop.gremlin.structure.util.AbstractTransaction.class, "g"); - Reflection.registerMethodsToFilter(org.apache.tinkerpop.gremlin.structure.util.AbstractTransaction.class, "doCommit", "doRollback", "doClose", "doOpen", "fireOnCommit", "fireOnRollback", "doReadWrite"); - Reflection.registerFieldsToFilter(loadClass("com.baidu.hugegraph.StandardHugeGraph$Txs"), "schemaTx", "systemTx", "graphTx", "openedTime", "$assertionsDisabled"); - Reflection.registerMethodsToFilter(loadClass("com.baidu.hugegraph.StandardHugeGraph$Txs"), "access$2", "access$1", "access$0"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.backend.tx.GraphTransaction.class, "indexTx", "addedVertices", "removedVertices", "addedEdges", "removedEdges", "addedProps", "removedProps", "updatedVertices", "updatedEdges", "updatedOldestProps", "locksTable", "checkCustomVertexExist", "checkAdjacentVertexExist", "lazyLoadAdjacentVertex", "ignoreInvalidEntry", "commitPartOfAdjacentEdges", "batchSize", "pageSize", "verticesCapacity", "edgesCapacity", "$assertionsDisabled", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$IdStrategy"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.backend.tx.GraphTransaction.class, "lambda$0", "lambda$1", "lambda$2", "lambda$3", "lambda$4", "lambda$5", "lambda$6", "lambda$7", "lambda$8", "lambda$9", "lambda$10", "lambda$11", "lambda$12", "lambda$13", "lambda$14", "lambda$15", "lambda$16", "lambda$17", "lambda$18", "lambda$19", "access$1", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$IdStrategy", "indexTransaction", "indexTransaction", "beforeWrite", "prepareCommit", "verticesInTxSize", "edgesInTxSize", "checkTxVerticesCapacity", "checkTxEdgesCapacity", "verticesInTxUpdated", "verticesInTxRemoved", "removingEdgeOwner", "prepareDeletions", "prepareDeletions", "prepareUpdates", "prepareAdditions", "checkVertexExistIfCustomizedId", "checkAggregateProperty", "checkAggregateProperty", "checkNonnullProperty", "queryEdgesFromBackend", "commitPartOfEdgeDeletions", "optimizeQueries", "checkVertexLabel", "checkId", "queryVerticesFromBackend", "joinTxVertices", "joinTxEdges", "lockForUpdateProperty", "optimizeQuery", "verifyVerticesConditionQuery", "verifyEdgesConditionQuery", "indexQuery", "joinTxRecords", "propertyUpdated", "parseEntry", "traverseByLabel", "reset", "queryVerticesByIds", "filterUnmatchedRecords", "skipOffsetOrStopLimit", "filterExpiredResultFromFromBackend", "queryEdgesByIds", "matchEdgeSortKeys", "rightResultFromIndexQuery"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.backend.tx.IndexableTransaction.class, "$assertionsDisabled"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.backend.tx.IndexableTransaction.class, "indexTransaction", "commit2Backend", "reset"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.backend.tx.AbstractTransaction.class, "LOG", "ownerThread", "autoCommit", "closed", "committing", "committing2Backend", "graph", "store", "mutation", "serializer", "$assertionsDisabled"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.backend.tx.AbstractTransaction.class, "beforeWrite", "prepareCommit", "params", "mutation", "commit2Backend", "autoCommit", "beforeRead", "afterWrite", "afterRead", "commitMutation2Backend", "checkOwnerThread", "doAction", "store", "reset"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.HugeFactory.class, "LOG", "NAME_REGEX", "graphs"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.HugeFactory.class, "lambda$0"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.schema.SchemaElement.class, "graph", "id", "name", "userdata", "status"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.structure.HugeVertex.class, "EMPTY_SET", "id", "label", "edges", "$assertionsDisabled", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$IdStrategy", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$HugeKeys"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.structure.HugeVertex.class, "$SWITCH_TABLE$com$baidu$hugegraph$type$define$IdStrategy", "newProperty", "newProperty", "tx", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$HugeKeys", "checkIdLength", "onUpdateProperty", "ensureFilledProperties", "clone", "clone"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.structure.HugeElement.class, "EMPTY_MAP", "MAX_PROPERTIES", "graph", "properties", "expiredTime", "removed", "fresh", "propLoaded", "defaultValueUpdated", "$assertionsDisabled", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$Cardinality"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.structure.HugeElement.class, "removed", "addProperty", "newProperty", "tx", "onUpdateProperty", "ensureFilledProperties", "propLoaded", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$Cardinality", "getIdValue", "fresh", "updateToDefaultValueIfNone", "copyProperties"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.structure.HugeEdge.class, "id", "label", "name", "sourceVertex", "targetVertex", "isOutEdge", "$assertionsDisabled", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$HugeKeys", "$SWITCH_TABLE$org$apache$tinkerpop$gremlin$structure$Direction"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.structure.HugeEdge.class, "checkAdjacentVertexExist", "newProperty", "newProperty", "tx", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$HugeKeys", "onUpdateProperty", "ensureFilledProperties", "$SWITCH_TABLE$org$apache$tinkerpop$gremlin$structure$Direction", "clone", "clone"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.structure.HugeProperty.class, "owner", "pkey", "value"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.variables.HugeVariables.class, "LOG", "VARIABLES", "VARIABLE_KEY", "VARIABLE_TYPE", "BYTE_VALUE", "BOOLEAN_VALUE", "INTEGER_VALUE", "LONG_VALUE", "FLOAT_VALUE", "DOUBLE_VALUE", "STRING_VALUE", "LIST", "SET", "TYPES", "params", "graph"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.variables.HugeVariables.class, "createPropertyKey", "queryAllVariableVertices", "queryVariableVertex", "createVariableVertex", "removeVariableVertex", "extractSingleObject", "setProperty"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.schema.SchemaManager.class, "transaction", "graph"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.schema.SchemaManager.class, "lambda$0", "lambda$1", "lambda$2", "lambda$3", "checkExists"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.schema.builder.PropertyKeyBuilder.class, "id", "name", "dataType", "cardinality", "aggregateType", "checkExist", "userdata", "$assertionsDisabled"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.schema.builder.PropertyKeyBuilder.class, "lambda$0", "checkStableVars", "checkAggregateType", "hasSameProperties"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.schema.builder.AbstractBuilder.class, "transaction", "graph"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.schema.builder.AbstractBuilder.class, "rebuildIndex", "graph", "checkSchemaName", "validOrGenerateId", "lockCheckAndCreateSchema", "propertyKeyOrNull", "checkSchemaIdIfRestoringMode", "vertexLabelOrNull", "edgeLabelOrNull", "indexLabelOrNull", "updateSchemaStatus"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.schema.builder.VertexLabelBuilder.class, "id", "name", "idStrategy", "properties", "primaryKeys", "nullableKeys", "ttl", "ttlStartTime", "enableLabelIndex", "userdata", "checkExist", "$assertionsDisabled", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$Action", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$IdStrategy"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.schema.builder.VertexLabelBuilder.class, "lambda$0", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$IdStrategy", "checkStableVars", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$Action", "checkProperties", "checkNullableKeys", "checkIdStrategy", "checkPrimaryKeys", "hasSameProperties", "checkTtl", "checkUserdata", "mapPkId2Name", "mapPkId2Name"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.schema.builder.EdgeLabelBuilder.class, "id", "name", "sourceLabel", "targetLabel", "frequency", "properties", "sortKeys", "nullableKeys", "ttl", "ttlStartTime", "enableLabelIndex", "userdata", "checkExist", "$assertionsDisabled", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$Action"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.schema.builder.EdgeLabelBuilder.class, "lambda$0", "checkStableVars", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$Action", "checkProperties", "checkNullableKeys", "checkSortKeys", "checkRelation", "hasSameProperties", "checkTtl", "checkUserdata", "mapPkId2Name", "mapPkId2Name"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.schema.builder.IndexLabelBuilder.class, "id", "name", "baseType", "baseValue", "indexType", "indexFields", "userdata", "checkExist", "rebuild", "$assertionsDisabled", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$DataType", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$IndexType"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.schema.builder.IndexLabelBuilder.class, "lambda$0", "checkStableVars", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$DataType", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$IndexType", "checkBaseType", "checkIndexType", "checkFields4Range", "loadElement", "checkFields", "checkRepeatIndex", "checkRepeatIndex", "checkRepeatIndex", "checkPrimaryKeyIndex", "checkRepeatRangeIndex", "checkRepeatSearchIndex", "checkRepeatSecondaryIndex", "checkRepeatShardIndex", "checkRepeatUniqueIndex", "removeSubIndex", "hasSubIndex", "allStringIndex", "oneNumericField", "hasSameProperties"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.task.TaskManager.class, "LOG", "SCHEDULE_PERIOD", "THREADS", "MANAGER", "schedulers", "taskExecutor", "taskDbExecutor", "serverInfoDbExecutor", "schedulerExecutor", "contexts", "$assertionsDisabled"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.task.TaskManager.class, "lambda$0", "resetContext", "closeTaskTx", "setContext", "instance", "closeSchedulerTx", "notifyNewTask", "scheduleOrExecuteJob", "scheduleOrExecuteJobForGraph"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.task.StandardTaskScheduler.class, "LOG", "graph", "serverManager", "taskExecutor", "taskDbExecutor", "eventListener", "tasks", "taskTx", "NO_LIMIT", "PAGE_SIZE", "QUERY_INTERVAL", "MAX_PENDING_TASKS", "$assertionsDisabled"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.task.StandardTaskScheduler.class, "lambda$0", "lambda$1", "lambda$2", "lambda$3", "lambda$4", "lambda$5", "lambda$6", "lambda$7", "tx", "listenChanges", "unlistenChanges", "submitTask", "queryTask", "queryTask", "queryTask", "call", "call", "remove", "sleep", "taskDone", "serverManager", "supportsPaging", "restore", "checkOnMasterNode", "waitUntilTaskCompleted", "scheduleTasks", "executeTasksOnWorker", "cancelTasksOnWorker"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.task.HugeTask.class, "LOG", "DECOMPRESS_RATIO", "scheduler", "callable", "type", "name", "id", "parent", "dependencies", "description", "context", "create", "server", "load", "status", "progress", "update", "retries", "input", "result", "$assertionsDisabled"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.task.HugeTask.class, "property", "scheduler", "scheduler", "asArray", "checkPropertySize", "checkPropertySize", "checkDependenciesSuccess", "toOrderSet", "done", "callable", "setException", "set", "result", "status"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.task.TaskCallable.class, "LOG", "ERROR_COMMIT", "ERROR_MESSAGES", "task", "graph", "lastSaveTime", "saveInterval"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.task.TaskCallable.class, "graph", "closeTx", "cancelled", "done", "task", "save", "needSaveWithEx"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.task.TaskCallable.SysTaskCallable.class, "params"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.task.TaskCallable.SysTaskCallable.class, "params", "params"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.auth.StandardAuthManager.class, "CACHE_EXPIRE", "graph", "eventListener", "usersCache", "users", "groups", "targets", "belong", "access", "$assertionsDisabled"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.auth.StandardAuthManager.class, "lambda$0", "listenChanges", "unlistenChanges", "invalidCache", "initSchemaIfNeeded", "rolePermission", "rolePermission", "rolePermission", "cache"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.auth.SchemaDefine.class, "graph", "label"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.auth.SchemaDefine.class, "schema", "createPropertyKey", "createPropertyKey", "createPropertyKey", "existEdgeLabel", "createRangeIndex", "unhideField", "hideField", "existVertexLabel", "initProperties"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.auth.EntityManager.class, "graph", "label", "deser", "NO_LIMIT", "$assertionsDisabled"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.auth.EntityManager.class, "toList", "graph", "tx", "commitOrRollback", "unhideLabel", "queryById", "queryEntity", "constructVertex", "save", "query"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.auth.RelationshipManager.class, "graph", "label", "deser", "NO_LIMIT", "$assertionsDisabled"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.auth.RelationshipManager.class, "lambda$0", "toList", "graph", "tx", "commitOrRollback", "unhideLabel", "queryById", "queryRelationship", "newVertex", "save"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.backend.cache.CacheManager.class, "LOG", "INSTANCE", "TIMER_TICK_PERIOD", "LOG_TICK_COST_TIME", "caches", "timer"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.backend.cache.CacheManager.class, "access$0", "scheduleTimer", "instance"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.concurrent.LockManager.class, "INSTANCE", "lockGroupMap"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.concurrent.LockManager.class, "instance"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.license.LicenseVerifier.class, "LOG", "LICENSE_PARAM_PATH", "INSTANCE", "CHECK_INTERVAL", "lastCheckTime", "verifyParam", "manager"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.license.LicenseVerifier.class, "buildVerifyParam", "initLicenseParam", "verifyPublicCert", "instance"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.metrics.ServerReporter.class, "instance", "gauges", "counters", "histograms", "meters", "timers"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.metrics.ServerReporter.class, "instance", "instance"); - Reflection.registerFieldsToFilter(com.codahale.metrics.ScheduledReporter.class, "LOG", "FACTORY_ID", "registry", "executor", "shutdownExecutorOnStop", "disabledMetricAttributes", "scheduledFuture", "filter", "durationFactor", "durationUnit", "rateFactor", "rateUnit"); - Reflection.registerMethodsToFilter(com.codahale.metrics.ScheduledReporter.class, "convertDuration", "convertRate", "getRateUnit", "getDurationUnit", "isShutdownExecutorOnStop", "getDisabledMetricAttributes", "calculateRateUnit", "createDefaultExecutor", "lambda$start$0", "start"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.serializer.JsonSerializer.class, "LBUF_SIZE", "INSTANCE"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.serializer.JsonSerializer.class, "writeIterator", "instance"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.traversal.optimize.HugeVertexStepStrategy.class, "serialVersionUID", "INSTANCE"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.traversal.optimize.HugeVertexStepStrategy.class, "instance"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.traversal.optimize.HugeGraphStepStrategy.class, "serialVersionUID", "INSTANCE"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.traversal.optimize.HugeGraphStepStrategy.class, "instance"); - Reflection.registerFieldsToFilter(com.baidu.hugegraph.traversal.optimize.HugeCountStepStrategy.class, "serialVersionUID", "INSTANCE"); - Reflection.registerMethodsToFilter(com.baidu.hugegraph.traversal.optimize.HugeCountStepStrategy.class, "lambda$0", "instance"); - - // Enable this line to generate registration statement - //genRegisterPrivateActions(); - } - - @SuppressWarnings("unused") - private static void genRegisterPrivateActions() { - registerPrivateActions(Thread.class); - registerPrivateActions(ThreadLocal.class); - registerPrivateActions(InheritableThreadLocal.class); - - registerPrivateActions(StandardAuthenticator.class); - registerPrivateActions(ConfigAuthenticator.class); - registerPrivateActions(HugeFactoryAuthProxy.class); - registerPrivateActions(HugeAuthenticator.User.class); - - registerPrivateActions(HugeGraphAuthProxy.class); - registerPrivateActions(HugeGraphAuthProxy.AuthManagerProxy.class); - registerPrivateActions(HugeGraphAuthProxy.TaskSchedulerProxy.class); - registerPrivateActions(HugeGraphAuthProxy.GraphTraversalSourceProxy.class); - registerPrivateActions(HugeGraphAuthProxy.TraversalStrategiesProxy.class); - registerPrivateActions(HugeGraphAuthProxy.VariablesProxy.class); - registerPrivateActions(HugeGraphAuthProxy.Context.class); - registerPrivateActions(HugeGraphAuthProxy.ContextThreadPoolExecutor.class); - registerPrivateActions(HugeGraphAuthProxy.ContextTask.class); - - for (Class clazz : StandardHugeGraph.PROTECT_CLASSES) { - registerPrivateActions(clazz); - } - - registerPrivateActions(HugeFactory.class); - registerPrivateActions(AbstractTransaction.class); - - registerPrivateActions(SchemaElement.class); - registerPrivateActions(HugeVertex.class); - registerPrivateActions(HugeEdge.class); - registerPrivateActions(HugeProperty.class); - registerPrivateActions(HugeVariables.class); - - registerPrivateActions(SchemaManager.class); - registerPrivateActions(PropertyKeyBuilder.class); - registerPrivateActions(VertexLabelBuilder.class); - registerPrivateActions(EdgeLabelBuilder.class); - registerPrivateActions(IndexLabelBuilder.class); - - registerPrivateActions(TaskManager.class); - registerPrivateActions(StandardTaskScheduler.class); - registerPrivateActions(HugeTask.class); - registerPrivateActions(TaskCallable.class); - registerPrivateActions(SysTaskCallable.class); - - registerPrivateActions(StandardAuthManager.class); - registerPrivateActions(SchemaDefine.class); - registerPrivateActions(EntityManager.class); - registerPrivateActions(RelationshipManager.class); - - // Don't shield them because need to access by auth RPC - //registerPrivateActions(HugeUser.class); - //registerPrivateActions(RolePermission.class); - //registerPrivateActions(HugeResource.class); - - registerPrivateActions(CacheManager.class); - registerPrivateActions(LockManager.class); - registerPrivateActions(LicenseVerifier.class); - registerPrivateActions(ServerReporter.class); - registerPrivateActions(JsonSerializer.class); - registerPrivateActions(HugeVertexStepStrategy.class); - registerPrivateActions(HugeGraphStepStrategy.class); - registerPrivateActions(HugeCountStepStrategy.class); - } - - private static void registerPrivateActions(Class clazz) { - while (clazz != Object.class) { - List fields = new ArrayList<>(); - for (Field field : clazz.getDeclaredFields()) { - if (!Modifier.isPublic(field.getModifiers())) { - fields.add(field.getName()); - } - } - List methods = new ArrayList<>(); - for (Method method : clazz.getDeclaredMethods()) { - if (!Modifier.isPublic(method.getModifiers()) || - PROTECT_METHODS.contains(method.getName())) { - methods.add(method.getName()); - } - } - registerClass(clazz, fields, methods); - clazz = clazz.getSuperclass(); - } - } - - private static boolean registerClass(Class clazz, - List fields, - List methods) { - if (clazz.getName().startsWith("java") || - fields.isEmpty() && methods.isEmpty()) { - return false; - } - final String[] array = new String[fields.size()]; - try { - Reflection.registerFieldsToFilter(clazz, fields.toArray(array)); - Reflection.registerMethodsToFilter(clazz, methods.toArray(array)); - } catch (IllegalArgumentException e) { - if (e.getMessage().contains("Filter already registered: class")) { - return false; - } - throw e; - } - - String code; - code = String.format("Reflection.registerFieldsToFilter(%s.class, \"%s\");", - clazz.getCanonicalName(), String.join("\", \"", fields)); - if (!fields.isEmpty()) { - // CHECKSTYLE:OFF - System.out.println(code); - // CHECKSTYLE:ON - } - - code = String.format("Reflection.registerMethodsToFilter(%s.class, \"%s\");", - clazz.getCanonicalName(), String.join("\", \"", methods)); - if (!methods.isEmpty()) { - // CHECKSTYLE:OFF - System.out.println(code); - // CHECKSTYLE:ON - } - - return true; - } - - private static Class loadClass(String clazz) { - try { - return Class.forName(clazz); - } catch (ClassNotFoundException e) { - throw new HugeException(e.getMessage(), e); - } - } -} diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/API.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/API.java similarity index 94% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/API.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/API.java index ab84acad2..e453ea1e7 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/API.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/API.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.util.Collection; import java.util.Map; @@ -29,16 +29,16 @@ import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.NotSupportedException; import jakarta.ws.rs.core.MediaType; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.define.Checkable; +import org.apache.hugegraph.metrics.MetricsUtil; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.define.Checkable; -import com.baidu.hugegraph.metrics.MetricsUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.Meter; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/AccessAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/AccessAPI.java similarity index 93% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/AccessAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/AccessAPI.java index b616d6dd9..73e7eeb36 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/AccessAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/AccessAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.auth; +package org.apache.hugegraph.api.auth; import java.util.List; @@ -35,19 +35,19 @@ import jakarta.ws.rs.core.Context; import jakarta.inject.Singleton; import jakarta.ws.rs.Path; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.define.Checkable; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.StatusFilter.Status; -import com.baidu.hugegraph.auth.HugeAccess; -import com.baidu.hugegraph.auth.HugePermission; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.define.Checkable; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter.Status; +import org.apache.hugegraph.auth.HugeAccess; +import org.apache.hugegraph.auth.HugePermission; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/BelongAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/BelongAPI.java similarity index 93% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/BelongAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/BelongAPI.java index 0435c6088..94b48ef60 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/BelongAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/BelongAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.auth; +package org.apache.hugegraph.api.auth; import java.util.List; @@ -35,18 +35,18 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; import jakarta.inject.Singleton; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.define.Checkable; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.StatusFilter.Status; -import com.baidu.hugegraph.auth.HugeBelong; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.define.Checkable; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter.Status; +import org.apache.hugegraph.auth.HugeBelong; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/GroupAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/GroupAPI.java similarity index 92% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/GroupAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/GroupAPI.java index 943a5d8bb..abfcfae64 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/GroupAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/GroupAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.auth; +package org.apache.hugegraph.api.auth; import java.util.List; @@ -35,18 +35,18 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; import jakarta.inject.Singleton; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.define.Checkable; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.StatusFilter.Status; -import com.baidu.hugegraph.auth.HugeGroup; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.define.Checkable; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter.Status; +import org.apache.hugegraph.auth.HugeGroup; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/LoginAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/LoginAPI.java similarity index 89% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/LoginAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/LoginAPI.java index 08e190393..67c580d91 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/LoginAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/LoginAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.auth; +package org.apache.hugegraph.api.auth; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.inject.Singleton; @@ -36,19 +36,18 @@ import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.HttpHeaders; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.define.Checkable; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.AuthenticationFilter; -import com.baidu.hugegraph.api.filter.StatusFilter; -import com.baidu.hugegraph.api.filter.StatusFilter.Status; -import com.baidu.hugegraph.auth.AuthConstant; -import com.baidu.hugegraph.auth.UserWithRole; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.define.Checkable; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.AuthenticationFilter; +import org.apache.hugegraph.api.filter.StatusFilter.Status; +import org.apache.hugegraph.auth.AuthConstant; +import org.apache.hugegraph.auth.UserWithRole; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; @@ -63,7 +62,7 @@ public class LoginAPI extends API { @POST @Timed @Path("login") - @Status(StatusFilter.Status.OK) + @Status(Status.OK) @Consumes(APPLICATION_JSON) @Produces(APPLICATION_JSON_WITH_CHARSET) public String login(@Context GraphManager manager, @@ -86,7 +85,7 @@ public class LoginAPI extends API { @DELETE @Timed @Path("logout") - @Status(StatusFilter.Status.OK) + @Status(Status.OK) @Consumes(APPLICATION_JSON) @Produces(APPLICATION_JSON_WITH_CHARSET) public void logout(@Context GraphManager manager, @@ -110,7 +109,7 @@ public class LoginAPI extends API { @GET @Timed @Path("verify") - @Status(StatusFilter.Status.OK) + @Status(Status.OK) @Consumes(APPLICATION_JSON) @Produces(APPLICATION_JSON_WITH_CHARSET) public String verifyToken(@Context GraphManager manager, diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/ProjectAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/ProjectAPI.java similarity index 94% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/ProjectAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/ProjectAPI.java index 6ecbe8de5..ed9d5261c 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/ProjectAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/ProjectAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.auth; +package org.apache.hugegraph.api.auth; import java.util.HashSet; import java.util.List; @@ -39,19 +39,19 @@ import jakarta.ws.rs.core.Context; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.define.Checkable; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.StatusFilter; -import com.baidu.hugegraph.auth.AuthManager; -import com.baidu.hugegraph.auth.HugeProject; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.define.Checkable; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter.Status; +import org.apache.hugegraph.auth.AuthManager; +import org.apache.hugegraph.auth.HugeProject; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -67,7 +67,7 @@ public class ProjectAPI extends API { @POST @Timed - @StatusFilter.Status(StatusFilter.Status.CREATED) + @Status(Status.CREATED) @Consumes(APPLICATION_JSON) @Produces(APPLICATION_JSON_WITH_CHARSET) public String create(@Context GraphManager manager, diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/TargetAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/TargetAPI.java similarity index 93% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/TargetAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/TargetAPI.java index c19facc8e..d836e1800 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/TargetAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/TargetAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.auth; +package org.apache.hugegraph.api.auth; import java.util.List; import java.util.Map; @@ -36,18 +36,18 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.define.Checkable; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.StatusFilter.Status; -import com.baidu.hugegraph.auth.HugeTarget; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.define.Checkable; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter.Status; +import org.apache.hugegraph.auth.HugeTarget; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/UserAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/UserAPI.java similarity index 93% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/UserAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/UserAPI.java index ce4fe3b31..8dd863945 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/UserAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/UserAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.auth; +package org.apache.hugegraph.api.auth; import java.util.List; @@ -36,20 +36,20 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.define.Checkable; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.StatusFilter.Status; -import com.baidu.hugegraph.auth.HugeUser; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.define.Checkable; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter.Status; +import org.apache.hugegraph.auth.HugeUser; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; +import org.apache.hugegraph.util.StringEncoding; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/AuthenticationFilter.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/AuthenticationFilter.java similarity index 95% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/AuthenticationFilter.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/AuthenticationFilter.java index 14a5690bc..33214190f 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/AuthenticationFilter.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/AuthenticationFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.filter; +package org.apache.hugegraph.api.filter; import java.io.IOException; import java.security.Principal; @@ -45,14 +45,14 @@ import org.glassfish.grizzly.http.server.Request; import org.glassfish.grizzly.utils.Charsets; import org.slf4j.Logger; -import com.baidu.hugegraph.auth.HugeAuthenticator; -import com.baidu.hugegraph.auth.HugeAuthenticator.RequiredPerm; -import com.baidu.hugegraph.auth.HugeAuthenticator.RolePerm; -import com.baidu.hugegraph.auth.HugeAuthenticator.User; -import com.baidu.hugegraph.auth.RolePermission; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.auth.HugeAuthenticator; +import org.apache.hugegraph.auth.HugeAuthenticator.RequiredPerm; +import org.apache.hugegraph.auth.HugeAuthenticator.RolePerm; +import org.apache.hugegraph.auth.HugeAuthenticator.User; +import org.apache.hugegraph.auth.RolePermission; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.google.common.collect.ImmutableList; @Provider diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/CompressInterceptor.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/CompressInterceptor.java similarity index 96% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/CompressInterceptor.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/CompressInterceptor.java index b7c3f24cf..4a4c898c3 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/CompressInterceptor.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/CompressInterceptor.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.filter; +package org.apache.hugegraph.api.filter; import java.io.IOException; import java.io.OutputStream; @@ -36,11 +36,12 @@ import jakarta.inject.Singleton; import org.slf4j.Logger; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.api.filter.CompressInterceptor.Compress; +import org.apache.hugegraph.util.Log; @Provider @Singleton -@CompressInterceptor.Compress +@Compress public class CompressInterceptor implements WriterInterceptor { public static final String GZIP = "gzip"; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/DecompressInterceptor.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/DecompressInterceptor.java similarity index 97% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/DecompressInterceptor.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/DecompressInterceptor.java index 496cf6ecd..6efbc43f5 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/DecompressInterceptor.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/DecompressInterceptor.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.filter; +package org.apache.hugegraph.api.filter; import java.io.IOException; import java.lang.annotation.Retention; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/ExceptionFilter.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/ExceptionFilter.java similarity index 96% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/ExceptionFilter.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/ExceptionFilter.java index 2b26f391b..fe9ac8dbb 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/ExceptionFilter.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/ExceptionFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.filter; +package org.apache.hugegraph.api.filter; import java.util.List; import java.util.Map; @@ -44,14 +44,14 @@ import jakarta.ws.rs.ext.ExceptionMapper; import jakarta.ws.rs.ext.Provider; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.config.ServerOptions; import org.glassfish.hk2.api.MultiException; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.config.ServerOptions; -import com.baidu.hugegraph.exception.HugeGremlinException; -import com.baidu.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.exception.HugeGremlinException; +import org.apache.hugegraph.exception.NotFoundException; import com.codahale.metrics.annotation.Timed; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/LoadDetectFilter.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/LoadDetectFilter.java similarity index 93% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/LoadDetectFilter.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/LoadDetectFilter.java index ba59f1ab8..f3e55c4ce 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/LoadDetectFilter.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/LoadDetectFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.filter; +package org.apache.hugegraph.api.filter; import java.util.List; import java.util.Set; @@ -31,11 +31,11 @@ import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.PathSegment; import jakarta.ws.rs.ext.Provider; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.config.ServerOptions; -import com.baidu.hugegraph.define.WorkLoad; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.ServerOptions; +import org.apache.hugegraph.define.WorkLoad; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.RateLimiter; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/LoadReleaseFilter.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/LoadReleaseFilter.java similarity index 94% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/LoadReleaseFilter.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/LoadReleaseFilter.java index 210f996c1..6e8348997 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/LoadReleaseFilter.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/LoadReleaseFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.filter; +package org.apache.hugegraph.api.filter; import jakarta.inject.Singleton; import jakarta.ws.rs.container.ContainerRequestContext; @@ -26,7 +26,7 @@ import jakarta.ws.rs.container.ContainerResponseFilter; import jakarta.ws.rs.core.Context; import jakarta.ws.rs.ext.Provider; -import com.baidu.hugegraph.define.WorkLoad; +import org.apache.hugegraph.define.WorkLoad; @Provider @Singleton diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/StatusFilter.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/StatusFilter.java similarity index 97% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/StatusFilter.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/StatusFilter.java index 3d93b9ef9..6bc89fc2f 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/StatusFilter.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/StatusFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.filter; +package org.apache.hugegraph.api.filter; import java.io.IOException; import java.lang.annotation.Annotation; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/BatchAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/graph/BatchAPI.java similarity index 91% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/BatchAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/graph/BatchAPI.java index 515b1ca6b..b0b015b38 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/BatchAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/graph/BatchAPI.java @@ -17,27 +17,27 @@ * under the License. */ -package com.baidu.hugegraph.api.graph; +package org.apache.hugegraph.api.graph; import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicInteger; import org.apache.tinkerpop.gremlin.structure.Element; +import org.apache.hugegraph.config.ServerOptions; +import org.apache.hugegraph.define.Checkable; +import org.apache.hugegraph.define.UpdateStrategy; +import org.apache.hugegraph.metrics.MetricsUtil; +import org.apache.hugegraph.server.RestServer; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.config.ServerOptions; -import com.baidu.hugegraph.define.Checkable; -import com.baidu.hugegraph.define.UpdateStrategy; -import com.baidu.hugegraph.metrics.MetricsUtil; -import com.baidu.hugegraph.server.RestServer; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.Meter; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/EdgeAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/graph/EdgeAPI.java similarity index 94% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/EdgeAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/graph/EdgeAPI.java index 1f9e94741..08ee31aeb 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/EdgeAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/graph/EdgeAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.graph; +package org.apache.hugegraph.api.graph; import java.util.ArrayList; import java.util.HashMap; @@ -46,31 +46,31 @@ import org.apache.tinkerpop.gremlin.structure.Direction; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.util.function.TriFunction; +import org.apache.hugegraph.config.ServerOptions; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.define.UpdateStrategy; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.CompressInterceptor.Compress; -import com.baidu.hugegraph.api.filter.DecompressInterceptor.Decompress; -import com.baidu.hugegraph.api.filter.StatusFilter.Status; -import com.baidu.hugegraph.backend.id.EdgeId; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.config.ServerOptions; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.define.UpdateStrategy; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.traversal.optimize.QueryHolder; -import com.baidu.hugegraph.traversal.optimize.TraversalUtil; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.CompressInterceptor.Compress; +import org.apache.hugegraph.api.filter.DecompressInterceptor.Decompress; +import org.apache.hugegraph.api.filter.StatusFilter.Status; +import org.apache.hugegraph.backend.id.EdgeId; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.traversal.optimize.QueryHolder; +import org.apache.hugegraph.traversal.optimize.TraversalUtil; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/VertexAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/graph/VertexAPI.java similarity index 93% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/VertexAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/graph/VertexAPI.java index 2adcee773..cb4854a85 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/graph/VertexAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/graph/VertexAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.graph; +package org.apache.hugegraph.api.graph; import java.util.ArrayList; import java.util.Arrays; @@ -45,31 +45,31 @@ import jakarta.ws.rs.core.Context; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.hugegraph.config.ServerOptions; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.define.UpdateStrategy; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.CompressInterceptor.Compress; -import com.baidu.hugegraph.api.filter.DecompressInterceptor.Decompress; -import com.baidu.hugegraph.api.filter.StatusFilter.Status; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.SplicingIdGenerator; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.config.ServerOptions; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.define.UpdateStrategy; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.traversal.optimize.QueryHolder; -import com.baidu.hugegraph.traversal.optimize.Text; -import com.baidu.hugegraph.traversal.optimize.TraversalUtil; -import com.baidu.hugegraph.type.define.IdStrategy; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.CompressInterceptor.Compress; +import org.apache.hugegraph.api.filter.DecompressInterceptor.Decompress; +import org.apache.hugegraph.api.filter.StatusFilter.Status; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.SplicingIdGenerator; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.traversal.optimize.QueryHolder; +import org.apache.hugegraph.traversal.optimize.Text; +import org.apache.hugegraph.traversal.optimize.TraversalUtil; +import org.apache.hugegraph.type.define.IdStrategy; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/gremlin/CypherAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/gremlin/CypherAPI.java similarity index 93% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/gremlin/CypherAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/gremlin/CypherAPI.java index 082ff6bc7..38410ee04 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/gremlin/CypherAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/gremlin/CypherAPI.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.api.gremlin; +package org.apache.hugegraph.api.gremlin; import org.opencypher.gremlin.translation.TranslationFacade; import org.slf4j.Logger; -import com.baidu.hugegraph.api.filter.CompressInterceptor; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.api.filter.CompressInterceptor.Compress; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import io.swagger.v3.oas.annotations.tags.Tag; @@ -49,7 +49,7 @@ public class CypherAPI extends GremlinQueryAPI { @GET @Timed - @CompressInterceptor.Compress(buffer = (1024 * 40)) + @Compress(buffer = (1024 * 40)) @Produces(APPLICATION_JSON_WITH_CHARSET) public Response query(@PathParam("graph") String graph, @Context HttpHeaders headers, @@ -61,7 +61,7 @@ public class CypherAPI extends GremlinQueryAPI { @POST @Timed - @CompressInterceptor.Compress + @Compress @Consumes(APPLICATION_JSON) @Produces(APPLICATION_JSON_WITH_CHARSET) public Response post(@PathParam("graph") String graph, diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/gremlin/GremlinAPI.java similarity index 94% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/gremlin/GremlinAPI.java index f1283f8f5..305b51e3b 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/gremlin/GremlinAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.gremlin; +package org.apache.hugegraph.api.gremlin; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.ws.rs.Consumes; @@ -31,9 +31,9 @@ import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriInfo; -import com.baidu.hugegraph.api.filter.CompressInterceptor.Compress; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.metrics.MetricsUtil; +import org.apache.hugegraph.api.filter.CompressInterceptor.Compress; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.metrics.MetricsUtil; import com.codahale.metrics.Histogram; import com.codahale.metrics.annotation.Timed; import jakarta.inject.Singleton; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinClient.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/gremlin/GremlinClient.java similarity index 92% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinClient.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/gremlin/GremlinClient.java index b2b2725f8..2dd54d4a3 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinClient.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/gremlin/GremlinClient.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.gremlin; +package org.apache.hugegraph.api.gremlin; import java.util.List; import java.util.Map; @@ -29,10 +29,10 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; -import com.baidu.hugegraph.api.filter.CompressInterceptor; -import com.baidu.hugegraph.rest.AbstractRestClient; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.api.filter.CompressInterceptor; +import org.apache.hugegraph.rest.AbstractRestClient; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.util.E; public class GremlinClient extends AbstractRestClient { diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinQueryAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/gremlin/GremlinQueryAPI.java similarity index 93% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinQueryAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/gremlin/GremlinQueryAPI.java index 6aa0b8b98..0fd79bb24 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinQueryAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/gremlin/GremlinQueryAPI.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.api.gremlin; +package org.apache.hugegraph.api.gremlin; import java.util.Map; import java.util.Set; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.config.ServerOptions; -import com.baidu.hugegraph.exception.HugeGremlinException; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.ServerOptions; +import org.apache.hugegraph.exception.HugeGremlinException; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -45,7 +45,7 @@ public class GremlinQueryAPI extends API { "java.util.concurrent.TimeoutException", "groovy.lang.", "org.codehaus.", - "com.baidu.hugegraph." + "org.apache.hugegraph." ); @Context diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/job/AlgorithmAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/AlgorithmAPI.java similarity index 84% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/job/AlgorithmAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/job/AlgorithmAPI.java index b0e0d0692..baa07e191 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/job/AlgorithmAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/AlgorithmAPI.java @@ -17,23 +17,23 @@ * under the License. */ -package com.baidu.hugegraph.api.job; +package org.apache.hugegraph.api.job; import java.util.Map; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.server.RestServer; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.StatusFilter.Status; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.job.AlgorithmJob; -import com.baidu.hugegraph.job.JobBuilder; -import com.baidu.hugegraph.server.RestServer; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter.Status; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.job.AlgorithmJob; +import org.apache.hugegraph.job.JobBuilder; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/job/ComputerAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/ComputerAPI.java similarity index 84% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/job/ComputerAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/job/ComputerAPI.java index f3825f893..8a2967bbd 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/job/ComputerAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/ComputerAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.job; +package org.apache.hugegraph.api.job; import java.util.Map; @@ -31,19 +31,19 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Context; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.StatusFilter.Status; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.job.ComputerJob; -import com.baidu.hugegraph.job.JobBuilder; -import com.baidu.hugegraph.task.HugeTask; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter.Status; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.job.ComputerJob; +import org.apache.hugegraph.job.JobBuilder; +import org.apache.hugegraph.task.HugeTask; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/job/GremlinAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/GremlinAPI.java similarity index 92% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/job/GremlinAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/job/GremlinAPI.java index 46039271a..5b1283e76 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/job/GremlinAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/GremlinAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.job; +package org.apache.hugegraph.api.job; import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; @@ -37,21 +37,21 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Context; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.define.Checkable; +import org.apache.hugegraph.metrics.MetricsUtil; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.StatusFilter.Status; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.define.Checkable; -import com.baidu.hugegraph.job.GremlinJob; -import com.baidu.hugegraph.job.JobBuilder; -import com.baidu.hugegraph.metrics.MetricsUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter.Status; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.job.GremlinJob; +import org.apache.hugegraph.job.JobBuilder; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.Histogram; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/job/RebuildAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/RebuildAPI.java similarity index 91% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/job/RebuildAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/job/RebuildAPI.java index fa5376ec8..54fa3bdc8 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/job/RebuildAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/RebuildAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.job; +package org.apache.hugegraph.api.job; import java.util.Map; @@ -30,14 +30,14 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Context; +import org.apache.hugegraph.api.filter.StatusFilter.Status; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.StatusFilter.Status; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.google.common.collect.ImmutableMap; @@ -95,4 +95,4 @@ public class RebuildAPI extends API { return ImmutableMap.of("task_id", g.schema().indexLabel(name).rebuild()); } -} \ No newline at end of file +} diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/job/TaskAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/TaskAPI.java similarity index 92% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/job/TaskAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/job/TaskAPI.java index bdd7bdc8d..e72fe5bfe 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/job/TaskAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/TaskAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.job; +package org.apache.hugegraph.api.job; import java.util.ArrayList; import java.util.Arrays; @@ -41,19 +41,19 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; import org.apache.groovy.util.Maps; +import org.apache.hugegraph.api.filter.StatusFilter.Status; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.StatusFilter.Status; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.page.PageInfo; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.task.HugeTask; -import com.baidu.hugegraph.task.TaskScheduler; -import com.baidu.hugegraph.task.TaskStatus; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.page.PageInfo; +import org.apache.hugegraph.task.HugeTask; +import org.apache.hugegraph.task.TaskScheduler; +import org.apache.hugegraph.task.TaskStatus; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; @Path("graphs/{graph}/tasks") diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/metrics/MetricsAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/metrics/MetricsAPI.java similarity index 90% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/metrics/MetricsAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/metrics/MetricsAPI.java index 60ef91281..c37f41d4e 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/metrics/MetricsAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/metrics/MetricsAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.metrics; +package org.apache.hugegraph.api.metrics; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; @@ -33,18 +33,18 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Context; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.metrics.MetricsModule; +import org.apache.hugegraph.metrics.ServerReporter; +import org.apache.hugegraph.metrics.SystemMetrics; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.backend.store.BackendMetrics; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.metrics.MetricsModule; -import com.baidu.hugegraph.metrics.ServerReporter; -import com.baidu.hugegraph.metrics.SystemMetrics; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.backend.store.BackendMetrics; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.Metric; import com.codahale.metrics.annotation.Timed; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/profile/GraphsAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/GraphsAPI.java similarity index 94% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/profile/GraphsAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/GraphsAPI.java index d59a9afaa..82a3a32e2 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/profile/GraphsAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/GraphsAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.profile; +package org.apache.hugegraph.api.profile; import java.io.File; import java.util.HashSet; @@ -42,19 +42,19 @@ import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.SecurityContext; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.auth.HugeAuthenticator.RequiredPerm; -import com.baidu.hugegraph.auth.HugePermission; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.type.define.GraphMode; -import com.baidu.hugegraph.type.define.GraphReadMode; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.auth.HugeAuthenticator.RequiredPerm; +import org.apache.hugegraph.auth.HugePermission; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.type.define.GraphMode; +import org.apache.hugegraph.type.define.GraphReadMode; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/profile/ProfileAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/ProfileAPI.java similarity index 97% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/profile/ProfileAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/ProfileAPI.java index 5f20dc4be..4a04a0ebd 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/profile/ProfileAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/ProfileAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.profile; +package org.apache.hugegraph.api.profile; import java.util.ArrayList; import java.util.List; @@ -42,10 +42,10 @@ import org.glassfish.jersey.server.model.Parameter; import org.glassfish.jersey.server.model.Resource; import org.glassfish.jersey.server.model.ResourceMethod; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.version.CoreVersion; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.version.CoreVersion; import com.codahale.metrics.annotation.Timed; @Path("/") diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/profile/VersionAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/VersionAPI.java similarity index 90% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/profile/VersionAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/VersionAPI.java index 0bf8fdcc9..90b6de6f5 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/profile/VersionAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/VersionAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.profile; +package org.apache.hugegraph.api.profile; import java.util.Map; @@ -28,9 +28,9 @@ import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.version.ApiVersion; -import com.baidu.hugegraph.version.CoreVersion; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.version.ApiVersion; +import org.apache.hugegraph.version.CoreVersion; import com.codahale.metrics.annotation.Timed; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/raft/RaftAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/raft/RaftAPI.java similarity index 92% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/raft/RaftAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/raft/RaftAPI.java index d8cce6e26..2d7d29f48 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/raft/RaftAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/raft/RaftAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.raft; +package org.apache.hugegraph.api.raft; import java.util.HashMap; import java.util.List; @@ -36,21 +36,21 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.StatusFilter.Status; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.store.raft.RaftAddPeerJob; -import com.baidu.hugegraph.backend.store.raft.RaftGroupManager; -import com.baidu.hugegraph.backend.store.raft.RaftRemovePeerJob; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.job.JobBuilder; -import com.baidu.hugegraph.util.DateUtil; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter.Status; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.store.raft.RaftAddPeerJob; +import org.apache.hugegraph.backend.store.raft.RaftGroupManager; +import org.apache.hugegraph.backend.store.raft.RaftRemovePeerJob; +import org.apache.hugegraph.job.JobBuilder; +import org.apache.hugegraph.util.DateUtil; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/EdgeLabelAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/EdgeLabelAPI.java similarity index 94% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/EdgeLabelAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/EdgeLabelAPI.java index b173c3687..931995d57 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/EdgeLabelAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/EdgeLabelAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.schema; +package org.apache.hugegraph.api.schema; import java.util.ArrayList; import java.util.List; @@ -38,20 +38,20 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; import org.apache.commons.collections.CollectionUtils; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.define.Checkable; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.StatusFilter.Status; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.define.Checkable; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.Userdata; -import com.baidu.hugegraph.type.define.Frequency; -import com.baidu.hugegraph.type.define.GraphMode; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter.Status; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.Userdata; +import org.apache.hugegraph.type.define.Frequency; +import org.apache.hugegraph.type.define.GraphMode; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/IndexLabelAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/IndexLabelAPI.java similarity index 94% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/IndexLabelAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/IndexLabelAPI.java index 2f77ca021..b03ce48d0 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/IndexLabelAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/IndexLabelAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.schema; +package org.apache.hugegraph.api.schema; import java.util.ArrayList; import java.util.List; @@ -38,22 +38,22 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; import org.apache.commons.collections.CollectionUtils; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.define.Checkable; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.StatusFilter.Status; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.define.Checkable; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.schema.Userdata; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.GraphMode; -import com.baidu.hugegraph.type.define.IndexType; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter.Status; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.schema.Userdata; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.GraphMode; +import org.apache.hugegraph.type.define.IndexType; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/PropertyKeyAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/PropertyKeyAPI.java similarity index 92% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/PropertyKeyAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/PropertyKeyAPI.java index 845733b8d..427be8815 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/PropertyKeyAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/PropertyKeyAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.schema; +package org.apache.hugegraph.api.schema; import java.util.ArrayList; import java.util.List; @@ -38,25 +38,25 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; import org.apache.commons.collections.CollectionUtils; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.define.Checkable; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.StatusFilter.Status; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.define.Checkable; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.schema.Userdata; -import com.baidu.hugegraph.type.define.AggregateType; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.type.define.GraphMode; -import com.baidu.hugegraph.type.define.WriteType; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter.Status; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.schema.Userdata; +import org.apache.hugegraph.type.define.AggregateType; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.DataType; +import org.apache.hugegraph.type.define.GraphMode; +import org.apache.hugegraph.type.define.WriteType; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/SchemaAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/SchemaAPI.java similarity index 89% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/SchemaAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/SchemaAPI.java index 0fbdf402a..3d0a189d9 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/SchemaAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/SchemaAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.schema; +package org.apache.hugegraph.api.schema; import java.util.LinkedHashMap; import java.util.List; @@ -32,13 +32,13 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Context; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; @Path("graphs/{graph}/schema") diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/VertexLabelAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/VertexLabelAPI.java similarity index 94% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/VertexLabelAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/VertexLabelAPI.java index e52419eda..72f990d43 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/VertexLabelAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/VertexLabelAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.schema; +package org.apache.hugegraph.api.schema; import java.util.ArrayList; import java.util.List; @@ -38,20 +38,20 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; import org.apache.commons.collections.CollectionUtils; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.define.Checkable; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.StatusFilter.Status; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.define.Checkable; -import com.baidu.hugegraph.schema.Userdata; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.type.define.GraphMode; -import com.baidu.hugegraph.type.define.IdStrategy; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter.Status; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.schema.Userdata; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.type.define.GraphMode; +import org.apache.hugegraph.type.define.IdStrategy; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/AdamicAdarAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/AdamicAdarAPI.java similarity index 81% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/AdamicAdarAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/AdamicAdarAPI.java index efd74cab2..3ed537c41 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/AdamicAdarAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/AdamicAdarAPI.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 HugeGraph Authors + * Copyright 2017 HugeGraph Authors * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with this @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_ELEMENTS_LIMIT; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_ELEMENTS_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.inject.Singleton; @@ -32,16 +32,16 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.graph.EdgeAPI; -import com.baidu.hugegraph.api.graph.VertexAPI; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.traversal.algorithm.PredictionTraverser; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.graph.EdgeAPI; +import org.apache.hugegraph.api.graph.VertexAPI; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.traversal.algorithm.PredictionTraverser; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.JsonUtil; import com.codahale.metrics.annotation.Timed; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/AllShortestPathsAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/AllShortestPathsAPI.java similarity index 82% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/AllShortestPathsAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/AllShortestPathsAPI.java index 2b8660f90..d1d156bc5 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/AllShortestPathsAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/AllShortestPathsAPI.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; import java.util.List; @@ -36,16 +36,16 @@ import jakarta.ws.rs.core.Context; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.graph.EdgeAPI; -import com.baidu.hugegraph.api.graph.VertexAPI; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.traversal.algorithm.ShortestPathTraverser; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.graph.EdgeAPI; +import org.apache.hugegraph.api.graph.VertexAPI; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.traversal.algorithm.ShortestPathTraverser; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/CountAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/CountAPI.java similarity index 86% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/CountAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/CountAPI.java index 3a0ebb2e6..a9fd3c1c4 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/CountAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/CountAPI.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_SKIP_DEGREE; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.NO_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_SKIP_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.NO_LIMIT; import java.util.ArrayList; import java.util.List; @@ -35,18 +35,18 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Context; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.traversal.algorithm.CountTraverser; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.traversal.algorithm.CountTraverser; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/CrosspointsAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/CrosspointsAPI.java similarity index 80% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/CrosspointsAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/CrosspointsAPI.java index 53daf2f1d..e9f8f729e 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/CrosspointsAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/CrosspointsAPI.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.inject.Singleton; @@ -35,16 +35,16 @@ import jakarta.ws.rs.core.Context; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.graph.EdgeAPI; -import com.baidu.hugegraph.api.graph.VertexAPI; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.traversal.algorithm.PathsTraverser; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.graph.EdgeAPI; +import org.apache.hugegraph.api.graph.VertexAPI; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.traversal.algorithm.PathsTraverser; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; @Path("graphs/{graph}/traversers/crosspoints") diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/CustomizedCrosspointsAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/CustomizedCrosspointsAPI.java similarity index 90% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/CustomizedCrosspointsAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/CustomizedCrosspointsAPI.java index c1699e9bd..3e6933b5c 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/CustomizedCrosspointsAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/CustomizedCrosspointsAPI.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT; import java.util.ArrayList; import java.util.HashSet; @@ -40,18 +40,18 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Context; import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.traversal.algorithm.CustomizedCrosspointsTraverser; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.traversal.algorithm.CustomizedCrosspointsTraverser; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/CustomizedPathsAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/CustomizedPathsAPI.java similarity index 87% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/CustomizedPathsAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/CustomizedPathsAPI.java index 4e525f287..8042770b8 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/CustomizedPathsAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/CustomizedPathsAPI.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_SAMPLE; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_WEIGHT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_SAMPLE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_WEIGHT; import java.util.ArrayList; import java.util.HashSet; @@ -42,19 +42,19 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Context; import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.traversal.algorithm.CustomizePathsTraverser; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.traversal.algorithm.steps.WeightedEdgeStep; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.traversal.algorithm.CustomizePathsTraverser; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.traversal.algorithm.steps.WeightedEdgeStep; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/EdgesAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/EdgesAPI.java similarity index 85% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/EdgesAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/EdgesAPI.java index 200d0b1ae..f51c30f77 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/EdgesAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/EdgesAPI.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PAGE_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PAGE_LIMIT; import java.util.Iterator; import java.util.List; @@ -35,19 +35,19 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; import org.apache.tinkerpop.gremlin.structure.Edge; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.CompressInterceptor.Compress; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.store.Shard; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.CompressInterceptor.Compress; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.store.Shard; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; @Path("graphs/{graph}/traversers/edges") diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/FusiformSimilarityAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/FusiformSimilarityAPI.java similarity index 88% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/FusiformSimilarityAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/FusiformSimilarityAPI.java index 8e659c101..2b8980ba9 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/FusiformSimilarityAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/FusiformSimilarityAPI.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.NO_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.NO_LIMIT; import java.util.Iterator; @@ -37,17 +37,17 @@ import jakarta.ws.rs.core.Context; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.traversal.algorithm.FusiformSimilarityTraverser; -import com.baidu.hugegraph.traversal.algorithm.FusiformSimilarityTraverser.SimilarsMap; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.traversal.algorithm.FusiformSimilarityTraverser; +import org.apache.hugegraph.traversal.algorithm.FusiformSimilarityTraverser.SimilarsMap; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/JaccardSimilarityAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/JaccardSimilarityAPI.java similarity index 85% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/JaccardSimilarityAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/JaccardSimilarityAPI.java index 3a31cf4eb..92d9bb27d 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/JaccardSimilarityAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/JaccardSimilarityAPI.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_LIMIT; import java.util.Map; @@ -37,20 +37,20 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.graph.EdgeAPI; -import com.baidu.hugegraph.api.graph.VertexAPI; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.traversal.algorithm.JaccardSimilarTraverser; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.graph.EdgeAPI; +import org.apache.hugegraph.api.graph.VertexAPI; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.traversal.algorithm.JaccardSimilarTraverser; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/KneighborAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/KneighborAPI.java similarity index 87% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/KneighborAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/KneighborAPI.java index 31fd626f8..eaa95bf2b 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/KneighborAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/KneighborAPI.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_ELEMENTS_LIMIT; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_ELEMENTS_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; import java.util.HashSet; import java.util.Iterator; @@ -40,23 +40,23 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.graph.EdgeAPI; -import com.baidu.hugegraph.api.graph.VertexAPI; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.traversal.algorithm.KneighborTraverser; -import com.baidu.hugegraph.traversal.algorithm.records.KneighborRecords; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.graph.EdgeAPI; +import org.apache.hugegraph.api.graph.VertexAPI; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.traversal.algorithm.KneighborTraverser; +import org.apache.hugegraph.traversal.algorithm.records.KneighborRecords; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/KoutAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/KoutAPI.java similarity index 87% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/KoutAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/KoutAPI.java index 11a069cf8..26be5eb49 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/KoutAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/KoutAPI.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_ELEMENTS_LIMIT; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_ELEMENTS_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; import java.util.HashSet; import java.util.Iterator; @@ -41,23 +41,23 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.graph.EdgeAPI; -import com.baidu.hugegraph.api.graph.VertexAPI; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.traversal.algorithm.KoutTraverser; -import com.baidu.hugegraph.traversal.algorithm.records.KoutRecords; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.graph.EdgeAPI; +import org.apache.hugegraph.api.graph.VertexAPI; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.traversal.algorithm.KoutTraverser; +import org.apache.hugegraph.traversal.algorithm.records.KoutRecords; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/MultiNodeShortestPathAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/MultiNodeShortestPathAPI.java similarity index 87% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/MultiNodeShortestPathAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/MultiNodeShortestPathAPI.java index dcf9d715f..7f0ff8e4f 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/MultiNodeShortestPathAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/MultiNodeShortestPathAPI.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; import java.util.HashSet; import java.util.Iterator; @@ -36,17 +36,17 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Context; import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.traversal.algorithm.MultiNodeShortestPathTraverser; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.traversal.algorithm.MultiNodeShortestPathTraverser; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/NeighborRankAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/NeighborRankAPI.java similarity index 87% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/NeighborRankAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/NeighborRankAPI.java index 7361c27a1..8ae22bf80 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/NeighborRankAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/NeighborRankAPI.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEPTH; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEPTH; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT; import java.util.ArrayList; import java.util.List; @@ -36,17 +36,17 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Context; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.traversal.algorithm.NeighborRankTraverser; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.traversal.algorithm.NeighborRankTraverser; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/PathsAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/PathsAPI.java similarity index 86% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/PathsAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/PathsAPI.java index c227c283e..1bd1e2782 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/PathsAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/PathsAPI.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEPTH; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEPTH; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT; import java.util.Collection; import java.util.HashSet; @@ -42,21 +42,21 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.graph.EdgeAPI; -import com.baidu.hugegraph.api.graph.VertexAPI; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.traversal.algorithm.CollectionPathsTraverser; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.traversal.algorithm.PathsTraverser; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.graph.EdgeAPI; +import org.apache.hugegraph.api.graph.VertexAPI; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.traversal.algorithm.CollectionPathsTraverser; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.traversal.algorithm.PathsTraverser; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/PersonalRankAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/PersonalRankAPI.java similarity index 87% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/PersonalRankAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/PersonalRankAPI.java index 96c17e9e8..407713a81 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/PersonalRankAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/PersonalRankAPI.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_LIMIT; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEPTH; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.NO_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEPTH; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.NO_LIMIT; import java.util.Map; @@ -36,15 +36,15 @@ import jakarta.ws.rs.core.Context; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.traversal.algorithm.PersonalRankTraverser; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.traversal.algorithm.PersonalRankTraverser; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/RaysAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/RaysAPI.java similarity index 79% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/RaysAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/RaysAPI.java index c2b78f43d..8d088ab2b 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/RaysAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/RaysAPI.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.inject.Singleton; @@ -33,18 +33,18 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.graph.EdgeAPI; -import com.baidu.hugegraph.api.graph.VertexAPI; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.traversal.algorithm.SubGraphTraverser; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.graph.EdgeAPI; +import org.apache.hugegraph.api.graph.VertexAPI; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.traversal.algorithm.SubGraphTraverser; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; @Path("graphs/{graph}/traversers/rays") diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/ResourceAllocationAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/ResourceAllocationAPI.java similarity index 81% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/ResourceAllocationAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/ResourceAllocationAPI.java index 1705c2c84..ffe0fcf4f 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/ResourceAllocationAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/ResourceAllocationAPI.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 HugeGraph Authors + * Copyright 2017 HugeGraph Authors * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with this @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_ELEMENTS_LIMIT; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_ELEMENTS_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.inject.Singleton; @@ -32,16 +32,16 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.graph.EdgeAPI; -import com.baidu.hugegraph.api.graph.VertexAPI; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.traversal.algorithm.PredictionTraverser; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.graph.EdgeAPI; +import org.apache.hugegraph.api.graph.VertexAPI; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.traversal.algorithm.PredictionTraverser; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.JsonUtil; import com.codahale.metrics.annotation.Timed; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/RingsAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/RingsAPI.java similarity index 80% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/RingsAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/RingsAPI.java index 057420816..ce1d16a38 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/RingsAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/RingsAPI.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.inject.Singleton; @@ -33,18 +33,18 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.graph.EdgeAPI; -import com.baidu.hugegraph.api.graph.VertexAPI; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.traversal.algorithm.SubGraphTraverser; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.graph.EdgeAPI; +import org.apache.hugegraph.api.graph.VertexAPI; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.traversal.algorithm.SubGraphTraverser; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; @Path("graphs/{graph}/traversers/rings") diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/SameNeighborsAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/SameNeighborsAPI.java similarity index 81% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/SameNeighborsAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/SameNeighborsAPI.java index 1653e040e..05374c542 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/SameNeighborsAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/SameNeighborsAPI.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_ELEMENTS_LIMIT; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_ELEMENTS_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; import java.util.Set; @@ -36,15 +36,15 @@ import jakarta.ws.rs.core.Context; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.graph.EdgeAPI; -import com.baidu.hugegraph.api.graph.VertexAPI; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.traversal.algorithm.SameNeighborTraverser; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.graph.EdgeAPI; +import org.apache.hugegraph.api.graph.VertexAPI; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.traversal.algorithm.SameNeighborTraverser; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; @Path("graphs/{graph}/traversers/sameneighbors") diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/ShortestPathAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/ShortestPathAPI.java similarity index 83% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/ShortestPathAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/ShortestPathAPI.java index f64e369b2..0a04b7b8b 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/ShortestPathAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/ShortestPathAPI.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; import java.util.List; @@ -34,18 +34,18 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.graph.EdgeAPI; -import com.baidu.hugegraph.api.graph.VertexAPI; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.traversal.algorithm.ShortestPathTraverser; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.graph.EdgeAPI; +import org.apache.hugegraph.api.graph.VertexAPI; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.traversal.algorithm.ShortestPathTraverser; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/SingleSourceShortestPathAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/SingleSourceShortestPathAPI.java similarity index 80% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/SingleSourceShortestPathAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/SingleSourceShortestPathAPI.java index 6e0b612ea..07991abf5 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/SingleSourceShortestPathAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/SingleSourceShortestPathAPI.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT; import java.util.Iterator; @@ -36,19 +36,19 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.graph.EdgeAPI; -import com.baidu.hugegraph.api.graph.VertexAPI; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser; -import com.baidu.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser.WeightedPaths; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.graph.EdgeAPI; +import org.apache.hugegraph.api.graph.VertexAPI; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser; +import org.apache.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser.WeightedPaths; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; @Path("graphs/{graph}/traversers/singlesourceshortestpath") diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/TemplatePathsAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/TemplatePathsAPI.java similarity index 89% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/TemplatePathsAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/TemplatePathsAPI.java index fdc8eca28..e18ffde1b 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/TemplatePathsAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/TemplatePathsAPI.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT; import java.util.ArrayList; import java.util.HashSet; @@ -38,17 +38,17 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Context; import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.traversal.algorithm.TemplatePathsTraverser; -import com.baidu.hugegraph.traversal.algorithm.steps.RepeatEdgeStep; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.traversal.algorithm.TemplatePathsTraverser; +import org.apache.hugegraph.traversal.algorithm.steps.RepeatEdgeStep; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/TraverserAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/TraverserAPI.java similarity index 86% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/TraverserAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/TraverserAPI.java index 62c4cc46a..cfb564045 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/TraverserAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/TraverserAPI.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.type.define.Directions; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.type.define.Directions; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/Vertices.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/Vertices.java similarity index 87% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/Vertices.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/Vertices.java index 4c0a0f568..2d2ed81e6 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/Vertices.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/Vertices.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.ArrayList; import java.util.Iterator; @@ -27,14 +27,14 @@ import java.util.Set; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.traversal.optimize.TraversalUtil; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.traversal.optimize.TraversalUtil; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonProperty; public class Vertices { diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/VerticesAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/VerticesAPI.java similarity index 86% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/VerticesAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/VerticesAPI.java index 56b10d8f4..7b2c8914e 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/VerticesAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/VerticesAPI.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PAGE_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PAGE_LIMIT; import java.util.Iterator; import java.util.List; @@ -35,19 +35,19 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.filter.CompressInterceptor.Compress; -import com.baidu.hugegraph.api.graph.VertexAPI; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.store.Shard; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.CompressInterceptor.Compress; +import org.apache.hugegraph.api.graph.VertexAPI; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.store.Shard; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; @Path("graphs/{graph}/traversers/vertices") diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/WeightedShortestPathAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/WeightedShortestPathAPI.java similarity index 81% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/WeightedShortestPathAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/WeightedShortestPathAPI.java index 65dfdf52a..cf55dc6d7 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/WeightedShortestPathAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/WeightedShortestPathAPI.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; import java.util.Iterator; @@ -35,20 +35,20 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.graph.EdgeAPI; -import com.baidu.hugegraph.api.graph.VertexAPI; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser; -import com.baidu.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser.NodeWithWeight; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.graph.EdgeAPI; +import org.apache.hugegraph.api.graph.VertexAPI; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser; +import org.apache.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser.NodeWithWeight; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; @Path("graphs/{graph}/traversers/weightedshortestpath") diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/variables/VariablesAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/variables/VariablesAPI.java similarity index 94% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/api/variables/VariablesAPI.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/api/variables/VariablesAPI.java index ab931ff12..f3cc9dcbc 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/variables/VariablesAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/variables/VariablesAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.variables; +package org.apache.hugegraph.api.variables; import java.util.Map; import java.util.Optional; @@ -34,13 +34,13 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Context; +import org.apache.hugegraph.core.GraphManager; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.codahale.metrics.annotation.Timed; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/ConfigAuthenticator.java b/hugegraph-api/src/main/java/org/apache/hugegraph/auth/ConfigAuthenticator.java similarity index 94% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/auth/ConfigAuthenticator.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/auth/ConfigAuthenticator.java index 5e230c033..1ec64365e 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/ConfigAuthenticator.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/auth/ConfigAuthenticator.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; import java.net.InetAddress; import java.util.HashMap; @@ -27,10 +27,10 @@ import java.util.Objects; import org.apache.commons.lang.NotImplementedException; import org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential.CredentialGraphTokens; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.config.ServerOptions; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.ServerOptions; +import org.apache.hugegraph.util.E; public class ConfigAuthenticator implements HugeAuthenticator { diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/ContextGremlinServer.java b/hugegraph-api/src/main/java/org/apache/hugegraph/auth/ContextGremlinServer.java similarity index 92% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/auth/ContextGremlinServer.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/auth/ContextGremlinServer.java index 0db3fdf92..1f6fcffb2 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/ContextGremlinServer.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/auth/ContextGremlinServer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; @@ -32,15 +32,15 @@ import org.apache.tinkerpop.gremlin.server.util.ThreadFactoryUtil; import org.apache.tinkerpop.gremlin.structure.Graph; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.auth.HugeGraphAuthProxy.Context; -import com.baidu.hugegraph.auth.HugeGraphAuthProxy.ContextThreadPoolExecutor; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.event.EventHub; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.util.Events; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.auth.HugeGraphAuthProxy.Context; +import org.apache.hugegraph.auth.HugeGraphAuthProxy.ContextThreadPoolExecutor; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.event.EventHub; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.util.Events; +import org.apache.hugegraph.util.Log; /** * GremlinServer with custom ServerGremlinExecutor, which can pass Context diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeAuthenticator.java b/hugegraph-api/src/main/java/org/apache/hugegraph/auth/HugeAuthenticator.java similarity index 96% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeAuthenticator.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/auth/HugeAuthenticator.java index 66c6a935e..9bbb66ba5 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeAuthenticator.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/auth/HugeAuthenticator.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; import java.util.HashMap; import java.util.List; @@ -29,17 +29,17 @@ import org.apache.tinkerpop.gremlin.server.auth.AuthenticationException; import org.apache.tinkerpop.gremlin.server.auth.Authenticator; import org.apache.tinkerpop.shaded.jackson.annotation.JsonProperty; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.auth.HugeGraphAuthProxy.Context; -import com.baidu.hugegraph.auth.SchemaDefine.AuthElement; -import com.baidu.hugegraph.backend.id.Id; -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.Nameable; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.auth.HugeGraphAuthProxy.Context; +import org.apache.hugegraph.auth.SchemaDefine.AuthElement; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.OptionSpace; +import org.apache.hugegraph.config.ServerOptions; +import org.apache.hugegraph.type.Nameable; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.JsonUtil; public interface HugeAuthenticator extends Authenticator { @@ -491,7 +491,7 @@ public interface HugeAuthenticator extends Authenticator { String[] actionKV = ownerAndAction[1].split("=", 2); E.checkState(actionKV.length == 2, "Bad permission format: '%s'", permission); - E.checkState(actionKV[0].equals(StandardAuthenticator.KEY_ACTION), + E.checkState(actionKV[0].equals(KEY_ACTION), "Bad permission format: '%s'", permission); requiredPerm.action(actionKV[1]); diff --git a/hugegraph-api/src/main/java/org/apache/hugegraph/auth/HugeFactoryAuthProxy.java b/hugegraph-api/src/main/java/org/apache/hugegraph/auth/HugeFactoryAuthProxy.java new file mode 100644 index 000000000..9ab148803 --- /dev/null +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/auth/HugeFactoryAuthProxy.java @@ -0,0 +1,339 @@ +/* + * Copyright 2017 HugeGraph Authors + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + */ + +package org.apache.hugegraph.auth; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.StandardHugeGraph; +import org.apache.hugegraph.backend.cache.CacheManager; +import org.apache.hugegraph.backend.tx.AbstractTransaction; +import org.apache.hugegraph.concurrent.LockManager; +import org.apache.hugegraph.license.LicenseVerifier; +import org.apache.hugegraph.metrics.ServerReporter; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.backend.tx.IndexableTransaction; +import org.apache.hugegraph.schema.builder.EdgeLabelBuilder; +import org.apache.hugegraph.schema.builder.IndexLabelBuilder; +import org.apache.hugegraph.schema.builder.PropertyKeyBuilder; +import org.apache.hugegraph.schema.builder.VertexLabelBuilder; +import org.apache.hugegraph.serializer.JsonSerializer; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeProperty; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.task.HugeTask; +import org.apache.hugegraph.task.StandardTaskScheduler; +import org.apache.hugegraph.task.TaskCallable; +import org.apache.hugegraph.task.TaskCallable.SysTaskCallable; +import org.apache.hugegraph.task.TaskManager; +import org.apache.hugegraph.schema.builder.AbstractBuilder; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.traversal.optimize.HugeCountStepStrategy; +import org.apache.hugegraph.traversal.optimize.HugeGraphStepStrategy; +import org.apache.hugegraph.traversal.optimize.HugeVertexStepStrategy; +import org.apache.hugegraph.util.Reflection; +import org.apache.hugegraph.variables.HugeVariables; +import com.google.common.collect.ImmutableSet; +import org.apache.commons.configuration2.Configuration; + +public final class HugeFactoryAuthProxy { + + public static final String GRAPH_FACTORY = + "gremlin.graph=org.apache.hugegraph.auth.HugeFactoryAuthProxy"; + + private static final Set PROTECT_METHODS = ImmutableSet.of( + "instance"); + + private static final Map GRAPHS = new HashMap<>(); + + static { + HugeGraphAuthProxy.setContext(HugeGraphAuthProxy.Context.admin()); + HugeFactoryAuthProxy.registerPrivateActions(); + } + + public static synchronized HugeGraph open(Configuration config) { + /* + * Inject authentication (replace HugeGraph with HugeGraphAuthProxy) + * TODO: Add verify to StandardHugeGraph() to prevent dynamic creation + */ + HugeGraph graph = HugeFactory.open(config); + HugeGraph proxy = GRAPHS.get(graph); + if (proxy == null) { + proxy = new HugeGraphAuthProxy(graph); + GRAPHS.put(graph, proxy); + } + return proxy; + } + + private static void registerPrivateActions() { + // Thread + Reflection.registerFieldsToFilter(java.lang.Thread.class, "name", "priority", "threadQ", "eetop", "single_step", "daemon", "stillborn", "target", "group", "contextClassLoader", "inheritedAccessControlContext", "threadInitNumber", "threadLocals", "inheritableThreadLocals", "stackSize", "nativeParkEventPointer", "tid", "threadSeqNumber", "threadStatus", "parkBlocker", "blocker", "blockerLock", "EMPTY_STACK_TRACE", "SUBCLASS_IMPLEMENTATION_PERMISSION", "uncaughtExceptionHandler", "defaultUncaughtExceptionHandler", "threadLocalRandomSeed", "threadLocalRandomSecondarySeed"); + Reflection.registerMethodsToFilter(java.lang.Thread.class, "exit", "dispatchUncaughtException", "clone", "isInterrupted", "registerNatives", "init", "init", "nextThreadNum", "nextThreadID", "blockedOn", "start0", "isCCLOverridden", "auditSubclass", "dumpThreads", "getThreads", "processQueue", "setPriority0", "stop0", "suspend0", "resume0", "interrupt0", "setNativeName"); + Reflection.registerFieldsToFilter(java.lang.ThreadLocal.class, "threadLocalHashCode", "nextHashCode", "HASH_INCREMENT"); + Reflection.registerMethodsToFilter(java.lang.ThreadLocal.class, "access$400", "createInheritedMap", "nextHashCode", "initialValue", "setInitialValue", "getMap", "createMap", "childValue"); + Reflection.registerMethodsToFilter(java.lang.InheritableThreadLocal.class, "getMap", "createMap", "childValue"); + + // HugeGraph + Reflection.registerFieldsToFilter(StandardAuthenticator.class, "graph"); + Reflection.registerMethodsToFilter(StandardAuthenticator.class, "initAdminUser", "inputPassword", "graph"); + Reflection.registerFieldsToFilter(ConfigAuthenticator.class, "tokens"); + Reflection.registerFieldsToFilter(HugeFactoryAuthProxy.class, "PROTECT_METHODS"); + Reflection.registerMethodsToFilter(HugeFactoryAuthProxy.class, "genRegisterPrivateActions", "registerClass", "registerPrivateActions", "registerPrivateActions", "c"); + Reflection.registerFieldsToFilter(HugeAuthenticator.User.class, "role", "client"); + Reflection.registerFieldsToFilter(org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser.class, "name"); + Reflection.registerFieldsToFilter(HugeGraphAuthProxy.class, "LOG", "hugegraph", "taskScheduler", "authManager", "contexts", "$assertionsDisabled"); + Reflection.registerMethodsToFilter(HugeGraphAuthProxy.class, "lambda$0", "access$3", "access$4", "access$2", "access$5", "resetContext", "logUser", "verifyAdminPermission", "verifyStatusPermission", "verifyPermission", "verifySchemaPermission", "verifySchemaPermission", "verifySchemaPermission", "verifySchemaPermission", "verifyNamePermission", "verifyNameExistsPermission", "verifyElemPermission", "verifyElemPermission", "verifyElemPermission", "verifyElemPermission", "verifyResPermission", "verifyResPermission", "verifyUserPermission", "verifyUserPermission", "verifyUserPermission", "getContextString", "access$6", "access$7", "lambda$1", "lambda$2", "lambda$3", "lambda$4", "lambda$5", "lambda$6", "lambda$7", "lambda$8", "lambda$9", "lambda$10", "lambda$11", "lambda$12", "lambda$13", "lambda$14", "lambda$15", "lambda$16", "lambda$17", "lambda$18", "lambda$19", "lambda$20", "lambda$21", "lambda$22", "lambda$23", "lambda$24", "access$8", "access$9", "access$10", "setContext", "getContext"); + Reflection.registerFieldsToFilter(HugeGraphAuthProxy.AuthManagerProxy.class, "authManager", "this$0"); + Reflection.registerMethodsToFilter(HugeGraphAuthProxy.AuthManagerProxy.class, "currentUsername", "updateCreator"); + Reflection.registerFieldsToFilter(HugeGraphAuthProxy.TaskSchedulerProxy.class, "taskScheduler", "this$0"); + Reflection.registerMethodsToFilter(HugeGraphAuthProxy.TaskSchedulerProxy.class, "lambda$0", "lambda$1", "lambda$2", "verifyTaskPermission", "verifyTaskPermission", "verifyTaskPermission", "verifyTaskPermission", "hasTaskPermission"); + Reflection.registerFieldsToFilter(HugeGraphAuthProxy.GraphTraversalSourceProxy.class, "this$0"); + Reflection.registerFieldsToFilter(org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource.class, "connection", "graph", "strategies", "bytecode"); + Reflection.registerFieldsToFilter(HugeGraphAuthProxy.TraversalStrategiesProxy.class, "REST_WOEKER", "serialVersionUID", "strategies", "this$0"); + Reflection.registerMethodsToFilter(HugeGraphAuthProxy.TraversalStrategiesProxy.class, "translate"); + Reflection.registerFieldsToFilter(HugeGraphAuthProxy.VariablesProxy.class, "variables", "this$0"); + Reflection.registerFieldsToFilter(HugeGraphAuthProxy.Context.class, "ADMIN", "user"); + Reflection.registerFieldsToFilter(HugeGraphAuthProxy.ContextTask.class, "runner", "context"); + Reflection.registerFieldsToFilter(StandardHugeGraph.class, "LOG", "started", "closed", "mode", "variables", "name", "params", "configuration", "schemaEventHub", "graphEventHub", "indexEventHub", "writeRateLimiter", "readRateLimiter", "taskManager", "authManager", "features", "storeProvider", "tx", "ramtable", "$assertionsDisabled"); + Reflection.registerMethodsToFilter(StandardHugeGraph.class, "lambda$0", "access$3", "access$4", "access$2", "access$5", "access$6", "access$7", "waitUntilAllTasksCompleted", "access$8", "loadStoreProvider", "graphTransaction", "schemaTransaction", "openSchemaTransaction", "checkGraphNotClosed", "openSystemTransaction", "openGraphTransaction", "systemTransaction", "access$9", "access$10", "access$11", "access$12", "access$13", "access$14", "access$15", "access$16", "access$17", "access$18", "serializer", "loadSchemaStore", "loadSystemStore", "loadGraphStore", "closeTx", "analyzer", "serverInfoManager", "reloadRamtable", "reloadRamtable", "access$19", "access$20", "access$21"); + Reflection.registerFieldsToFilter(loadClass("org.apache.hugegraph.StandardHugeGraph$StandardHugeGraphParams"), "graph", "this$0"); + Reflection.registerMethodsToFilter(loadClass("org.apache.hugegraph.StandardHugeGraph$StandardHugeGraphParams"), "access$1", "graph"); + Reflection.registerFieldsToFilter(loadClass("org.apache.hugegraph.StandardHugeGraph$TinkerPopTransaction"), "refs", "opened", "transactions", "this$0", "$assertionsDisabled"); + Reflection.registerMethodsToFilter(loadClass("org.apache.hugegraph.StandardHugeGraph$TinkerPopTransaction"), "lambda$0", "access$3", "access$2", "lambda$1", "graphTransaction", "schemaTransaction", "systemTransaction", "access$1", "setOpened", "doCommit", "verifyOpened", "doRollback", "doClose", "destroyTransaction", "doOpen", "setClosed", "getOrNewTransaction", "access$0", "resetState"); + Reflection.registerFieldsToFilter(org.apache.tinkerpop.gremlin.structure.util.AbstractThreadLocalTransaction.class, "readWriteConsumerInternal", "closeConsumerInternal", "transactionListeners"); + Reflection.registerMethodsToFilter(org.apache.tinkerpop.gremlin.structure.util.AbstractThreadLocalTransaction.class, "doClose", "fireOnCommit", "fireOnRollback", "doReadWrite", "lambda$fireOnRollback$1", "lambda$fireOnCommit$0"); + Reflection.registerFieldsToFilter(org.apache.tinkerpop.gremlin.structure.util.AbstractTransaction.class, "g"); + Reflection.registerMethodsToFilter(org.apache.tinkerpop.gremlin.structure.util.AbstractTransaction.class, "doCommit", "doRollback", "doClose", "doOpen", "fireOnCommit", "fireOnRollback", "doReadWrite"); + Reflection.registerFieldsToFilter(loadClass("org.apache.hugegraph.StandardHugeGraph$Txs"), "schemaTx", "systemTx", "graphTx", "openedTime", "$assertionsDisabled"); + Reflection.registerMethodsToFilter(loadClass("org.apache.hugegraph.StandardHugeGraph$Txs"), "access$2", "access$1", "access$0"); + Reflection.registerFieldsToFilter(GraphTransaction.class, "indexTx", "addedVertices", "removedVertices", "addedEdges", "removedEdges", "addedProps", "removedProps", "updatedVertices", "updatedEdges", "updatedOldestProps", "locksTable", "checkCustomVertexExist", "checkAdjacentVertexExist", "lazyLoadAdjacentVertex", "ignoreInvalidEntry", "commitPartOfAdjacentEdges", "batchSize", "pageSize", "verticesCapacity", "edgesCapacity", "$assertionsDisabled", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$IdStrategy"); + Reflection.registerMethodsToFilter(GraphTransaction.class, "lambda$0", "lambda$1", "lambda$2", "lambda$3", "lambda$4", "lambda$5", "lambda$6", "lambda$7", "lambda$8", "lambda$9", "lambda$10", "lambda$11", "lambda$12", "lambda$13", "lambda$14", "lambda$15", "lambda$16", "lambda$17", "lambda$18", "lambda$19", "access$1", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$IdStrategy", "indexTransaction", "indexTransaction", "beforeWrite", "prepareCommit", "verticesInTxSize", "edgesInTxSize", "checkTxVerticesCapacity", "checkTxEdgesCapacity", "verticesInTxUpdated", "verticesInTxRemoved", "removingEdgeOwner", "prepareDeletions", "prepareDeletions", "prepareUpdates", "prepareAdditions", "checkVertexExistIfCustomizedId", "checkAggregateProperty", "checkAggregateProperty", "checkNonnullProperty", "queryEdgesFromBackend", "commitPartOfEdgeDeletions", "optimizeQueries", "checkVertexLabel", "checkId", "queryVerticesFromBackend", "joinTxVertices", "joinTxEdges", "lockForUpdateProperty", "optimizeQuery", "verifyVerticesConditionQuery", "verifyEdgesConditionQuery", "indexQuery", "joinTxRecords", "propertyUpdated", "parseEntry", "traverseByLabel", "reset", "queryVerticesByIds", "filterUnmatchedRecords", "skipOffsetOrStopLimit", "filterExpiredResultFromFromBackend", "queryEdgesByIds", "matchEdgeSortKeys", "rightResultFromIndexQuery"); + Reflection.registerFieldsToFilter(IndexableTransaction.class, "$assertionsDisabled"); + Reflection.registerMethodsToFilter(IndexableTransaction.class, "indexTransaction", "commit2Backend", "reset"); + Reflection.registerFieldsToFilter(AbstractTransaction.class, "LOG", "ownerThread", "autoCommit", "closed", "committing", "committing2Backend", "graph", "store", "mutation", "serializer", "$assertionsDisabled"); + Reflection.registerMethodsToFilter(AbstractTransaction.class, "beforeWrite", "prepareCommit", "params", "mutation", "commit2Backend", "autoCommit", "beforeRead", "afterWrite", "afterRead", "commitMutation2Backend", "checkOwnerThread", "doAction", "store", "reset"); + Reflection.registerFieldsToFilter(HugeFactory.class, "LOG", "NAME_REGEX", "graphs"); + Reflection.registerMethodsToFilter(HugeFactory.class, "lambda$0"); + Reflection.registerFieldsToFilter(SchemaElement.class, "graph", "id", "name", "userdata", "status"); + Reflection.registerFieldsToFilter(HugeVertex.class, "EMPTY_SET", "id", "label", "edges", "$assertionsDisabled", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$IdStrategy", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$HugeKeys"); + Reflection.registerMethodsToFilter(HugeVertex.class, "$SWITCH_TABLE$com$baidu$hugegraph$type$define$IdStrategy", "newProperty", "newProperty", "tx", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$HugeKeys", "checkIdLength", "onUpdateProperty", "ensureFilledProperties", "clone", "clone"); + Reflection.registerFieldsToFilter(HugeElement.class, "EMPTY_MAP", "MAX_PROPERTIES", "graph", "properties", "expiredTime", "removed", "fresh", "propLoaded", "defaultValueUpdated", "$assertionsDisabled", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$Cardinality"); + Reflection.registerMethodsToFilter(HugeElement.class, "removed", "addProperty", "newProperty", "tx", "onUpdateProperty", "ensureFilledProperties", "propLoaded", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$Cardinality", "getIdValue", "fresh", "updateToDefaultValueIfNone", "copyProperties"); + Reflection.registerFieldsToFilter(HugeEdge.class, "id", "label", "name", "sourceVertex", "targetVertex", "isOutEdge", "$assertionsDisabled", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$HugeKeys", "$SWITCH_TABLE$org$apache$tinkerpop$gremlin$structure$Direction"); + Reflection.registerMethodsToFilter(HugeEdge.class, "checkAdjacentVertexExist", "newProperty", "newProperty", "tx", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$HugeKeys", "onUpdateProperty", "ensureFilledProperties", "$SWITCH_TABLE$org$apache$tinkerpop$gremlin$structure$Direction", "clone", "clone"); + Reflection.registerFieldsToFilter(HugeProperty.class, "owner", "pkey", "value"); + Reflection.registerFieldsToFilter(HugeVariables.class, "LOG", "VARIABLES", "VARIABLE_KEY", "VARIABLE_TYPE", "BYTE_VALUE", "BOOLEAN_VALUE", "INTEGER_VALUE", "LONG_VALUE", "FLOAT_VALUE", "DOUBLE_VALUE", "STRING_VALUE", "LIST", "SET", "TYPES", "params", "graph"); + Reflection.registerMethodsToFilter(HugeVariables.class, "createPropertyKey", "queryAllVariableVertices", "queryVariableVertex", "createVariableVertex", "removeVariableVertex", "extractSingleObject", "setProperty"); + Reflection.registerFieldsToFilter(SchemaManager.class, "transaction", "graph"); + Reflection.registerMethodsToFilter(SchemaManager.class, "lambda$0", "lambda$1", "lambda$2", "lambda$3", "checkExists"); + Reflection.registerFieldsToFilter(PropertyKeyBuilder.class, "id", "name", "dataType", "cardinality", "aggregateType", "checkExist", "userdata", "$assertionsDisabled"); + Reflection.registerMethodsToFilter(PropertyKeyBuilder.class, "lambda$0", "checkStableVars", "checkAggregateType", "hasSameProperties"); + Reflection.registerFieldsToFilter(AbstractBuilder.class, "transaction", "graph"); + Reflection.registerMethodsToFilter(AbstractBuilder.class, "rebuildIndex", "graph", "checkSchemaName", "validOrGenerateId", "lockCheckAndCreateSchema", "propertyKeyOrNull", "checkSchemaIdIfRestoringMode", "vertexLabelOrNull", "edgeLabelOrNull", "indexLabelOrNull", "updateSchemaStatus"); + Reflection.registerFieldsToFilter(VertexLabelBuilder.class, "id", "name", "idStrategy", "properties", "primaryKeys", "nullableKeys", "ttl", "ttlStartTime", "enableLabelIndex", "userdata", "checkExist", "$assertionsDisabled", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$Action", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$IdStrategy"); + Reflection.registerMethodsToFilter(VertexLabelBuilder.class, "lambda$0", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$IdStrategy", "checkStableVars", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$Action", "checkProperties", "checkNullableKeys", "checkIdStrategy", "checkPrimaryKeys", "hasSameProperties", "checkTtl", "checkUserdata", "mapPkId2Name", "mapPkId2Name"); + Reflection.registerFieldsToFilter(EdgeLabelBuilder.class, "id", "name", "sourceLabel", "targetLabel", "frequency", "properties", "sortKeys", "nullableKeys", "ttl", "ttlStartTime", "enableLabelIndex", "userdata", "checkExist", "$assertionsDisabled", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$Action"); + Reflection.registerMethodsToFilter(EdgeLabelBuilder.class, "lambda$0", "checkStableVars", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$Action", "checkProperties", "checkNullableKeys", "checkSortKeys", "checkRelation", "hasSameProperties", "checkTtl", "checkUserdata", "mapPkId2Name", "mapPkId2Name"); + Reflection.registerFieldsToFilter(IndexLabelBuilder.class, "id", "name", "baseType", "baseValue", "indexType", "indexFields", "userdata", "checkExist", "rebuild", "$assertionsDisabled", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$DataType", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$IndexType"); + Reflection.registerMethodsToFilter(IndexLabelBuilder.class, "lambda$0", "checkStableVars", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$DataType", "$SWITCH_TABLE$com$baidu$hugegraph$type$define$IndexType", "checkBaseType", "checkIndexType", "checkFields4Range", "loadElement", "checkFields", "checkRepeatIndex", "checkRepeatIndex", "checkRepeatIndex", "checkPrimaryKeyIndex", "checkRepeatRangeIndex", "checkRepeatSearchIndex", "checkRepeatSecondaryIndex", "checkRepeatShardIndex", "checkRepeatUniqueIndex", "removeSubIndex", "hasSubIndex", "allStringIndex", "oneNumericField", "hasSameProperties"); + Reflection.registerFieldsToFilter(TaskManager.class, "LOG", "SCHEDULE_PERIOD", "THREADS", "MANAGER", "schedulers", "taskExecutor", "taskDbExecutor", "serverInfoDbExecutor", "schedulerExecutor", "contexts", "$assertionsDisabled"); + Reflection.registerMethodsToFilter(TaskManager.class, "lambda$0", "resetContext", "closeTaskTx", "setContext", "instance", "closeSchedulerTx", "notifyNewTask", "scheduleOrExecuteJob", "scheduleOrExecuteJobForGraph"); + Reflection.registerFieldsToFilter(StandardTaskScheduler.class, "LOG", "graph", "serverManager", "taskExecutor", "taskDbExecutor", "eventListener", "tasks", "taskTx", "NO_LIMIT", "PAGE_SIZE", "QUERY_INTERVAL", "MAX_PENDING_TASKS", "$assertionsDisabled"); + Reflection.registerMethodsToFilter(StandardTaskScheduler.class, "lambda$0", "lambda$1", "lambda$2", "lambda$3", "lambda$4", "lambda$5", "lambda$6", "lambda$7", "tx", "listenChanges", "unlistenChanges", "submitTask", "queryTask", "queryTask", "queryTask", "call", "call", "remove", "sleep", "taskDone", "serverManager", "supportsPaging", "restore", "checkOnMasterNode", "waitUntilTaskCompleted", "scheduleTasks", "executeTasksOnWorker", "cancelTasksOnWorker"); + Reflection.registerFieldsToFilter(HugeTask.class, "LOG", "DECOMPRESS_RATIO", "scheduler", "callable", "type", "name", "id", "parent", "dependencies", "description", "context", "create", "server", "load", "status", "progress", "update", "retries", "input", "result", "$assertionsDisabled"); + Reflection.registerMethodsToFilter(HugeTask.class, "property", "scheduler", "scheduler", "asArray", "checkPropertySize", "checkPropertySize", "checkDependenciesSuccess", "toOrderSet", "done", "callable", "setException", "set", "result", "status"); + Reflection.registerFieldsToFilter(TaskCallable.class, "LOG", "ERROR_COMMIT", "ERROR_MESSAGES", "task", "graph", "lastSaveTime", "saveInterval"); + Reflection.registerMethodsToFilter(TaskCallable.class, "graph", "closeTx", "cancelled", "done", "task", "save", "needSaveWithEx"); + Reflection.registerFieldsToFilter(TaskCallable.SysTaskCallable.class, "params"); + Reflection.registerMethodsToFilter(TaskCallable.SysTaskCallable.class, "params", "params"); + Reflection.registerFieldsToFilter(StandardAuthManager.class, "CACHE_EXPIRE", "graph", "eventListener", "usersCache", "users", "groups", "targets", "belong", "access", "$assertionsDisabled"); + Reflection.registerMethodsToFilter(StandardAuthManager.class, "lambda$0", "listenChanges", "unlistenChanges", "invalidCache", "initSchemaIfNeeded", "rolePermission", "rolePermission", "rolePermission", "cache"); + Reflection.registerFieldsToFilter(SchemaDefine.class, "graph", "label"); + Reflection.registerMethodsToFilter(SchemaDefine.class, "schema", "createPropertyKey", "createPropertyKey", "createPropertyKey", "existEdgeLabel", "createRangeIndex", "unhideField", "hideField", "existVertexLabel", "initProperties"); + Reflection.registerFieldsToFilter(EntityManager.class, "graph", "label", "deser", "NO_LIMIT", "$assertionsDisabled"); + Reflection.registerMethodsToFilter(EntityManager.class, "toList", "graph", "tx", "commitOrRollback", "unhideLabel", "queryById", "queryEntity", "constructVertex", "save", "query"); + Reflection.registerFieldsToFilter(RelationshipManager.class, "graph", "label", "deser", "NO_LIMIT", "$assertionsDisabled"); + Reflection.registerMethodsToFilter(RelationshipManager.class, "lambda$0", "toList", "graph", "tx", "commitOrRollback", "unhideLabel", "queryById", "queryRelationship", "newVertex", "save"); + Reflection.registerFieldsToFilter(CacheManager.class, "LOG", "INSTANCE", "TIMER_TICK_PERIOD", "LOG_TICK_COST_TIME", "caches", "timer"); + Reflection.registerMethodsToFilter(CacheManager.class, "access$0", "scheduleTimer", "instance"); + Reflection.registerFieldsToFilter(org.apache.hugegraph.concurrent.LockManager.class, "INSTANCE", "lockGroupMap"); + Reflection.registerMethodsToFilter(org.apache.hugegraph.concurrent.LockManager.class, "instance"); + Reflection.registerFieldsToFilter(LicenseVerifier.class, "LOG", "LICENSE_PARAM_PATH", "INSTANCE", "CHECK_INTERVAL", "lastCheckTime", "verifyParam", "manager"); + Reflection.registerMethodsToFilter(LicenseVerifier.class, "buildVerifyParam", "initLicenseParam", "verifyPublicCert", "instance"); + Reflection.registerFieldsToFilter(ServerReporter.class, "instance", "gauges", "counters", "histograms", "meters", "timers"); + Reflection.registerMethodsToFilter(ServerReporter.class, "instance", "instance"); + Reflection.registerFieldsToFilter(com.codahale.metrics.ScheduledReporter.class, "LOG", "FACTORY_ID", "registry", "executor", "shutdownExecutorOnStop", "disabledMetricAttributes", "scheduledFuture", "filter", "durationFactor", "durationUnit", "rateFactor", "rateUnit"); + Reflection.registerMethodsToFilter(com.codahale.metrics.ScheduledReporter.class, "convertDuration", "convertRate", "getRateUnit", "getDurationUnit", "isShutdownExecutorOnStop", "getDisabledMetricAttributes", "calculateRateUnit", "createDefaultExecutor", "lambda$start$0", "start"); + Reflection.registerFieldsToFilter(JsonSerializer.class, "LBUF_SIZE", "INSTANCE"); + Reflection.registerMethodsToFilter(JsonSerializer.class, "writeIterator", "instance"); + Reflection.registerFieldsToFilter(HugeVertexStepStrategy.class, "serialVersionUID", "INSTANCE"); + Reflection.registerMethodsToFilter(HugeVertexStepStrategy.class, "instance"); + Reflection.registerFieldsToFilter(HugeGraphStepStrategy.class, "serialVersionUID", "INSTANCE"); + Reflection.registerMethodsToFilter(HugeGraphStepStrategy.class, "instance"); + Reflection.registerFieldsToFilter(HugeCountStepStrategy.class, "serialVersionUID", "INSTANCE"); + Reflection.registerMethodsToFilter(HugeCountStepStrategy.class, "lambda$0", "instance"); + + // Enable this line to generate registration statement + //genRegisterPrivateActions(); + } + + @SuppressWarnings("unused") + private static void genRegisterPrivateActions() { + registerPrivateActions(Thread.class); + registerPrivateActions(ThreadLocal.class); + registerPrivateActions(InheritableThreadLocal.class); + + registerPrivateActions(StandardAuthenticator.class); + registerPrivateActions(ConfigAuthenticator.class); + registerPrivateActions(HugeFactoryAuthProxy.class); + registerPrivateActions(HugeAuthenticator.User.class); + + registerPrivateActions(HugeGraphAuthProxy.class); + registerPrivateActions(HugeGraphAuthProxy.AuthManagerProxy.class); + registerPrivateActions(HugeGraphAuthProxy.TaskSchedulerProxy.class); + registerPrivateActions(HugeGraphAuthProxy.GraphTraversalSourceProxy.class); + registerPrivateActions(HugeGraphAuthProxy.TraversalStrategiesProxy.class); + registerPrivateActions(HugeGraphAuthProxy.VariablesProxy.class); + registerPrivateActions(HugeGraphAuthProxy.Context.class); + registerPrivateActions(HugeGraphAuthProxy.ContextThreadPoolExecutor.class); + registerPrivateActions(HugeGraphAuthProxy.ContextTask.class); + + for (Class clazz : StandardHugeGraph.PROTECT_CLASSES) { + registerPrivateActions(clazz); + } + + registerPrivateActions(HugeFactory.class); + registerPrivateActions(AbstractTransaction.class); + + registerPrivateActions(SchemaElement.class); + registerPrivateActions(HugeVertex.class); + registerPrivateActions(HugeEdge.class); + registerPrivateActions(HugeProperty.class); + registerPrivateActions(HugeVariables.class); + + registerPrivateActions(SchemaManager.class); + registerPrivateActions(PropertyKeyBuilder.class); + registerPrivateActions(VertexLabelBuilder.class); + registerPrivateActions(EdgeLabelBuilder.class); + registerPrivateActions(IndexLabelBuilder.class); + + registerPrivateActions(TaskManager.class); + registerPrivateActions(StandardTaskScheduler.class); + registerPrivateActions(HugeTask.class); + registerPrivateActions(TaskCallable.class); + registerPrivateActions(SysTaskCallable.class); + + registerPrivateActions(StandardAuthManager.class); + registerPrivateActions(SchemaDefine.class); + registerPrivateActions(EntityManager.class); + registerPrivateActions(RelationshipManager.class); + + // Don't shield them because need to access by auth RPC + //registerPrivateActions(HugeUser.class); + //registerPrivateActions(RolePermission.class); + //registerPrivateActions(HugeResource.class); + + registerPrivateActions(CacheManager.class); + registerPrivateActions(LockManager.class); + registerPrivateActions(LicenseVerifier.class); + registerPrivateActions(ServerReporter.class); + registerPrivateActions(JsonSerializer.class); + registerPrivateActions(HugeVertexStepStrategy.class); + registerPrivateActions(HugeGraphStepStrategy.class); + registerPrivateActions(HugeCountStepStrategy.class); + } + + private static void registerPrivateActions(Class clazz) { + while (clazz != Object.class) { + List fields = new ArrayList<>(); + for (Field field : clazz.getDeclaredFields()) { + if (!Modifier.isPublic(field.getModifiers())) { + fields.add(field.getName()); + } + } + List methods = new ArrayList<>(); + for (Method method : clazz.getDeclaredMethods()) { + if (!Modifier.isPublic(method.getModifiers()) || + PROTECT_METHODS.contains(method.getName())) { + methods.add(method.getName()); + } + } + registerClass(clazz, fields, methods); + clazz = clazz.getSuperclass(); + } + } + + private static boolean registerClass(Class clazz, + List fields, + List methods) { + if (clazz.getName().startsWith("java") || + fields.isEmpty() && methods.isEmpty()) { + return false; + } + final String[] array = new String[fields.size()]; + try { + Reflection.registerFieldsToFilter(clazz, fields.toArray(array)); + Reflection.registerMethodsToFilter(clazz, methods.toArray(array)); + } catch (IllegalArgumentException e) { + if (e.getMessage().contains("Filter already registered: class")) { + return false; + } + throw e; + } + + String code; + code = String.format("Reflection.registerFieldsToFilter(%s.class, \"%s\");", + clazz.getCanonicalName(), String.join("\", \"", fields)); + if (!fields.isEmpty()) { + // CHECKSTYLE:OFF + System.out.println(code); + // CHECKSTYLE:ON + } + + code = String.format("Reflection.registerMethodsToFilter(%s.class, \"%s\");", + clazz.getCanonicalName(), String.join("\", \"", methods)); + if (!methods.isEmpty()) { + // CHECKSTYLE:OFF + System.out.println(code); + // CHECKSTYLE:ON + } + + return true; + } + + private static Class loadClass(String clazz) { + try { + return Class.forName(clazz); + } catch (ClassNotFoundException e) { + throw new HugeException(e.getMessage(), e); + } + } +} diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeGraphAuthProxy.java b/hugegraph-api/src/main/java/org/apache/hugegraph/auth/HugeGraphAuthProxy.java similarity index 96% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeGraphAuthProxy.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/auth/HugeGraphAuthProxy.java index 8fac1fdf1..331c58004 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeGraphAuthProxy.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/auth/HugeGraphAuthProxy.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; import java.time.Duration; import java.util.ArrayList; @@ -59,50 +59,50 @@ import org.apache.tinkerpop.gremlin.structure.io.Io; import org.slf4j.Logger; import com.alipay.remoting.rpc.RpcServer; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.auth.HugeAuthenticator.RolePerm; -import com.baidu.hugegraph.auth.HugeAuthenticator.User; -import com.baidu.hugegraph.auth.SchemaDefine.AuthElement; -import com.baidu.hugegraph.backend.cache.Cache; -import com.baidu.hugegraph.backend.cache.CacheManager; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.BackendFeatures; -import com.baidu.hugegraph.backend.store.BackendStoreInfo; -import com.baidu.hugegraph.backend.store.raft.RaftGroupManager; -import com.baidu.hugegraph.config.AuthOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.config.TypedOption; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.iterator.FilterIterator; -import com.baidu.hugegraph.iterator.MapperIterator; -import com.baidu.hugegraph.rpc.RpcServiceConfig4Client; -import com.baidu.hugegraph.rpc.RpcServiceConfig4Server; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.schema.SchemaLabel; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.structure.HugeFeatures; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.task.HugeTask; -import com.baidu.hugegraph.task.TaskManager; -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.Nameable; -import com.baidu.hugegraph.type.define.GraphMode; -import com.baidu.hugegraph.type.define.GraphReadMode; -import com.baidu.hugegraph.type.define.NodeRole; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; -import com.baidu.hugegraph.util.RateLimiter; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.auth.HugeAuthenticator.RolePerm; +import org.apache.hugegraph.auth.HugeAuthenticator.User; +import org.apache.hugegraph.auth.SchemaDefine.AuthElement; +import org.apache.hugegraph.backend.cache.Cache; +import org.apache.hugegraph.backend.cache.CacheManager; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.BackendFeatures; +import org.apache.hugegraph.backend.store.BackendStoreInfo; +import org.apache.hugegraph.backend.store.raft.RaftGroupManager; +import org.apache.hugegraph.config.AuthOptions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.TypedOption; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.iterator.FilterIterator; +import org.apache.hugegraph.iterator.MapperIterator; +import org.apache.hugegraph.rpc.RpcServiceConfig4Client; +import org.apache.hugegraph.rpc.RpcServiceConfig4Server; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.schema.SchemaLabel; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.structure.HugeFeatures; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.task.HugeTask; +import org.apache.hugegraph.task.TaskManager; +import org.apache.hugegraph.task.TaskScheduler; +import org.apache.hugegraph.task.TaskStatus; +import org.apache.hugegraph.traversal.optimize.HugeScriptTraversal; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.Nameable; +import org.apache.hugegraph.type.define.GraphMode; +import org.apache.hugegraph.type.define.GraphReadMode; +import org.apache.hugegraph.type.define.NodeRole; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; +import org.apache.hugegraph.util.RateLimiter; import jakarta.ws.rs.ForbiddenException; import jakarta.ws.rs.NotAuthorizedException; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/StandardAuthenticator.java b/hugegraph-api/src/main/java/org/apache/hugegraph/auth/StandardAuthenticator.java similarity index 94% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/auth/StandardAuthenticator.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/auth/StandardAuthenticator.java index 6006aad92..747be14fb 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/StandardAuthenticator.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/auth/StandardAuthenticator.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; import java.io.Console; import java.net.InetAddress; @@ -28,14 +28,14 @@ import org.apache.commons.lang.NotImplementedException; import org.apache.commons.lang.StringUtils; import org.apache.tinkerpop.gremlin.structure.util.GraphFactory; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.config.ServerOptions; -import com.baidu.hugegraph.rpc.RpcClientProviderWithAuth; -import com.baidu.hugegraph.util.ConfigUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.ServerOptions; +import org.apache.hugegraph.rpc.RpcClientProviderWithAuth; +import org.apache.hugegraph.util.ConfigUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.StringEncoding; public class StandardAuthenticator implements HugeAuthenticator { diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/WsAndHttpBasicAuthHandler.java b/hugegraph-api/src/main/java/org/apache/hugegraph/auth/WsAndHttpBasicAuthHandler.java similarity index 87% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/auth/WsAndHttpBasicAuthHandler.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/auth/WsAndHttpBasicAuthHandler.java index 580173bd9..0d35b1000 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/auth/WsAndHttpBasicAuthHandler.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/auth/WsAndHttpBasicAuthHandler.java @@ -1,23 +1,23 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * Copyright 2017 HugeGraph Authors * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; import static io.netty.handler.codec.http.HttpHeaderNames.CONNECTION; import static io.netty.handler.codec.http.HttpHeaderNames.UPGRADE; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java b/hugegraph-api/src/main/java/org/apache/hugegraph/config/ServerOptions.java similarity index 92% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/config/ServerOptions.java index c132edcd2..cd202263a 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/config/ServerOptions.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.config; +package org.apache.hugegraph.config; -import static com.baidu.hugegraph.config.OptionChecker.allowValues; -import static com.baidu.hugegraph.config.OptionChecker.disallowEmpty; -import static com.baidu.hugegraph.config.OptionChecker.nonNegativeInt; -import static com.baidu.hugegraph.config.OptionChecker.positiveInt; -import static com.baidu.hugegraph.config.OptionChecker.rangeInt; +import static org.apache.hugegraph.config.OptionChecker.allowValues; +import static org.apache.hugegraph.config.OptionChecker.disallowEmpty; +import static org.apache.hugegraph.config.OptionChecker.nonNegativeInt; +import static org.apache.hugegraph.config.OptionChecker.positiveInt; +import static org.apache.hugegraph.config.OptionChecker.rangeInt; public class ServerOptions extends OptionHolder { @@ -197,8 +197,8 @@ public class ServerOptions extends OptionHolder { new ConfigOption<>( "auth.authenticator", "The class path of authenticator implementation. " + - "e.g., com.baidu.hugegraph.auth.StandardAuthenticator, " + - "or com.baidu.hugegraph.auth.ConfigAuthenticator.", + "e.g., org.apache.hugegraph.auth.StandardAuthenticator, " + + "or org.apache.hugegraph.auth.ConfigAuthenticator.", null, "" ); @@ -207,7 +207,7 @@ public class ServerOptions extends OptionHolder { new ConfigOption<>( "auth.graph_store", "The name of graph used to store authentication information, " + - "like users, only for com.baidu.hugegraph.auth.StandardAuthenticator.", + "like users, only for org.apache.hugegraph.auth.StandardAuthenticator.", disallowEmpty(), "hugegraph" ); @@ -216,7 +216,7 @@ public class ServerOptions extends OptionHolder { new ConfigOption<>( "auth.admin_token", "Token for administrator operations, " + - "only for com.baidu.hugegraph.auth.ConfigAuthenticator.", + "only for org.apache.hugegraph.auth.ConfigAuthenticator.", disallowEmpty(), "162f7848-0b6d-4faf-b557-3a0797869c55" ); @@ -225,7 +225,7 @@ public class ServerOptions extends OptionHolder { new ConfigListOption<>( "auth.user_tokens", "The map of user tokens with name and password, " + - "only for com.baidu.hugegraph.auth.ConfigAuthenticator.", + "only for org.apache.hugegraph.auth.ConfigAuthenticator.", disallowEmpty(), "hugegraph:9fd95c9c-711b-415b-b85f-d4df46ba5c31" ); diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/core/GraphManager.java b/hugegraph-api/src/main/java/org/apache/hugegraph/core/GraphManager.java similarity index 92% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/core/GraphManager.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/core/GraphManager.java index 1446c3234..26bfaad83 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/core/GraphManager.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/core/GraphManager.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.core; +package org.apache.hugegraph.core; import java.util.Collections; import java.util.HashSet; @@ -35,44 +35,44 @@ import org.apache.tinkerpop.gremlin.server.util.MetricManager; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Transaction; import org.apache.tinkerpop.gremlin.structure.util.GraphFactory; +import org.apache.hugegraph.auth.HugeFactoryAuthProxy; +import org.apache.hugegraph.auth.HugeGraphAuthProxy; +import org.apache.hugegraph.config.ServerOptions; +import org.apache.hugegraph.license.LicenseVerifier; +import org.apache.hugegraph.metrics.MetricsUtil; +import org.apache.hugegraph.metrics.ServerReporter; +import org.apache.hugegraph.serializer.JsonSerializer; +import org.apache.hugegraph.serializer.Serializer; +import org.apache.hugegraph.server.RestServer; import org.slf4j.Logger; import com.alipay.sofa.rpc.config.ServerConfig; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.auth.AuthManager; -import com.baidu.hugegraph.auth.HugeAuthenticator; -import com.baidu.hugegraph.auth.HugeFactoryAuthProxy; -import com.baidu.hugegraph.auth.HugeGraphAuthProxy; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.cache.Cache; -import com.baidu.hugegraph.backend.cache.CacheManager; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.store.BackendStoreInfo; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.config.ServerOptions; -import com.baidu.hugegraph.config.TypedOption; -import com.baidu.hugegraph.event.EventHub; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.license.LicenseVerifier; -import com.baidu.hugegraph.metrics.MetricsUtil; -import com.baidu.hugegraph.metrics.ServerReporter; -import com.baidu.hugegraph.rpc.RpcClientProvider; -import com.baidu.hugegraph.rpc.RpcConsumerConfig; -import com.baidu.hugegraph.rpc.RpcProviderConfig; -import com.baidu.hugegraph.rpc.RpcServer; -import com.baidu.hugegraph.serializer.JsonSerializer; -import com.baidu.hugegraph.serializer.Serializer; -import com.baidu.hugegraph.server.RestServer; -import com.baidu.hugegraph.task.TaskManager; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.type.define.NodeRole; -import com.baidu.hugegraph.util.ConfigUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Events; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.auth.AuthManager; +import org.apache.hugegraph.auth.HugeAuthenticator; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.cache.Cache; +import org.apache.hugegraph.backend.cache.CacheManager; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.store.BackendStoreInfo; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.TypedOption; +import org.apache.hugegraph.event.EventHub; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.rpc.RpcClientProvider; +import org.apache.hugegraph.rpc.RpcConsumerConfig; +import org.apache.hugegraph.rpc.RpcProviderConfig; +import org.apache.hugegraph.rpc.RpcServer; +import org.apache.hugegraph.task.TaskManager; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.type.define.NodeRole; +import org.apache.hugegraph.util.ConfigUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Events; +import org.apache.hugegraph.util.Log; public final class GraphManager { diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/define/Checkable.java b/hugegraph-api/src/main/java/org/apache/hugegraph/define/Checkable.java similarity index 96% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/define/Checkable.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/define/Checkable.java index 387bf12b7..402323bf8 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/define/Checkable.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/define/Checkable.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.define; +package org.apache.hugegraph.define; public interface Checkable { diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/define/UpdateStrategy.java b/hugegraph-api/src/main/java/org/apache/hugegraph/define/UpdateStrategy.java similarity index 98% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/define/UpdateStrategy.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/define/UpdateStrategy.java index ab0fdb762..9a4caa283 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/define/UpdateStrategy.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/define/UpdateStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.define; +package org.apache.hugegraph.define; import java.math.BigDecimal; import java.util.Collection; @@ -26,8 +26,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.NumericUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.NumericUtil; import com.google.common.collect.Sets; public enum UpdateStrategy { diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/define/WorkLoad.java b/hugegraph-api/src/main/java/org/apache/hugegraph/define/WorkLoad.java similarity index 97% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/define/WorkLoad.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/define/WorkLoad.java index d30d7a108..72f8031c5 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/define/WorkLoad.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/define/WorkLoad.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.define; +package org.apache.hugegraph.define; import java.util.concurrent.atomic.AtomicInteger; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/license/LicenseVerifier.java b/hugegraph-api/src/main/java/org/apache/hugegraph/license/LicenseVerifier.java similarity index 95% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/license/LicenseVerifier.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/license/LicenseVerifier.java index 6b3ab4ab1..b9bf66510 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/license/LicenseVerifier.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/license/LicenseVerifier.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.license; +package org.apache.hugegraph.license; import java.io.IOException; import java.io.InputStream; @@ -27,10 +27,10 @@ import java.time.Instant; import org.apache.commons.codec.digest.DigestUtils; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.util.Log; import com.fasterxml.jackson.databind.ObjectMapper; public class LicenseVerifier { diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/license/LicenseVerifyManager.java b/hugegraph-api/src/main/java/org/apache/hugegraph/license/LicenseVerifyManager.java similarity index 94% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/license/LicenseVerifyManager.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/license/LicenseVerifyManager.java index a4aeb8649..1e67b7fbc 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/license/LicenseVerifyManager.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/license/LicenseVerifyManager.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.license; +package org.apache.hugegraph.license; import java.lang.management.ManagementFactory; import java.net.InetAddress; @@ -27,16 +27,16 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.config.ServerOptions; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; -import com.baidu.hugegraph.util.VersionUtil; -import com.baidu.hugegraph.version.CoreVersion; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.ServerOptions; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; +import org.apache.hugegraph.util.VersionUtil; +import org.apache.hugegraph.version.CoreVersion; import com.sun.management.OperatingSystemMXBean; public class LicenseVerifyManager { diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/metrics/MetricsModule.java b/hugegraph-api/src/main/java/org/apache/hugegraph/metrics/MetricsModule.java similarity index 98% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/metrics/MetricsModule.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/metrics/MetricsModule.java index ceb500651..a0c2a9ec3 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/metrics/MetricsModule.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/metrics/MetricsModule.java @@ -1,4 +1,6 @@ /* + * Copyright 2017 HugeGraph Authors + * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with this * work for additional information regarding copyright ownership. The ASF @@ -15,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.metrics; +package org.apache.hugegraph.metrics; import java.io.IOException; import java.util.Arrays; @@ -44,7 +46,7 @@ import com.codahale.metrics.Timer; public class MetricsModule extends Module { private static final Version VERSION = new Version(1, 1, 0, "", - "com.baidu.hugegraph", + "org.apache.hugegraph", "hugegraph-api"); @SuppressWarnings("rawtypes") diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/metrics/MetricsUtil.java b/hugegraph-api/src/main/java/org/apache/hugegraph/metrics/MetricsUtil.java similarity index 98% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/metrics/MetricsUtil.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/metrics/MetricsUtil.java index 95e3ddedd..c9e707c23 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/metrics/MetricsUtil.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/metrics/MetricsUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.metrics; +package org.apache.hugegraph.metrics; import org.apache.tinkerpop.gremlin.server.util.MetricManager; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/metrics/ServerReporter.java b/hugegraph-api/src/main/java/org/apache/hugegraph/metrics/ServerReporter.java similarity index 98% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/metrics/ServerReporter.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/metrics/ServerReporter.java index 956235edd..b6fb5cb68 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/metrics/ServerReporter.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/metrics/ServerReporter.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.metrics; +package org.apache.hugegraph.metrics; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; @@ -27,7 +27,7 @@ import java.util.Map; import java.util.SortedMap; import java.util.concurrent.TimeUnit; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.util.E; import com.codahale.metrics.Counter; import com.codahale.metrics.Gauge; import com.codahale.metrics.Histogram; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/metrics/SystemMetrics.java b/hugegraph-api/src/main/java/org/apache/hugegraph/metrics/SystemMetrics.java similarity index 98% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/metrics/SystemMetrics.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/metrics/SystemMetrics.java index 8d6c56fb0..7f47c65a1 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/metrics/SystemMetrics.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/metrics/SystemMetrics.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.metrics; +package org.apache.hugegraph.metrics; import java.lang.management.ClassLoadingMXBean; import java.lang.management.GarbageCollectorMXBean; @@ -30,7 +30,7 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; -import com.baidu.hugegraph.util.Bytes; +import org.apache.hugegraph.util.Bytes; public class SystemMetrics { diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcClientProviderWithAuth.java b/hugegraph-api/src/main/java/org/apache/hugegraph/rpc/RpcClientProviderWithAuth.java similarity index 88% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcClientProviderWithAuth.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/rpc/RpcClientProviderWithAuth.java index 59376d0b8..ae74a52e4 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcClientProviderWithAuth.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/rpc/RpcClientProviderWithAuth.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.rpc; +package org.apache.hugegraph.rpc; import com.alipay.sofa.rpc.common.utils.StringUtils; -import com.baidu.hugegraph.auth.AuthManager; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.config.ServerOptions; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.auth.AuthManager; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.ServerOptions; +import org.apache.hugegraph.util.E; public class RpcClientProviderWithAuth extends RpcClientProvider { diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/serializer/JsonSerializer.java b/hugegraph-api/src/main/java/org/apache/hugegraph/serializer/JsonSerializer.java similarity index 90% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/serializer/JsonSerializer.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/serializer/JsonSerializer.java index 03d6cd88c..4ac335b21 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/serializer/JsonSerializer.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/serializer/JsonSerializer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.serializer; +package org.apache.hugegraph.serializer; import java.io.ByteArrayOutputStream; import java.util.ArrayList; @@ -31,24 +31,24 @@ import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.auth.SchemaDefine.AuthElement; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.page.PageInfo; -import com.baidu.hugegraph.iterator.Metadatable; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.traversal.algorithm.CustomizedCrosspointsTraverser.CrosspointsPaths; -import com.baidu.hugegraph.traversal.algorithm.FusiformSimilarityTraverser.SimilarsMap; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser.NodeWithWeight; -import com.baidu.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser.WeightedPaths; -import com.baidu.hugegraph.traversal.optimize.TraversalUtil; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.auth.SchemaDefine.AuthElement; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.page.PageInfo; +import org.apache.hugegraph.iterator.Metadatable; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.traversal.algorithm.CustomizedCrosspointsTraverser.CrosspointsPaths; +import org.apache.hugegraph.traversal.algorithm.FusiformSimilarityTraverser.SimilarsMap; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser.NodeWithWeight; +import org.apache.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser.WeightedPaths; +import org.apache.hugegraph.traversal.optimize.TraversalUtil; +import org.apache.hugegraph.util.JsonUtil; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/serializer/Serializer.java b/hugegraph-api/src/main/java/org/apache/hugegraph/serializer/Serializer.java similarity index 78% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/serializer/Serializer.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/serializer/Serializer.java index e5b1c1bce..70268c985 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/serializer/Serializer.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/serializer/Serializer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.serializer; +package org.apache.hugegraph.serializer; import java.util.Collection; import java.util.Iterator; @@ -27,18 +27,18 @@ import java.util.Map; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.auth.SchemaDefine.AuthElement; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.traversal.algorithm.CustomizedCrosspointsTraverser.CrosspointsPaths; -import com.baidu.hugegraph.traversal.algorithm.FusiformSimilarityTraverser.SimilarsMap; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser.NodeWithWeight; -import com.baidu.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser.WeightedPaths; +import org.apache.hugegraph.auth.SchemaDefine.AuthElement; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.traversal.algorithm.CustomizedCrosspointsTraverser.CrosspointsPaths; +import org.apache.hugegraph.traversal.algorithm.FusiformSimilarityTraverser.SimilarsMap; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser.NodeWithWeight; +import org.apache.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser.WeightedPaths; public interface Serializer { diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/server/ApplicationConfig.java b/hugegraph-api/src/main/java/org/apache/hugegraph/server/ApplicationConfig.java similarity index 94% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/server/ApplicationConfig.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/server/ApplicationConfig.java index 22e8d66e0..b6071954e 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/server/ApplicationConfig.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/server/ApplicationConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.server; +package org.apache.hugegraph.server; import org.apache.tinkerpop.gremlin.server.util.MetricManager; import org.glassfish.hk2.api.Factory; @@ -31,13 +31,13 @@ import org.glassfish.jersey.server.monitoring.ApplicationEventListener; import org.glassfish.jersey.server.monitoring.RequestEvent; import org.glassfish.jersey.server.monitoring.RequestEventListener; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.core.GraphManager; -import com.baidu.hugegraph.define.WorkLoad; -import com.baidu.hugegraph.event.EventHub; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.version.CoreVersion; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.define.WorkLoad; +import org.apache.hugegraph.event.EventHub; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.version.CoreVersion; import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.jersey3.InstrumentedResourceMethodApplicationListener; @@ -61,7 +61,7 @@ import jakarta.ws.rs.ApplicationPath; public class ApplicationConfig extends ResourceConfig { public ApplicationConfig(HugeConfig conf, EventHub hub) { - packages("com.baidu.hugegraph.api"); + packages("org.apache.hugegraph.api"); // Register Jackson to support json register(org.glassfish.jersey.jackson.JacksonFeature.class); diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/server/RestServer.java b/hugegraph-api/src/main/java/org/apache/hugegraph/server/RestServer.java similarity index 96% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/server/RestServer.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/server/RestServer.java index a50c92ad4..6bf4daeb9 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/server/RestServer.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/server/RestServer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.server; +package org.apache.hugegraph.server; import java.io.IOException; import java.net.URI; @@ -38,12 +38,12 @@ import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory; import org.glassfish.jersey.server.ResourceConfig; import org.slf4j.Logger; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.config.ServerOptions; -import com.baidu.hugegraph.event.EventHub; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; -import com.baidu.hugegraph.version.ApiVersion; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.ServerOptions; +import org.apache.hugegraph.event.EventHub; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; +import org.apache.hugegraph.version.ApiVersion; public class RestServer { diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/version/ApiVersion.java b/hugegraph-api/src/main/java/org/apache/hugegraph/version/ApiVersion.java similarity index 97% rename from hugegraph-api/src/main/java/com/baidu/hugegraph/version/ApiVersion.java rename to hugegraph-api/src/main/java/org/apache/hugegraph/version/ApiVersion.java index dc43e93b1..7265d3b6b 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/version/ApiVersion.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/version/ApiVersion.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.version; +package org.apache.hugegraph.version; -import com.baidu.hugegraph.util.VersionUtil; -import com.baidu.hugegraph.util.VersionUtil.Version; +import org.apache.hugegraph.util.VersionUtil; +import org.apache.hugegraph.util.VersionUtil.Version; public final class ApiVersion { diff --git a/hugegraph-cassandra/pom.xml b/hugegraph-cassandra/pom.xml index 9d77189f0..1104d6f14 100644 --- a/hugegraph-cassandra/pom.xml +++ b/hugegraph-cassandra/pom.xml @@ -19,19 +19,24 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + org.apache.hugegraph hugegraph - com.baidu.hugegraph - 0.13.0 + ${revision} + ../pom.xml 4.0.0 hugegraph-cassandra + + 1.0.0 + + - com.baidu.hugegraph + org.apache.hugegraph hugegraph-core - ${project.version} + ${hugegraph-core-version} org.apache.cassandra diff --git a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraBackendEntry.java b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraBackendEntry.java similarity index 85% rename from hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraBackendEntry.java rename to hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraBackendEntry.java index 8607737e7..5a9c62836 100644 --- a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraBackendEntry.java +++ b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraBackendEntry.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.cassandra; +package org.apache.hugegraph.backend.store.cassandra; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.serializer.TableBackendEntry; -import com.baidu.hugegraph.type.HugeType; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.serializer.TableBackendEntry; +import org.apache.hugegraph.type.HugeType; public class CassandraBackendEntry extends TableBackendEntry { diff --git a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraEntryIterator.java b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraEntryIterator.java similarity index 95% rename from hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraEntryIterator.java rename to hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraEntryIterator.java index 4c466f382..48d0ca2ad 100644 --- a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraEntryIterator.java +++ b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraEntryIterator.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.cassandra; +package org.apache.hugegraph.backend.store.cassandra; import java.util.Iterator; import java.util.List; import java.util.function.BiFunction; -import com.baidu.hugegraph.backend.page.PageState; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntryIterator; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.page.PageState; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendEntryIterator; +import org.apache.hugegraph.util.E; import com.datastax.driver.core.ExecutionInfo; import com.datastax.driver.core.PagingState; import com.datastax.driver.core.ResultSet; diff --git a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraFeatures.java b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraFeatures.java similarity index 96% rename from hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraFeatures.java rename to hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraFeatures.java index 8e6729f0a..b918ee3d3 100644 --- a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraFeatures.java +++ b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraFeatures.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.cassandra; +package org.apache.hugegraph.backend.store.cassandra; -import com.baidu.hugegraph.backend.store.BackendFeatures; +import org.apache.hugegraph.backend.store.BackendFeatures; public class CassandraFeatures implements BackendFeatures { diff --git a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraMetrics.java b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraMetrics.java similarity index 95% rename from hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraMetrics.java rename to hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraMetrics.java index f385c0a73..4429e315d 100644 --- a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraMetrics.java +++ b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraMetrics.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.cassandra; +package org.apache.hugegraph.backend.store.cassandra; import java.io.IOException; import java.lang.management.MemoryUsage; @@ -37,17 +37,17 @@ import org.apache.cassandra.tools.nodetool.Compact; import org.apache.tinkerpop.gremlin.util.NumberHelper; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.store.BackendMetrics; -import com.baidu.hugegraph.backend.store.BackendStoreProvider; -import com.baidu.hugegraph.backend.store.BackendTable; -import com.baidu.hugegraph.backend.store.cassandra.CassandraTables.Edge; -import com.baidu.hugegraph.backend.store.cassandra.CassandraTables.Vertex; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.Log; -import com.baidu.hugegraph.util.UnitUtil; +import org.apache.hugegraph.backend.store.BackendMetrics; +import org.apache.hugegraph.backend.store.BackendStoreProvider; +import org.apache.hugegraph.backend.store.BackendTable; +import org.apache.hugegraph.backend.store.cassandra.CassandraTables.Edge; +import org.apache.hugegraph.backend.store.cassandra.CassandraTables.Vertex; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.Log; +import org.apache.hugegraph.util.UnitUtil; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Host; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraOptions.java b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraOptions.java similarity index 90% rename from hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraOptions.java rename to hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraOptions.java index 9cde04457..dbeb32f95 100644 --- a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraOptions.java +++ b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraOptions.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.cassandra; +package org.apache.hugegraph.backend.store.cassandra; -import static com.baidu.hugegraph.config.OptionChecker.allowValues; -import static com.baidu.hugegraph.config.OptionChecker.disallowEmpty; -import static com.baidu.hugegraph.config.OptionChecker.positiveInt; -import static com.baidu.hugegraph.config.OptionChecker.rangeInt; +import static org.apache.hugegraph.config.OptionChecker.allowValues; +import static org.apache.hugegraph.config.OptionChecker.disallowEmpty; +import static org.apache.hugegraph.config.OptionChecker.positiveInt; +import static org.apache.hugegraph.config.OptionChecker.rangeInt; -import com.baidu.hugegraph.config.ConfigListOption; -import com.baidu.hugegraph.config.ConfigOption; -import com.baidu.hugegraph.config.OptionHolder; +import org.apache.hugegraph.config.ConfigListOption; +import org.apache.hugegraph.config.ConfigOption; +import org.apache.hugegraph.config.OptionHolder; public class CassandraOptions extends OptionHolder { diff --git a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraSerializer.java b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraSerializer.java similarity index 86% rename from hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraSerializer.java rename to hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraSerializer.java index 85d8496df..f2b6d22b5 100644 --- a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraSerializer.java +++ b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraSerializer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.cassandra; +package org.apache.hugegraph.backend.store.cassandra; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -26,27 +26,27 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.id.IdUtil; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; -import com.baidu.hugegraph.backend.serializer.TableBackendEntry; -import com.baidu.hugegraph.backend.serializer.TableSerializer; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.structure.HugeIndex; -import com.baidu.hugegraph.structure.HugeProperty; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.id.IdUtil; +import org.apache.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.backend.serializer.TableBackendEntry; +import org.apache.hugegraph.backend.serializer.TableSerializer; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.structure.HugeIndex; +import org.apache.hugegraph.structure.HugeProperty; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.DataType; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.JsonUtil; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraSessionPool.java b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraSessionPool.java similarity index 96% rename from hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraSessionPool.java rename to hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraSessionPool.java index 495eef83b..1df3aadc1 100644 --- a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraSessionPool.java +++ b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraSessionPool.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.cassandra; +package org.apache.hugegraph.backend.store.cassandra; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.store.BackendSession.AbstractBackendSession; -import com.baidu.hugegraph.backend.store.BackendSessionPool; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.store.BackendSession.AbstractBackendSession; +import org.apache.hugegraph.backend.store.BackendSessionPool; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.util.E; import com.datastax.driver.core.BatchStatement; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Cluster.Builder; diff --git a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraShard.java b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraShard.java similarity index 91% rename from hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraShard.java rename to hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraShard.java index b0e970b96..03bb64519 100644 --- a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraShard.java +++ b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraShard.java @@ -1,22 +1,23 @@ /* -* Licensed to the Apache Software Foundation (ASF) under one -* or more contributor license agreements. See the NOTICE file -* distributed with this work for additional information -* regarding copyright ownership. The ASF licenses this file -* to you under the Apache License, Version 2.0 (the -* "License"); you may not use this file except in compliance -* with the License. You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + * Copyright 2017 HugeGraph Authors + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + */ -package com.baidu.hugegraph.backend.store.cassandra; +package org.apache.hugegraph.backend.store.cassandra; import java.util.ArrayList; import java.util.Collections; @@ -43,9 +44,9 @@ import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.dht.Token.TokenFactory; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.store.Shard; -import com.baidu.hugegraph.util.Bytes; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.store.Shard; +import org.apache.hugegraph.util.Bytes; import com.datastax.driver.core.Host; import com.datastax.driver.core.Metadata; import com.datastax.driver.core.ResultSet; diff --git a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraStore.java b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraStore.java similarity index 96% rename from hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraStore.java rename to hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraStore.java index 147664312..43fe35a67 100644 --- a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraStore.java +++ b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraStore.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.cassandra; +package org.apache.hugegraph.backend.store.cassandra; import java.util.ArrayList; import java.util.Collection; @@ -30,23 +30,23 @@ import java.util.concurrent.ConcurrentHashMap; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.serializer.MergeIterator; -import com.baidu.hugegraph.backend.store.AbstractBackendStore; -import com.baidu.hugegraph.backend.store.BackendAction; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendFeatures; -import com.baidu.hugegraph.backend.store.BackendMutation; -import com.baidu.hugegraph.backend.store.BackendStoreProvider; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.exception.ConnectionException; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.serializer.MergeIterator; +import org.apache.hugegraph.backend.store.AbstractBackendStore; +import org.apache.hugegraph.backend.store.BackendAction; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendFeatures; +import org.apache.hugegraph.backend.store.BackendMutation; +import org.apache.hugegraph.backend.store.BackendStoreProvider; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.exception.ConnectionException; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.KeyspaceMetadata; import com.datastax.driver.core.Session; diff --git a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraStoreProvider.java b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraStoreProvider.java similarity index 84% rename from hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraStoreProvider.java rename to hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraStoreProvider.java index b5898e94f..3c602e092 100644 --- a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraStoreProvider.java +++ b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraStoreProvider.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.cassandra; +package org.apache.hugegraph.backend.store.cassandra; -import com.baidu.hugegraph.backend.store.AbstractBackendStoreProvider; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.store.cassandra.CassandraStore.CassandraGraphStore; -import com.baidu.hugegraph.backend.store.cassandra.CassandraStore.CassandraSchemaStore; -import com.baidu.hugegraph.backend.store.cassandra.CassandraStore.CassandraSystemStore; -import com.baidu.hugegraph.config.HugeConfig; +import org.apache.hugegraph.backend.store.AbstractBackendStoreProvider; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.backend.store.cassandra.CassandraStore.CassandraGraphStore; +import org.apache.hugegraph.backend.store.cassandra.CassandraStore.CassandraSchemaStore; +import org.apache.hugegraph.backend.store.cassandra.CassandraStore.CassandraSystemStore; +import org.apache.hugegraph.config.HugeConfig; public class CassandraStoreProvider extends AbstractBackendStoreProvider { diff --git a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraTable.java b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraTable.java similarity index 95% rename from hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraTable.java rename to hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraTable.java index 8f3d38284..9f639ac5e 100644 --- a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraTable.java +++ b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraTable.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.cassandra; +package org.apache.hugegraph.backend.store.cassandra; import java.util.ArrayList; import java.util.Collection; @@ -32,27 +32,27 @@ import java.util.function.Function; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.page.PageState; -import com.baidu.hugegraph.backend.query.Aggregate; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.Condition.Relation; -import com.baidu.hugegraph.backend.query.IdQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.query.Query.Order; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendTable; -import com.baidu.hugegraph.backend.store.Shard; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.iterator.ExtendableIterator; -import com.baidu.hugegraph.iterator.WrappedIterator; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.CopyUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.page.PageState; +import org.apache.hugegraph.backend.query.Aggregate; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.Condition.Relation; +import org.apache.hugegraph.backend.query.IdQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.query.Query.Order; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendTable; +import org.apache.hugegraph.backend.store.Shard; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.iterator.ExtendableIterator; +import org.apache.hugegraph.iterator.WrappedIterator; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.CopyUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.datastax.driver.core.ColumnDefinitions.Definition; import com.datastax.driver.core.DataType; import com.datastax.driver.core.PagingState; diff --git a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraTables.java b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraTables.java similarity index 98% rename from hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraTables.java rename to hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraTables.java index c94dd69ee..2c3a0ca99 100644 --- a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraTables.java +++ b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraTables.java @@ -17,25 +17,25 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.cassandra; +package org.apache.hugegraph.backend.store.cassandra; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import java.util.List; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.EdgeId; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.id.IdUtil; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntryIterator; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.EdgeId; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.id.IdUtil; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendEntryIterator; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.E; import com.datastax.driver.core.DataType; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; diff --git a/hugegraph-core/pom.xml b/hugegraph-core/pom.xml index 08bc783aa..52c710ac0 100644 --- a/hugegraph-core/pom.xml +++ b/hugegraph-core/pom.xml @@ -19,9 +19,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.hugegraph + org.apache.hugegraph hugegraph - 0.13.0 + ${revision} ../pom.xml hugegraph-core @@ -48,7 +48,7 @@ - com.baidu.hugegraph + org.apache.hugegraph hugegraph-common diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/Nameable.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/type/Nameable.java deleted file mode 100644 index eb8e474e4..000000000 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/Nameable.java +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2017 JanusGraph Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package com.baidu.hugegraph.type; - -/** - * Represents an entity that can be uniquely identified by a String name. - * - * @author Matthias Broecheler (me@matthiasb.com) - */ -public interface Nameable { - /** - * Returns the unique name of this entity. - * - * @return Name of this entity. - */ - String name(); - -} diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/HugeException.java b/hugegraph-core/src/main/java/org/apache/hugegraph/HugeException.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/HugeException.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/HugeException.java index 2d67691eb..5b9b34565 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/HugeException.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/HugeException.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph; +package org.apache.hugegraph; import java.io.InterruptedIOException; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/HugeFactory.java b/hugegraph-core/src/main/java/org/apache/hugegraph/HugeFactory.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/HugeFactory.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/HugeFactory.java index c74d8df86..fc726a4d1 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/HugeFactory.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/HugeFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph; +package org.apache.hugegraph; import java.io.File; import java.net.URL; @@ -30,16 +30,16 @@ import org.apache.commons.configuration2.Configuration; import org.apache.commons.configuration2.PropertiesConfiguration; import org.apache.commons.configuration2.builder.fluent.Configurations; import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.task.TaskManager; +import org.apache.hugegraph.type.define.SerialEnum; import org.slf4j.Logger; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.event.EventHub; -import com.baidu.hugegraph.task.TaskManager; -import com.baidu.hugegraph.traversal.algorithm.OltpTraverser; -import com.baidu.hugegraph.type.define.SerialEnum; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.event.EventHub; +import org.apache.hugegraph.traversal.algorithm.OltpTraverser; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; public class HugeFactory { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/HugeGraph.java b/hugegraph-core/src/main/java/org/apache/hugegraph/HugeGraph.java similarity index 84% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/HugeGraph.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/HugeGraph.java index 18d9f795e..91c450ff4 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/HugeGraph.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/HugeGraph.java @@ -17,13 +17,26 @@ * under the License. */ -package com.baidu.hugegraph; +package org.apache.hugegraph; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; +import org.apache.hugegraph.auth.AuthManager; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.BackendFeatures; +import org.apache.hugegraph.backend.store.BackendStoreInfo; +import org.apache.hugegraph.backend.store.raft.RaftGroupManager; +import org.apache.hugegraph.rpc.RpcServiceConfig4Client; +import org.apache.hugegraph.rpc.RpcServiceConfig4Server; +import org.apache.hugegraph.task.TaskScheduler; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.GraphMode; +import org.apache.hugegraph.type.define.GraphReadMode; +import org.apache.hugegraph.type.define.NodeRole; import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Graph; @@ -32,32 +45,19 @@ import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.VertexProperty; import com.alipay.remoting.rpc.RpcServer; -import com.baidu.hugegraph.auth.AuthManager; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.BackendFeatures; -import com.baidu.hugegraph.backend.store.BackendStoreInfo; -import com.baidu.hugegraph.backend.store.raft.RaftGroupManager; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.config.TypedOption; -import com.baidu.hugegraph.rpc.RpcServiceConfig4Client; -import com.baidu.hugegraph.rpc.RpcServiceConfig4Server; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.schema.SchemaLabel; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeFeatures; -import com.baidu.hugegraph.task.TaskScheduler; -import com.baidu.hugegraph.traversal.optimize.HugeCountStepStrategy; -import com.baidu.hugegraph.traversal.optimize.HugeGraphStepStrategy; -import com.baidu.hugegraph.traversal.optimize.HugeVertexStepStrategy; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.GraphMode; -import com.baidu.hugegraph.type.define.GraphReadMode; -import com.baidu.hugegraph.type.define.NodeRole; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.TypedOption; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.schema.SchemaLabel; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.structure.HugeFeatures; +import org.apache.hugegraph.traversal.optimize.HugeCountStepStrategy; +import org.apache.hugegraph.traversal.optimize.HugeGraphStepStrategy; +import org.apache.hugegraph.traversal.optimize.HugeVertexStepStrategy; /** * Graph interface for Gremlin operations diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/HugeGraphParams.java b/hugegraph-core/src/main/java/org/apache/hugegraph/HugeGraphParams.java similarity index 71% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/HugeGraphParams.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/HugeGraphParams.java index 3fbdc00bd..0e696fb9a 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/HugeGraphParams.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/HugeGraphParams.java @@ -17,21 +17,21 @@ * under the License. */ -package com.baidu.hugegraph; +package org.apache.hugegraph; -import com.baidu.hugegraph.analyzer.Analyzer; -import com.baidu.hugegraph.backend.LocalCounter; -import com.baidu.hugegraph.backend.serializer.AbstractSerializer; -import com.baidu.hugegraph.backend.store.BackendFeatures; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.store.ram.RamTable; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.backend.tx.SchemaTransaction; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.event.EventHub; -import com.baidu.hugegraph.task.ServerInfoManager; -import com.baidu.hugegraph.type.define.GraphMode; -import com.baidu.hugegraph.type.define.GraphReadMode; +import org.apache.hugegraph.backend.LocalCounter; +import org.apache.hugegraph.backend.store.BackendFeatures; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.backend.store.ram.RamTable; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.backend.tx.SchemaTransaction; +import org.apache.hugegraph.task.ServerInfoManager; +import org.apache.hugegraph.type.define.GraphMode; +import org.apache.hugegraph.type.define.GraphReadMode; +import org.apache.hugegraph.analyzer.Analyzer; +import org.apache.hugegraph.backend.serializer.AbstractSerializer; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.event.EventHub; import com.google.common.util.concurrent.RateLimiter; /** diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/StandardHugeGraph.java b/hugegraph-core/src/main/java/org/apache/hugegraph/StandardHugeGraph.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/StandardHugeGraph.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/StandardHugeGraph.java index 53baaa780..22504c267 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/StandardHugeGraph.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/StandardHugeGraph.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph; +package org.apache.hugegraph; import java.util.Collection; import java.util.Iterator; @@ -27,6 +27,37 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.hugegraph.auth.AuthManager; +import org.apache.hugegraph.auth.StandardAuthManager; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.LocalCounter; +import org.apache.hugegraph.backend.cache.Cache; +import org.apache.hugegraph.backend.cache.CacheNotifier; +import org.apache.hugegraph.backend.cache.CacheNotifier.GraphCacheNotifier; +import org.apache.hugegraph.backend.cache.CacheNotifier.SchemaCacheNotifier; +import org.apache.hugegraph.backend.cache.CachedGraphTransaction; +import org.apache.hugegraph.backend.cache.CachedSchemaTransaction; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.id.SnowflakeIdGenerator; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.raft.RaftBackendStoreProvider; +import org.apache.hugegraph.backend.store.raft.RaftGroupManager; +import org.apache.hugegraph.backend.store.ram.RamTable; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.backend.tx.SchemaTransaction; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.io.HugeGraphIoRegistry; +import org.apache.hugegraph.rpc.RpcServiceConfig4Client; +import org.apache.hugegraph.rpc.RpcServiceConfig4Server; +import org.apache.hugegraph.task.ServerInfoManager; +import org.apache.hugegraph.task.TaskManager; +import org.apache.hugegraph.task.TaskScheduler; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.GraphMode; +import org.apache.hugegraph.type.define.GraphReadMode; +import org.apache.hugegraph.type.define.NodeRole; +import org.apache.hugegraph.util.*; import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Graph; @@ -37,73 +68,40 @@ import org.apache.tinkerpop.gremlin.structure.VertexProperty; import org.apache.tinkerpop.gremlin.structure.io.Io; import org.apache.tinkerpop.gremlin.structure.util.AbstractThreadLocalTransaction; import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.hugegraph.util.ConfigUtil; +import org.apache.hugegraph.util.Events; +import org.apache.hugegraph.util.LockUtil; import org.slf4j.Logger; import com.alipay.remoting.rpc.RpcServer; -import com.baidu.hugegraph.analyzer.Analyzer; -import com.baidu.hugegraph.analyzer.AnalyzerFactory; -import com.baidu.hugegraph.auth.AuthManager; -import com.baidu.hugegraph.auth.StandardAuthManager; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.LocalCounter; -import com.baidu.hugegraph.backend.cache.Cache; -import com.baidu.hugegraph.backend.cache.CacheNotifier; -import com.baidu.hugegraph.backend.cache.CacheNotifier.GraphCacheNotifier; -import com.baidu.hugegraph.backend.cache.CacheNotifier.SchemaCacheNotifier; -import com.baidu.hugegraph.backend.cache.CachedGraphTransaction; -import com.baidu.hugegraph.backend.cache.CachedSchemaTransaction; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.id.SnowflakeIdGenerator; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.serializer.AbstractSerializer; -import com.baidu.hugegraph.backend.serializer.SerializerFactory; -import com.baidu.hugegraph.backend.store.BackendFeatures; -import com.baidu.hugegraph.backend.store.BackendProviderFactory; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.store.BackendStoreInfo; -import com.baidu.hugegraph.backend.store.BackendStoreProvider; -import com.baidu.hugegraph.backend.store.raft.RaftBackendStoreProvider; -import com.baidu.hugegraph.backend.store.raft.RaftGroupManager; -import com.baidu.hugegraph.backend.store.ram.RamTable; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.backend.tx.SchemaTransaction; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.config.TypedOption; -import com.baidu.hugegraph.event.EventHub; -import com.baidu.hugegraph.event.EventListener; -import com.baidu.hugegraph.exception.NotAllowException; -import com.baidu.hugegraph.io.HugeGraphIoRegistry; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.rpc.RpcServiceConfig4Client; -import com.baidu.hugegraph.rpc.RpcServiceConfig4Server; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.schema.SchemaLabel; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeEdgeProperty; -import com.baidu.hugegraph.structure.HugeFeatures; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.structure.HugeVertexProperty; -import com.baidu.hugegraph.task.ServerInfoManager; -import com.baidu.hugegraph.task.TaskManager; -import com.baidu.hugegraph.task.TaskScheduler; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.GraphMode; -import com.baidu.hugegraph.type.define.GraphReadMode; -import com.baidu.hugegraph.type.define.NodeRole; -import com.baidu.hugegraph.util.ConfigUtil; -import com.baidu.hugegraph.util.DateUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Events; -import com.baidu.hugegraph.util.LockUtil; -import com.baidu.hugegraph.util.Log; -import com.baidu.hugegraph.variables.HugeVariables; +import org.apache.hugegraph.analyzer.Analyzer; +import org.apache.hugegraph.analyzer.AnalyzerFactory; +import org.apache.hugegraph.backend.serializer.AbstractSerializer; +import org.apache.hugegraph.backend.serializer.SerializerFactory; +import org.apache.hugegraph.backend.store.BackendFeatures; +import org.apache.hugegraph.backend.store.BackendProviderFactory; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.backend.store.BackendStoreInfo; +import org.apache.hugegraph.backend.store.BackendStoreProvider; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.TypedOption; +import org.apache.hugegraph.event.EventHub; +import org.apache.hugegraph.event.EventListener; +import org.apache.hugegraph.exception.NotAllowException; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.schema.SchemaLabel; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeEdgeProperty; +import org.apache.hugegraph.structure.HugeFeatures; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.structure.HugeVertexProperty; +import org.apache.hugegraph.variables.HugeVariables; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.RateLimiter; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/Analyzer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/Analyzer.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/Analyzer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/Analyzer.java index 8cc137221..695c65d0c 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/Analyzer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/Analyzer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.analyzer; +package org.apache.hugegraph.analyzer; import java.util.Set; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/AnalyzerFactory.java b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/AnalyzerFactory.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/AnalyzerFactory.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/AnalyzerFactory.java index 3d6ead94c..e0f254e8f 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/AnalyzerFactory.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/AnalyzerFactory.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.analyzer; +package org.apache.hugegraph.analyzer; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.backend.serializer.SerializerFactory; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.backend.serializer.SerializerFactory; public class AnalyzerFactory { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/AnsjAnalyzer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/AnsjAnalyzer.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/AnsjAnalyzer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/AnsjAnalyzer.java index 179cc97e1..5f77a0b0a 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/AnsjAnalyzer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/AnsjAnalyzer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.analyzer; +package org.apache.hugegraph.analyzer; import java.util.List; import java.util.Set; @@ -29,8 +29,8 @@ import org.ansj.splitWord.analysis.IndexAnalysis; import org.ansj.splitWord.analysis.NlpAnalysis; import org.ansj.splitWord.analysis.ToAnalysis; -import com.baidu.hugegraph.config.ConfigException; -import com.baidu.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.config.ConfigException; +import org.apache.hugegraph.util.InsertionOrderUtil; import com.google.common.collect.ImmutableList; /** diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/HanLPAnalyzer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/HanLPAnalyzer.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/HanLPAnalyzer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/HanLPAnalyzer.java index 2e282065d..680e397fd 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/HanLPAnalyzer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/HanLPAnalyzer.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.analyzer; +package org.apache.hugegraph.analyzer; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.config.ConfigException; -import com.baidu.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.config.ConfigException; +import org.apache.hugegraph.util.InsertionOrderUtil; import com.google.common.collect.ImmutableList; import com.hankcs.hanlp.seg.Dijkstra.DijkstraSegment; import com.hankcs.hanlp.seg.NShort.NShortSegment; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/IKAnalyzer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/IKAnalyzer.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/IKAnalyzer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/IKAnalyzer.java index 6cf2c0ff0..df537da78 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/IKAnalyzer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/IKAnalyzer.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.analyzer; +package org.apache.hugegraph.analyzer; import java.io.StringReader; import java.util.List; import java.util.Set; +import org.apache.hugegraph.HugeException; import org.wltea.analyzer.core.IKSegmenter; import org.wltea.analyzer.core.Lexeme; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.config.ConfigException; -import com.baidu.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.config.ConfigException; +import org.apache.hugegraph.util.InsertionOrderUtil; import com.google.common.collect.ImmutableList; /** diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/JcsegAnalyzer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/JcsegAnalyzer.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/JcsegAnalyzer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/JcsegAnalyzer.java index b4ccb7b70..a51d5b4de 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/JcsegAnalyzer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/JcsegAnalyzer.java @@ -17,21 +17,21 @@ * under the License. */ -package com.baidu.hugegraph.analyzer; +package org.apache.hugegraph.analyzer; import java.io.StringReader; import java.util.List; import java.util.Set; +import org.apache.hugegraph.HugeException; import org.lionsoul.jcseg.ISegment; import org.lionsoul.jcseg.IWord; import org.lionsoul.jcseg.dic.ADictionary; import org.lionsoul.jcseg.dic.DictionaryFactory; import org.lionsoul.jcseg.segmenter.SegmenterConfig; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.config.ConfigException; -import com.baidu.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.config.ConfigException; +import org.apache.hugegraph.util.InsertionOrderUtil; import com.google.common.collect.ImmutableList; /** diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/JiebaAnalyzer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/JiebaAnalyzer.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/JiebaAnalyzer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/JiebaAnalyzer.java index 0e0a72b4c..b8e7680db 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/JiebaAnalyzer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/JiebaAnalyzer.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.analyzer; +package org.apache.hugegraph.analyzer; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.config.ConfigException; -import com.baidu.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.config.ConfigException; +import org.apache.hugegraph.util.InsertionOrderUtil; import com.google.common.collect.ImmutableList; import com.huaban.analysis.jieba.JiebaSegmenter; import com.huaban.analysis.jieba.SegToken; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/MMSeg4JAnalyzer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/MMSeg4JAnalyzer.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/MMSeg4JAnalyzer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/MMSeg4JAnalyzer.java index 1bc63f1ad..6fb768a70 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/MMSeg4JAnalyzer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/MMSeg4JAnalyzer.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.analyzer; +package org.apache.hugegraph.analyzer; import java.io.StringReader; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.config.ConfigException; -import com.baidu.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.config.ConfigException; +import org.apache.hugegraph.util.InsertionOrderUtil; import com.chenlb.mmseg4j.ComplexSeg; import com.chenlb.mmseg4j.Dictionary; import com.chenlb.mmseg4j.MMSeg; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/SmartCNAnalyzer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/SmartCNAnalyzer.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/SmartCNAnalyzer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/SmartCNAnalyzer.java index ad5a07962..0c8814512 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/analyzer/SmartCNAnalyzer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/SmartCNAnalyzer.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.analyzer; +package org.apache.hugegraph.analyzer; import java.io.Reader; import java.io.StringReader; import java.util.Set; +import org.apache.hugegraph.HugeException; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.cn.smart.SmartChineseAnalyzer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.InsertionOrderUtil; /** * Reference from https://my.oschina.net/apdplat/blog/412921 diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/AuthConstant.java b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/AuthConstant.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/auth/AuthConstant.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/auth/AuthConstant.java index 59379481c..bf6116254 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/AuthConstant.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/AuthConstant.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; public interface AuthConstant { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/AuthManager.java b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/AuthManager.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/auth/AuthManager.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/auth/AuthManager.java index 393913874..509294993 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/AuthManager.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/AuthManager.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; import java.util.List; import java.util.Set; import javax.security.sasl.AuthenticationException; -import com.baidu.hugegraph.auth.SchemaDefine.AuthElement; -import com.baidu.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.auth.SchemaDefine.AuthElement; public interface AuthManager { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/EntityManager.java b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/EntityManager.java similarity index 87% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/auth/EntityManager.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/auth/EntityManager.java index 0ff8c0ca2..670ce0717 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/EntityManager.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/EntityManager.java @@ -17,33 +17,33 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.function.Function; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.HugeKeys; import org.apache.tinkerpop.gremlin.structure.Graph.Hidden; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.auth.SchemaDefine.Entity; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.iterator.MapperIterator; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.auth.SchemaDefine.Entity; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.iterator.MapperIterator; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableMap; public class EntityManager { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeAccess.java b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeAccess.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeAccess.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeAccess.java index e5e321498..71bba568c 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeAccess.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeAccess.java @@ -17,23 +17,23 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.type.define.DataType; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Graph.Hidden; import org.apache.tinkerpop.gremlin.structure.T; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.auth.SchemaDefine.Relationship; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.auth.SchemaDefine.Relationship; +import org.apache.hugegraph.util.E; public class HugeAccess extends Relationship { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeBelong.java b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeBelong.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeBelong.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeBelong.java index f2d94d638..968fed163 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeBelong.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeBelong.java @@ -17,21 +17,21 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.schema.EdgeLabel; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Graph.Hidden; import org.apache.tinkerpop.gremlin.structure.T; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.auth.SchemaDefine.Relationship; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.auth.SchemaDefine.Relationship; public class HugeBelong extends Relationship { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeGroup.java b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeGroup.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeGroup.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeGroup.java index 9b15afee8..0a366ee93 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeGroup.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeGroup.java @@ -17,22 +17,22 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.schema.VertexLabel; import org.apache.tinkerpop.gremlin.structure.Graph.Hidden; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.auth.SchemaDefine.Entity; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.auth.SchemaDefine.Entity; +import org.apache.hugegraph.util.E; public class HugeGroup extends Entity { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugePermission.java b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugePermission.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugePermission.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugePermission.java index 761429305..68bc45035 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugePermission.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugePermission.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; -import com.baidu.hugegraph.type.define.SerialEnum; +import org.apache.hugegraph.type.define.SerialEnum; public enum HugePermission implements SerialEnum { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeProject.java b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeProject.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeProject.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeProject.java index b10af0f7e..b4e8a4e5d 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeProject.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeProject.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; import java.util.ArrayList; import java.util.Collections; @@ -27,18 +27,18 @@ import java.util.Map; import java.util.Set; import org.apache.commons.lang.StringUtils; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.DataType; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.auth.SchemaDefine.Entity; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.auth.SchemaDefine.Entity; +import org.apache.hugegraph.util.E; public class HugeProject extends Entity { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeResource.java b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeResource.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeResource.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeResource.java index bdfb07025..f534dfb15 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeResource.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeResource.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; import java.io.IOException; import java.util.List; @@ -25,6 +25,9 @@ import java.util.Map; import java.util.Objects; import java.util.Set; +import org.apache.hugegraph.type.Nameable; +import org.apache.hugegraph.type.Typeable; +import org.apache.hugegraph.util.JsonUtil; import org.apache.tinkerpop.gremlin.structure.Graph.Hidden; import org.apache.tinkerpop.gremlin.structure.Property; import org.apache.tinkerpop.shaded.jackson.annotation.JsonProperty; @@ -38,13 +41,10 @@ import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer; import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule; import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer; -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.Nameable; -import com.baidu.hugegraph.type.Typeable; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.auth.SchemaDefine.AuthElement; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.traversal.optimize.TraversalUtil; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeTarget.java b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeTarget.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeTarget.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeTarget.java index ed01fcb82..53f95d4d5 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeTarget.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeTarget.java @@ -17,24 +17,24 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.util.JsonUtil; import org.apache.tinkerpop.gremlin.structure.Graph.Hidden; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.auth.SchemaDefine.Entity; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.auth.SchemaDefine.Entity; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeUser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeUser.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeUser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeUser.java index a5777bd70..0fd08c1b4 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/HugeUser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/HugeUser.java @@ -17,22 +17,22 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.schema.VertexLabel; import org.apache.tinkerpop.gremlin.structure.Graph.Hidden; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.auth.SchemaDefine.Entity; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.auth.SchemaDefine.Entity; +import org.apache.hugegraph.util.E; public class HugeUser extends Entity { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/RelationshipManager.java b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/RelationshipManager.java similarity index 88% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/auth/RelationshipManager.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/auth/RelationshipManager.java index 667927d02..4ee087059 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/RelationshipManager.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/RelationshipManager.java @@ -17,36 +17,36 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.function.Function; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.HugeKeys; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Graph.Hidden; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.auth.SchemaDefine.Relationship; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.iterator.MapperIterator; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.auth.SchemaDefine.Relationship; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.iterator.MapperIterator; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableMap; public class RelationshipManager { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/ResourceObject.java b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/ResourceObject.java similarity index 91% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/auth/ResourceObject.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/auth/ResourceObject.java index 4737bfa87..aab868b3b 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/ResourceObject.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/ResourceObject.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.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.Nameable; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.auth.SchemaDefine.AuthElement; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.type.Nameable; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.util.E; public class ResourceObject { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/ResourceType.java b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/ResourceType.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/auth/ResourceType.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/auth/ResourceType.java index 104691c6d..d8caa69fd 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/ResourceType.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/ResourceType.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; -import com.baidu.hugegraph.type.HugeType; +import org.apache.hugegraph.type.HugeType; public enum ResourceType { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/RolePermission.java b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/RolePermission.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/auth/RolePermission.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/auth/RolePermission.java index 1c35b7e8f..b9397757f 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/RolePermission.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/RolePermission.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; import java.io.IOException; import java.util.ArrayList; @@ -27,6 +27,7 @@ import java.util.Map; import java.util.Objects; import java.util.TreeMap; +import org.apache.hugegraph.util.JsonUtil; import org.apache.tinkerpop.shaded.jackson.annotation.JsonProperty; import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator; import org.apache.tinkerpop.shaded.jackson.core.JsonParser; @@ -38,8 +39,7 @@ import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer; import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule; import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.E; public class RolePermission { @@ -91,11 +91,11 @@ public class RolePermission { mergedResources.addAll(resources); } - protected Map>> map() { + public Map>> map() { return Collections.unmodifiableMap(this.roles); } - protected boolean contains(RolePermission other) { + public boolean contains(RolePermission other) { for (Map.Entry>> e1 : other.roles.entrySet()) { String g = e1.getKey(); diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/SchemaDefine.java b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/SchemaDefine.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/auth/SchemaDefine.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/auth/SchemaDefine.java index 12ed87ce0..d733ffda9 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/SchemaDefine.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/SchemaDefine.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; import java.io.Serializable; import java.util.Date; @@ -25,23 +25,24 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.hugegraph.auth.HugeTarget.P; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.Nameable; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.DataType; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Graph.Hidden; import org.apache.tinkerpop.gremlin.structure.Property; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.VertexProperty; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.auth.HugeTarget.P; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.util.E; public abstract class SchemaDefine { @@ -242,7 +243,7 @@ public abstract class SchemaDefine { // NOTE: travis-ci fails if class Entity implements Nameable public abstract static class Entity extends AuthElement - implements com.baidu.hugegraph.type.Nameable { + implements org.apache.hugegraph.type.Nameable { private static final long serialVersionUID = 4113319546914811762L; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/StandardAuthManager.java b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/StandardAuthManager.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/auth/StandardAuthManager.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/auth/StandardAuthManager.java index cb71e6bc7..8b42ced71 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/StandardAuthManager.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/StandardAuthManager.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; import java.time.Duration; import java.util.ArrayList; @@ -33,23 +33,23 @@ import jakarta.ws.rs.ForbiddenException; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.hugegraph.backend.cache.Cache; +import org.apache.hugegraph.backend.cache.CacheManager; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.config.AuthOptions; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.LockUtil; +import org.apache.hugegraph.util.StringEncoding; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.auth.HugeUser.P; -import com.baidu.hugegraph.auth.SchemaDefine.AuthElement; -import com.baidu.hugegraph.backend.cache.Cache; -import com.baidu.hugegraph.backend.cache.CacheManager; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.config.AuthOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.LockUtil; -import com.baidu.hugegraph.util.Log; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.auth.HugeUser.P; +import org.apache.hugegraph.auth.SchemaDefine.AuthElement; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/TokenGenerator.java b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/TokenGenerator.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/auth/TokenGenerator.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/auth/TokenGenerator.java index ef73d890d..96c255f4f 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/TokenGenerator.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/TokenGenerator.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; import java.nio.charset.StandardCharsets; import java.util.Date; @@ -26,8 +26,8 @@ import java.util.Map; import javax.crypto.SecretKey; import jakarta.ws.rs.NotAuthorizedException; -import com.baidu.hugegraph.config.AuthOptions; -import com.baidu.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.AuthOptions; +import org.apache.hugegraph.config.HugeConfig; import io.jsonwebtoken.Claims; import io.jsonwebtoken.ExpiredJwtException; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/UserWithRole.java b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/UserWithRole.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/auth/UserWithRole.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/auth/UserWithRole.java index ee1a84c18..3c5bd391a 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/UserWithRole.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/auth/UserWithRole.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.auth; +package org.apache.hugegraph.auth; -import com.baidu.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.Id; public class UserWithRole { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/BackendException.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/BackendException.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/BackendException.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/BackendException.java index ce60d12cd..e403f31de 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/BackendException.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/BackendException.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.backend; +package org.apache.hugegraph.backend; -import com.baidu.hugegraph.HugeException; +import org.apache.hugegraph.HugeException; public class BackendException extends HugeException { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/LocalCounter.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/LocalCounter.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/LocalCounter.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/LocalCounter.java index 4fb065c85..bc3458aa0 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/LocalCounter.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/LocalCounter.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.backend; +package org.apache.hugegraph.backend; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.type.HugeType; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.type.HugeType; public class LocalCounter { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/Transaction.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/Transaction.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/Transaction.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/Transaction.java index bbf20a2b3..cc4c12dba 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/Transaction.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/Transaction.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend; +package org.apache.hugegraph.backend; public interface Transaction { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/AbstractCache.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/AbstractCache.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/AbstractCache.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/AbstractCache.java index b9a79864b..7bb05765d 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/AbstractCache.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/AbstractCache.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.cache; +package org.apache.hugegraph.backend.cache; import java.util.Iterator; import java.util.concurrent.atomic.AtomicReference; @@ -26,8 +26,8 @@ import java.util.function.Function; import org.slf4j.Logger; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.util.Log; public abstract class AbstractCache implements Cache { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/Cache.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/Cache.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/Cache.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/Cache.java index f7f98efcd..619df1ba3 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/Cache.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/Cache.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.cache; +package org.apache.hugegraph.backend.cache; import java.util.function.Consumer; import java.util.function.Function; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/CacheManager.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/CacheManager.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/CacheManager.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/CacheManager.java index 1963a268f..1caff0625 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/CacheManager.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/CacheManager.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.cache; +package org.apache.hugegraph.backend.cache; import java.util.Collections; import java.util.Map; @@ -28,10 +28,10 @@ import java.util.concurrent.ConcurrentHashMap; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; public class CacheManager { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/CacheNotifier.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/CacheNotifier.java similarity index 89% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/CacheNotifier.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/CacheNotifier.java index 784d8e691..48c0f273d 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/CacheNotifier.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/CacheNotifier.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.backend.cache; +package org.apache.hugegraph.backend.cache; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.type.HugeType; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.type.HugeType; public interface CacheNotifier extends AutoCloseable { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/CachedBackendStore.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/CachedBackendStore.java similarity index 89% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/CachedBackendStore.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/CachedBackendStore.java index 9060f9396..71228b437 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/CachedBackendStore.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/CachedBackendStore.java @@ -17,21 +17,21 @@ * under the License. */ -package com.baidu.hugegraph.backend.cache; +package org.apache.hugegraph.backend.cache; import java.util.Iterator; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendFeatures; -import com.baidu.hugegraph.backend.store.BackendMutation; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.store.BackendStoreProvider; -import com.baidu.hugegraph.backend.store.SystemSchemaStore; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendFeatures; +import org.apache.hugegraph.backend.store.BackendMutation; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.backend.store.BackendStoreProvider; +import org.apache.hugegraph.backend.store.SystemSchemaStore; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.StringEncoding; /** * This class is unused now, just for debug or test diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/CachedGraphTransaction.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/CachedGraphTransaction.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/CachedGraphTransaction.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/CachedGraphTransaction.java index 7a2a852cc..f817f1534 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/CachedGraphTransaction.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/CachedGraphTransaction.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.cache; +package org.apache.hugegraph.backend.cache; import java.lang.reflect.Array; import java.util.ArrayList; @@ -27,30 +27,30 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.cache.CachedBackendStore.QueryId; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.IdQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.backend.store.BackendMutation; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.store.ram.RamTable; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.event.EventHub; -import com.baidu.hugegraph.event.EventListener; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.iterator.ExtendableIterator; -import com.baidu.hugegraph.iterator.ListIterator; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Events; +import org.apache.hugegraph.backend.cache.CachedBackendStore.QueryId; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.BackendMutation; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.backend.store.ram.RamTable; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.IdQuery; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.event.EventHub; +import org.apache.hugegraph.event.EventListener; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.iterator.ExtendableIterator; +import org.apache.hugegraph.iterator.ListIterator; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Events; import com.google.common.collect.ImmutableSet; public final class CachedGraphTransaction extends GraphTransaction { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/CachedSchemaTransaction.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/CachedSchemaTransaction.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/CachedSchemaTransaction.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/CachedSchemaTransaction.java index 07eac8a8b..e5b305c1e 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/CachedSchemaTransaction.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/CachedSchemaTransaction.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.cache; +package org.apache.hugegraph.backend.cache; import java.util.ArrayList; import java.util.List; @@ -25,20 +25,20 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.store.ram.IntObjectMap; -import com.baidu.hugegraph.backend.tx.SchemaTransaction; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.event.EventHub; -import com.baidu.hugegraph.event.EventListener; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Events; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.backend.store.ram.IntObjectMap; +import org.apache.hugegraph.backend.tx.SchemaTransaction; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.event.EventHub; +import org.apache.hugegraph.event.EventListener; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Events; import com.google.common.collect.ImmutableSet; public final class CachedSchemaTransaction extends SchemaTransaction { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/LevelCache.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/LevelCache.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/LevelCache.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/LevelCache.java index 287f0b85a..9c2e25208 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/LevelCache.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/LevelCache.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.backend.cache; +package org.apache.hugegraph.backend.cache; import java.util.Iterator; import java.util.function.Consumer; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.iterator.ExtendableIterator; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.iterator.ExtendableIterator; +import org.apache.hugegraph.util.E; public final class LevelCache extends AbstractCache { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/OffheapCache.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/OffheapCache.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/OffheapCache.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/OffheapCache.java index 835448795..e04e0c7b8 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/OffheapCache.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/OffheapCache.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.cache; +package org.apache.hugegraph.backend.cache; import java.nio.ByteBuffer; import java.util.Collection; @@ -26,28 +26,28 @@ import java.util.Iterator; import java.util.List; import java.util.function.Consumer; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumn; import org.caffinitas.ohc.CacheSerializer; import org.caffinitas.ohc.CloseableIterator; import org.caffinitas.ohc.Eviction; import org.caffinitas.ohc.OHCache; import org.caffinitas.ohc.OHCacheBuilder; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.serializer.AbstractSerializer; -import com.baidu.hugegraph.backend.serializer.BinaryBackendEntry; -import com.baidu.hugegraph.backend.serializer.BinarySerializer; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumn; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.serializer.AbstractSerializer; +import org.apache.hugegraph.backend.serializer.BinaryBackendEntry; +import org.apache.hugegraph.backend.serializer.BinarySerializer; +import org.apache.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.DataType; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; public class OffheapCache extends AbstractCache { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/RamCache.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/RamCache.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/RamCache.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/RamCache.java index 459de43e8..98e5c4a6d 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/cache/RamCache.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/cache/RamCache.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.cache; +package org.apache.hugegraph.backend.cache; import java.util.Iterator; import java.util.LinkedList; @@ -27,10 +27,10 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.locks.Lock; import java.util.function.Consumer; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.concurrent.KeyLock; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.concurrent.KeyLock; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.util.E; public class RamCache extends AbstractCache { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/id/EdgeId.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/EdgeId.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/id/EdgeId.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/EdgeId.java index f7a98d69e..173d7132c 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/id/EdgeId.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/EdgeId.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.backend.id; +package org.apache.hugegraph.backend.id; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.StringEncoding; /** * Class used to format and parse id of edge, the edge id consists of: diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/id/Id.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/Id.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/id/Id.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/Id.java index 06cf053cf..2c6082b9b 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/id/Id.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/Id.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.backend.id; +package org.apache.hugegraph.backend.id; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.util.E; public interface Id extends Comparable { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/id/IdGenerator.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/IdGenerator.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/id/IdGenerator.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/IdGenerator.java index 4c93e8a21..183006faa 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/id/IdGenerator.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/IdGenerator.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.backend.id; +package org.apache.hugegraph.backend.id; import java.util.Objects; import java.util.UUID; -import com.baidu.hugegraph.backend.id.Id.IdType; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.LongEncoding; -import com.baidu.hugegraph.util.NumericUtil; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.backend.id.Id.IdType; +import org.apache.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.LongEncoding; +import org.apache.hugegraph.util.NumericUtil; +import org.apache.hugegraph.util.StringEncoding; public abstract class IdGenerator { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/id/IdUtil.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/IdUtil.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/id/IdUtil.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/IdUtil.java index befc7485b..9d936923c 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/id/IdUtil.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/IdUtil.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.backend.id; +package org.apache.hugegraph.backend.id; import java.nio.ByteBuffer; import org.apache.commons.lang3.StringUtils; -import com.baidu.hugegraph.backend.id.Id.IdType; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.backend.id.Id.IdType; +import org.apache.hugegraph.backend.serializer.BytesBuffer; public final class IdUtil { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/id/SnowflakeIdGenerator.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/SnowflakeIdGenerator.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/id/SnowflakeIdGenerator.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/SnowflakeIdGenerator.java index 615e0e4ee..752f4e899 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/id/SnowflakeIdGenerator.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/SnowflakeIdGenerator.java @@ -17,22 +17,22 @@ * under the License. */ -package com.baidu.hugegraph.backend.id; +package org.apache.hugegraph.backend.id; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; -import com.baidu.hugegraph.util.TimeUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; +import org.apache.hugegraph.util.TimeUtil; public class SnowflakeIdGenerator extends IdGenerator { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/id/SplicingIdGenerator.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/SplicingIdGenerator.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/id/SplicingIdGenerator.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/SplicingIdGenerator.java index e013bbb5c..af3275e56 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/id/SplicingIdGenerator.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/SplicingIdGenerator.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.backend.id; +package org.apache.hugegraph.backend.id; import java.util.Arrays; import java.util.List; -import com.baidu.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.structure.HugeVertex; public class SplicingIdGenerator extends IdGenerator { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/IdHolder.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/IdHolder.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/IdHolder.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/IdHolder.java index c8660a4f7..598e32afd 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/IdHolder.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/IdHolder.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.page; +package org.apache.hugegraph.backend.page; import java.util.Iterator; import java.util.NoSuchElementException; @@ -25,15 +25,15 @@ import java.util.Set; import java.util.function.Function; import org.apache.commons.lang.NotImplementedException; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.BackendEntry; import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.iterator.CIter; -import com.baidu.hugegraph.iterator.Metadatable; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.iterator.CIter; +import org.apache.hugegraph.iterator.Metadatable; +import org.apache.hugegraph.util.E; public abstract class IdHolder { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/IdHolderList.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/IdHolderList.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/IdHolderList.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/IdHolderList.java index 773483f8b..21d9a444b 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/IdHolderList.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/IdHolderList.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.backend.page; +package org.apache.hugegraph.backend.page; import java.util.ArrayList; import java.util.Collection; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.util.E; public class IdHolderList extends ArrayList { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/PageEntryIterator.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/PageEntryIterator.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/PageEntryIterator.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/PageEntryIterator.java index 48af1097c..51febe887 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/PageEntryIterator.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/PageEntryIterator.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.backend.page; +package org.apache.hugegraph.backend.page; import java.util.NoSuchElementException; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.query.QueryResults; import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.iterator.CIter; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.iterator.CIter; +import org.apache.hugegraph.util.E; public class PageEntryIterator implements CIter { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/PageIds.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/PageIds.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/PageIds.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/PageIds.java index 8ca4b1c0f..037a1a0a5 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/PageIds.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/PageIds.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.backend.page; +package org.apache.hugegraph.backend.page; import java.util.Set; -import com.baidu.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.Id; import com.google.common.collect.ImmutableSet; public final class PageIds { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/PageInfo.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/PageInfo.java similarity index 91% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/PageInfo.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/PageInfo.java index ef42ce02c..326c8220c 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/PageInfo.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/PageInfo.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.backend.page; +package org.apache.hugegraph.backend.page; import java.util.Iterator; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; -import com.baidu.hugegraph.iterator.Metadatable; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.iterator.Metadatable; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.StringEncoding; public final class PageInfo { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/PageState.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/PageState.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/PageState.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/PageState.java index a6e2aa44a..0d2ec4d78 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/PageState.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/PageState.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.backend.page; +package org.apache.hugegraph.backend.page; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.StringEncoding; public class PageState { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/QueryList.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/QueryList.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/QueryList.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/QueryList.java index 1f5dd533d..fe986f6ea 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/QueryList.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/QueryList.java @@ -17,23 +17,23 @@ * under the License. */ -package com.baidu.hugegraph.backend.page; +package org.apache.hugegraph.backend.page; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.page.IdHolder.BatchIdHolder; -import com.baidu.hugegraph.backend.page.IdHolder.FixedIdHolder; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.ConditionQuery.OptimizedType; -import com.baidu.hugegraph.backend.query.IdQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.ConditionQuery.OptimizedType; +import org.apache.hugegraph.backend.query.IdQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.page.IdHolder.BatchIdHolder; +import org.apache.hugegraph.backend.page.IdHolder.FixedIdHolder; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.E; public final class QueryList { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/SortByCountIdHolderList.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/SortByCountIdHolderList.java similarity index 90% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/SortByCountIdHolderList.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/SortByCountIdHolderList.java index 994e6657c..eeeb0ab61 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/page/SortByCountIdHolderList.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/page/SortByCountIdHolderList.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.backend.page; +package org.apache.hugegraph.backend.page; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.page.IdHolder.FixedIdHolder; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.page.IdHolder.FixedIdHolder; +import org.apache.hugegraph.util.CollectionUtil; +import org.apache.hugegraph.util.InsertionOrderUtil; import com.google.common.collect.ImmutableSet; public class SortByCountIdHolderList extends IdHolderList { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/Aggregate.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/Aggregate.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/Aggregate.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/Aggregate.java index a5e5041e3..c53c0b68a 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/Aggregate.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/Aggregate.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.query; +package org.apache.hugegraph.backend.query; import java.util.Iterator; import java.util.function.BiFunction; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/BatchConditionQuery.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/BatchConditionQuery.java similarity index 90% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/BatchConditionQuery.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/BatchConditionQuery.java index 1f3a8bb49..5b02fdcd9 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/BatchConditionQuery.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/BatchConditionQuery.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.backend.query; +package org.apache.hugegraph.backend.query; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import com.baidu.hugegraph.backend.query.Condition.RelationType; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.backend.query.Condition.RelationType; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; public class BatchConditionQuery extends ConditionQuery { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/Condition.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/Condition.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/Condition.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/Condition.java index 1e6632440..7c07bc201 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/Condition.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/Condition.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.query; +package org.apache.hugegraph.backend.query; import java.util.ArrayList; import java.util.Collection; @@ -31,15 +31,15 @@ import java.util.function.BiPredicate; import org.apache.commons.lang.ArrayUtils; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.store.Shard; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.structure.HugeProperty; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.DateUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.NumericUtil; +import org.apache.hugegraph.backend.store.Shard; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.structure.HugeProperty; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.DateUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.NumericUtil; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/ConditionQuery.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/ConditionQuery.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/ConditionQuery.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/ConditionQuery.java index 0def61cf2..3ee6938f7 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/ConditionQuery.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/ConditionQuery.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.query; +package org.apache.hugegraph.backend.query; import java.math.BigDecimal; import java.util.ArrayList; @@ -26,27 +26,26 @@ import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.SplicingIdGenerator; -import com.baidu.hugegraph.backend.query.Condition.Relation; -import com.baidu.hugegraph.backend.query.Condition.RelationType; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.structure.HugeProperty; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.LongEncoding; -import com.baidu.hugegraph.util.NumericUtil; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.SplicingIdGenerator; +import org.apache.hugegraph.backend.query.Condition.Relation; +import org.apache.hugegraph.backend.query.Condition.RelationType; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.structure.HugeProperty; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.CollectionUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.LongEncoding; +import org.apache.hugegraph.util.NumericUtil; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/ConditionQueryFlatten.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/ConditionQueryFlatten.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/ConditionQueryFlatten.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/ConditionQueryFlatten.java index c0bd718df..487270ed7 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/ConditionQueryFlatten.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/ConditionQueryFlatten.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.query; +package org.apache.hugegraph.backend.query; import java.util.ArrayList; import java.util.Arrays; @@ -28,13 +28,13 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.Condition.Relation; -import com.baidu.hugegraph.backend.query.Condition.SyspropRelation; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.NumericUtil; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.Condition.Relation; +import org.apache.hugegraph.backend.query.Condition.SyspropRelation; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.NumericUtil; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -461,7 +461,7 @@ public final class ConditionQueryFlatten { } private static Relation selectRelation(Relation first, Relation second, - boolean high) { + boolean high) { if (first == null) { return second; } diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/IdPrefixQuery.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/IdPrefixQuery.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/IdPrefixQuery.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/IdPrefixQuery.java index 4c9c6e05f..99eaca461 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/IdPrefixQuery.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/IdPrefixQuery.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.backend.query; +package org.apache.hugegraph.backend.query; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.E; public final class IdPrefixQuery extends Query { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/IdQuery.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/IdQuery.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/IdQuery.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/IdQuery.java index 874296b8a..b99ef2f50 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/IdQuery.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/IdQuery.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.backend.query; +package org.apache.hugegraph.backend.query; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/IdRangeQuery.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/IdRangeQuery.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/IdRangeQuery.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/IdRangeQuery.java index 340f14ba8..a1e0b1344 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/IdRangeQuery.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/IdRangeQuery.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.backend.query; +package org.apache.hugegraph.backend.query; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.E; public final class IdRangeQuery extends Query { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/Query.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/Query.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/Query.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/Query.java index 317699ebf..5c96297a9 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/Query.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/Query.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.query; +package org.apache.hugegraph.backend.query; import java.util.Collection; import java.util.Collections; @@ -25,18 +25,18 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.Aggregate.AggregateFunc; -import com.baidu.hugegraph.exception.LimitExceedException; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.CollectionType; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.collection.IdSet; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.Aggregate.AggregateFunc; +import org.apache.hugegraph.exception.LimitExceedException; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.CollectionType; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.CollectionUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.collection.IdSet; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/QueryResults.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/QueryResults.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/QueryResults.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/QueryResults.java index c1cf47aa1..9ec4baf97 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/QueryResults.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/QueryResults.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.query; +package org.apache.hugegraph.backend.query; import java.util.Collection; import java.util.Collections; @@ -30,16 +30,16 @@ import java.util.function.Function; import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.iterator.CIter; -import com.baidu.hugegraph.iterator.FlatMapperIterator; -import com.baidu.hugegraph.iterator.ListIterator; -import com.baidu.hugegraph.iterator.MapperIterator; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.type.Idfiable; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.iterator.CIter; +import org.apache.hugegraph.iterator.FlatMapperIterator; +import org.apache.hugegraph.iterator.ListIterator; +import org.apache.hugegraph.iterator.MapperIterator; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.type.Idfiable; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; public class QueryResults { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/AbstractSerializer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/AbstractSerializer.java similarity index 86% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/AbstractSerializer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/AbstractSerializer.java index 47245c22c..10f882312 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/AbstractSerializer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/AbstractSerializer.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.backend.serializer; +package org.apache.hugegraph.backend.serializer; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.IdQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.type.HugeType; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.IdQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.config.HugeConfig; public abstract class AbstractSerializer implements GraphSerializer, SchemaSerializer { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/BinaryBackendEntry.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/BinaryBackendEntry.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/BinaryBackendEntry.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/BinaryBackendEntry.java index b540296b8..4ca31050b 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/BinaryBackendEntry.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/BinaryBackendEntry.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.serializer; +package org.apache.hugegraph.backend.serializer; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -26,12 +26,12 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntryIterator; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendEntryIterator; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.E; public class BinaryBackendEntry implements BackendEntry { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/BinaryEntryIterator.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/BinaryEntryIterator.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/BinaryEntryIterator.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/BinaryEntryIterator.java index e75ad6d05..f920592c0 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/BinaryEntryIterator.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/BinaryEntryIterator.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.backend.serializer; +package org.apache.hugegraph.backend.serializer; import java.util.function.BiFunction; -import com.baidu.hugegraph.backend.page.PageState; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendIterator; -import com.baidu.hugegraph.backend.store.BackendEntryIterator; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.page.PageState; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendEntry.BackendIterator; +import org.apache.hugegraph.backend.store.BackendEntryIterator; +import org.apache.hugegraph.util.E; public class BinaryEntryIterator extends BackendEntryIterator { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/BinaryScatterSerializer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/BinaryScatterSerializer.java similarity index 81% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/BinaryScatterSerializer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/BinaryScatterSerializer.java index 2b190f1b6..573204a5c 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/BinaryScatterSerializer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/BinaryScatterSerializer.java @@ -17,19 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.backend.serializer; +package org.apache.hugegraph.backend.serializer; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumn; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeProperty; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.structure.HugeVertexProperty; -import com.baidu.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumn; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.structure.HugeProperty; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.structure.HugeVertexProperty; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.config.HugeConfig; public class BinaryScatterSerializer extends BinarySerializer { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/BinarySerializer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/BinarySerializer.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/BinarySerializer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/BinarySerializer.java index 9bf6c7842..ed2a5ffb6 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/BinarySerializer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/BinarySerializer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.serializer; +package org.apache.hugegraph.backend.serializer; import java.util.Arrays; import java.util.Collection; @@ -27,51 +27,49 @@ import java.util.Map; import org.apache.commons.lang.NotImplementedException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.EdgeId; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.page.PageState; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.Condition.RangeConditions; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.IdPrefixQuery; -import com.baidu.hugegraph.backend.query.IdRangeQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.serializer.BinaryBackendEntry.BinaryId; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumn; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeEdgeProperty; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.structure.HugeIndex; -import com.baidu.hugegraph.structure.HugeProperty; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.structure.HugeVertexProperty; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.AggregateType; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.Frequency; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.type.define.IdStrategy; -import com.baidu.hugegraph.type.define.IndexType; -import com.baidu.hugegraph.type.define.SchemaStatus; -import com.baidu.hugegraph.type.define.SerialEnum; -import com.baidu.hugegraph.type.define.WriteType; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.NumericUtil; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.EdgeId; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.page.PageState; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumn; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.*; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.Condition.RangeConditions; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.IdPrefixQuery; +import org.apache.hugegraph.backend.query.IdRangeQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.serializer.BinaryBackendEntry.BinaryId; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeEdgeProperty; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.structure.HugeIndex; +import org.apache.hugegraph.structure.HugeProperty; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.structure.HugeVertexProperty; +import org.apache.hugegraph.type.define.AggregateType; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.DataType; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.Frequency; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.type.define.IdStrategy; +import org.apache.hugegraph.type.define.IndexType; +import org.apache.hugegraph.type.define.SchemaStatus; +import org.apache.hugegraph.type.define.SerialEnum; +import org.apache.hugegraph.type.define.WriteType; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.StringEncoding; public class BinarySerializer extends AbstractSerializer { @@ -873,7 +871,7 @@ public class BinarySerializer extends AbstractSerializer { parsedEntry = new BinaryBackendEntry(originEntry.type(), new BinaryId(buffer.bytes(), BytesBuffer.wrap(buffer.bytes()).readEdgeId())); - for (BackendEntry.BackendColumn col : originEntry.columns()) { + for (BackendColumn col : originEntry.columns()) { parsedEntry.column(buffer.bytes(), col.value); } return parsedEntry; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/BytesBuffer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/BytesBuffer.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/BytesBuffer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/BytesBuffer.java index 4cda2cb33..0c1f433f4 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/BytesBuffer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/BytesBuffer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.serializer; +package org.apache.hugegraph.backend.serializer; import java.io.OutputStream; import java.nio.Buffer; @@ -27,20 +27,19 @@ import java.util.Collection; import java.util.Date; import java.util.UUID; -import com.baidu.hugegraph.backend.id.EdgeId; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.Id.IdType; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.serializer.BinaryBackendEntry.BinaryId; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.util.Blob; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.KryoUtil; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.backend.id.EdgeId; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.Id.IdType; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.DataType; +import org.apache.hugegraph.util.*; +import org.apache.hugegraph.backend.serializer.BinaryBackendEntry.BinaryId; +import org.apache.hugegraph.util.Blob; +import org.apache.hugegraph.util.KryoUtil; +import org.apache.hugegraph.util.StringEncoding; /** * class BytesBuffer is a util for read/write binary diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/GraphSerializer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/GraphSerializer.java similarity index 71% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/GraphSerializer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/GraphSerializer.java index 166fcb22c..471d989c2 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/GraphSerializer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/GraphSerializer.java @@ -17,19 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.backend.serializer; +package org.apache.hugegraph.backend.serializer; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeEdgeProperty; -import com.baidu.hugegraph.structure.HugeIndex; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.structure.HugeVertexProperty; -import com.baidu.hugegraph.type.HugeType; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeEdgeProperty; +import org.apache.hugegraph.structure.HugeIndex; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.structure.HugeVertexProperty; public interface GraphSerializer { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/MergeIterator.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/MergeIterator.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/MergeIterator.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/MergeIterator.java index 162c62b87..688795808 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/MergeIterator.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/MergeIterator.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.backend.serializer; +package org.apache.hugegraph.backend.serializer; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.function.BiFunction; -import com.baidu.hugegraph.iterator.WrappedIterator; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.iterator.WrappedIterator; +import org.apache.hugegraph.util.E; public class MergeIterator extends WrappedIterator { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/SchemaSerializer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/SchemaSerializer.java similarity index 80% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/SchemaSerializer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/SchemaSerializer.java index 045f065da..1396cd1c8 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/SchemaSerializer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/SchemaSerializer.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.backend.serializer; +package org.apache.hugegraph.backend.serializer; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.VertexLabel; public interface SchemaSerializer { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/SerializerFactory.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/SerializerFactory.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/SerializerFactory.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/SerializerFactory.java index 995c5b4da..869cecdb0 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/SerializerFactory.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/SerializerFactory.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.backend.serializer; +package org.apache.hugegraph.backend.serializer; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.config.HugeConfig; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.config.HugeConfig; public class SerializerFactory { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/TableBackendEntry.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/TableBackendEntry.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/TableBackendEntry.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/TableBackendEntry.java index cfa9b169e..48b489c37 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/TableBackendEntry.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/TableBackendEntry.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.serializer; +package org.apache.hugegraph.backend.serializer; import java.util.ArrayList; import java.util.Collection; @@ -30,11 +30,11 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.lang3.NotImplementedException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.HugeKeys; public class TableBackendEntry implements BackendEntry { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/TableSerializer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/TableSerializer.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/TableSerializer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/TableSerializer.java index 7a56fe50a..2e51519bb 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/TableSerializer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/TableSerializer.java @@ -17,51 +17,51 @@ * under the License. */ -package com.baidu.hugegraph.backend.serializer; +package org.apache.hugegraph.backend.serializer; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.EdgeId; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.id.IdUtil; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.schema.SchemaLabel; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeEdgeProperty; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.structure.HugeIndex; -import com.baidu.hugegraph.structure.HugeProperty; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.structure.HugeVertexProperty; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.AggregateType; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.Frequency; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.type.define.IdStrategy; -import com.baidu.hugegraph.type.define.IndexType; -import com.baidu.hugegraph.type.define.SchemaStatus; -import com.baidu.hugegraph.type.define.SerialEnum; -import com.baidu.hugegraph.type.define.WriteType; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.EdgeId; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.id.IdUtil; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.schema.SchemaLabel; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeEdgeProperty; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.structure.HugeIndex; +import org.apache.hugegraph.structure.HugeProperty; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.structure.HugeVertexProperty; +import org.apache.hugegraph.type.define.AggregateType; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.DataType; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.Frequency; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.type.define.IdStrategy; +import org.apache.hugegraph.type.define.IndexType; +import org.apache.hugegraph.type.define.SchemaStatus; +import org.apache.hugegraph.type.define.SerialEnum; +import org.apache.hugegraph.type.define.WriteType; +import org.apache.hugegraph.util.E; public abstract class TableSerializer extends AbstractSerializer { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/TextBackendEntry.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/TextBackendEntry.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/TextBackendEntry.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/TextBackendEntry.java index 8f313d93c..ee14aaaf4 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/TextBackendEntry.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/TextBackendEntry.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.serializer; +package org.apache.hugegraph.backend.serializer; import java.util.ArrayList; import java.util.Collection; @@ -29,13 +29,13 @@ import java.util.NavigableMap; import java.util.Set; import java.util.concurrent.ConcurrentSkipListMap; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.StringEncoding; public class TextBackendEntry implements BackendEntry, Cloneable { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/TextSerializer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/TextSerializer.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/TextSerializer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/TextSerializer.java index 68f130a9a..e95ad4d04 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/TextSerializer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/serializer/TextSerializer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.serializer; +package org.apache.hugegraph.backend.serializer; import java.util.ArrayList; import java.util.Arrays; @@ -25,50 +25,49 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.config.HugeConfig; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.config.HugeConfig; import org.apache.commons.lang.NotImplementedException; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.EdgeId; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.id.IdUtil; -import com.baidu.hugegraph.backend.id.SplicingIdGenerator; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.Condition.RangeConditions; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.IdPrefixQuery; -import com.baidu.hugegraph.backend.query.IdRangeQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeEdgeProperty; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.structure.HugeIndex; -import com.baidu.hugegraph.structure.HugeIndex.IdWithExpiredTime; -import com.baidu.hugegraph.structure.HugeProperty; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.structure.HugeVertexProperty; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.AggregateType; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.Frequency; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.type.define.IdStrategy; -import com.baidu.hugegraph.type.define.IndexType; -import com.baidu.hugegraph.type.define.SchemaStatus; -import com.baidu.hugegraph.type.define.WriteType; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.backend.id.EdgeId; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.id.IdUtil; +import org.apache.hugegraph.backend.id.SplicingIdGenerator; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.IdPrefixQuery; +import org.apache.hugegraph.backend.query.IdRangeQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeEdgeProperty; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.structure.HugeIndex; +import org.apache.hugegraph.structure.HugeIndex.IdWithExpiredTime; +import org.apache.hugegraph.structure.HugeProperty; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.structure.HugeVertexProperty; +import org.apache.hugegraph.type.define.AggregateType; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.DataType; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.Frequency; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.type.define.IdStrategy; +import org.apache.hugegraph.type.define.IndexType; +import org.apache.hugegraph.type.define.SchemaStatus; +import org.apache.hugegraph.type.define.WriteType; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableMap; public class TextSerializer extends AbstractSerializer { @@ -459,7 +458,7 @@ public class TextSerializer extends AbstractSerializer { List end = new ArrayList<>(start); - RangeConditions range = new RangeConditions(sortValues); + Condition.RangeConditions range = new Condition.RangeConditions(sortValues); if (range.keyMin() != null) { start.add((String) range.keyMin()); } diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/AbstractBackendStore.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/AbstractBackendStore.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/AbstractBackendStore.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/AbstractBackendStore.java index 5e3ea6b07..9bb563a88 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/AbstractBackendStore.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/AbstractBackendStore.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.backend.store; +package org.apache.hugegraph.backend.store; -import com.baidu.hugegraph.exception.ConnectionException; -import com.baidu.hugegraph.type.HugeType; +import org.apache.hugegraph.exception.ConnectionException; +import org.apache.hugegraph.type.HugeType; public abstract class AbstractBackendStore implements BackendStore { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/AbstractBackendStoreProvider.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/AbstractBackendStoreProvider.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/AbstractBackendStoreProvider.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/AbstractBackendStoreProvider.java index c94a25fcd..e0fa6cbc5 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/AbstractBackendStoreProvider.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/AbstractBackendStoreProvider.java @@ -17,24 +17,24 @@ * under the License. */ -package com.baidu.hugegraph.backend.store; +package org.apache.hugegraph.backend.store; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Future; +import org.apache.hugegraph.backend.store.raft.StoreSnapshotFile; import org.slf4j.Logger; import com.alipay.remoting.rpc.RpcServer; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.store.raft.StoreSnapshotFile; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.event.EventHub; -import com.baidu.hugegraph.event.EventListener; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Events; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.event.EventHub; +import org.apache.hugegraph.event.EventListener; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Events; +import org.apache.hugegraph.util.Log; public abstract class AbstractBackendStoreProvider implements BackendStoreProvider { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendAction.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendAction.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendAction.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendAction.java index 8ace65d1d..c647d06fe 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendAction.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendAction.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.backend.store; +package org.apache.hugegraph.backend.store; -import com.baidu.hugegraph.type.define.Action; +import org.apache.hugegraph.type.define.Action; public class BackendAction { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendEntry.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendEntry.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendEntry.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendEntry.java index 38393d9f9..2765f6280 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendEntry.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendEntry.java @@ -17,19 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.backend.store; +package org.apache.hugegraph.backend.store; import java.util.Collection; import java.util.Iterator; import java.util.NoSuchElementException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.iterator.WrappedIterator; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.Idfiable; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.iterator.WrappedIterator; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.Idfiable; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.StringEncoding; public interface BackendEntry extends Idfiable { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendEntryIterator.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendEntryIterator.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendEntryIterator.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendEntryIterator.java index 151b7fa8a..c56161d6a 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendEntryIterator.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendEntryIterator.java @@ -17,19 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.backend.store; +package org.apache.hugegraph.backend.store; import java.util.NoSuchElementException; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.page.PageInfo; -import com.baidu.hugegraph.backend.page.PageState; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.exception.LimitExceedException; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.iterator.CIter; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.page.PageInfo; +import org.apache.hugegraph.backend.page.PageState; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.exception.LimitExceedException; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.iterator.CIter; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import org.slf4j.Logger; public abstract class BackendEntryIterator implements CIter { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendFeatures.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendFeatures.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendFeatures.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendFeatures.java index c1dac2780..48ac5e9b9 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendFeatures.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendFeatures.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store; +package org.apache.hugegraph.backend.store; public interface BackendFeatures { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendMetrics.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendMetrics.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendMetrics.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendMetrics.java index 1a103f154..42bb8199f 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendMetrics.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendMetrics.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store; +package org.apache.hugegraph.backend.store; import java.util.Map; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendMutation.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendMutation.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendMutation.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendMutation.java index e371b3ad7..1e84fe6bf 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendMutation.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendMutation.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store; +package org.apache.hugegraph.backend.store; import java.util.ArrayList; import java.util.Iterator; @@ -25,14 +25,14 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.iterator.ExtendableIterator; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Action; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.iterator.ExtendableIterator; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Action; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; public class BackendMutation { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendProviderFactory.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendProviderFactory.java similarity index 90% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendProviderFactory.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendProviderFactory.java index c8d22450a..16ee99cb4 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendProviderFactory.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendProviderFactory.java @@ -17,20 +17,20 @@ * under the License. */ -package com.baidu.hugegraph.backend.store; +package org.apache.hugegraph.backend.store; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.store.memory.InMemoryDBStoreProvider; -import com.baidu.hugegraph.backend.store.raft.RaftBackendStoreProvider; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.store.memory.InMemoryDBStoreProvider; +import org.apache.hugegraph.backend.store.raft.RaftBackendStoreProvider; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.util.Log; public class BackendProviderFactory { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendSession.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendSession.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendSession.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendSession.java index 65258bfea..323ddcd52 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendSession.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendSession.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.backend.store; +package org.apache.hugegraph.backend.store; -import com.baidu.hugegraph.backend.store.BackendStore.TxState; +import org.apache.hugegraph.backend.store.BackendStore.TxState; /** * interface Session for backend store diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendSessionPool.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendSessionPool.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendSessionPool.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendSessionPool.java index 50fd3f884..d12f87629 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendSessionPool.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendSessionPool.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store; +package org.apache.hugegraph.backend.store; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -27,9 +27,9 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.lang3.tuple.Pair; import org.slf4j.Logger; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.util.Log; public abstract class BackendSessionPool { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendStore.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendStore.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendStore.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendStore.java index 828f35cc6..7e45b4e07 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendStore.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendStore.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.backend.store; +package org.apache.hugegraph.backend.store; import java.util.Iterator; import java.util.Map; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.E; public interface BackendStore { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendStoreInfo.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendStoreInfo.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendStoreInfo.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendStoreInfo.java index 3c7f9dc4d..5ed81d214 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendStoreInfo.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendStoreInfo.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.backend.store; +package org.apache.hugegraph.backend.store; -import com.baidu.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.HugeConfig; import org.slf4j.Logger; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.util.Log; public class BackendStoreInfo { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendStoreProvider.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendStoreProvider.java similarity index 91% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendStoreProvider.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendStoreProvider.java index 490fbb12e..bcdb1a302 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendStoreProvider.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendStoreProvider.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.backend.store; +package org.apache.hugegraph.backend.store; import com.alipay.remoting.rpc.RpcServer; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.event.EventHub; -import com.baidu.hugegraph.event.EventListener; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.event.EventHub; +import org.apache.hugegraph.event.EventListener; public interface BackendStoreProvider { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendTable.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendTable.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendTable.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendTable.java index 6fb564df0..f38177664 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/BackendTable.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendTable.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store; +package org.apache.hugegraph.backend.store; import java.math.BigInteger; import java.util.ArrayList; @@ -25,16 +25,16 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.NumericUtil; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.NumericUtil; +import org.apache.hugegraph.util.StringEncoding; import com.google.common.collect.ImmutableList; public abstract class BackendTable { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/MetaDispatcher.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/MetaDispatcher.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/MetaDispatcher.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/MetaDispatcher.java index c6d705493..eb88e3fe9 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/MetaDispatcher.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/MetaDispatcher.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.backend.store; +package org.apache.hugegraph.backend.store; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import com.baidu.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.exception.NotSupportException; public class MetaDispatcher { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/MetaHandler.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/MetaHandler.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/MetaHandler.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/MetaHandler.java index 1436f0bd7..e1df2b08b 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/MetaHandler.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/MetaHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store; +package org.apache.hugegraph.backend.store; public interface MetaHandler { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/Shard.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/Shard.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/Shard.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/Shard.java index 261844a06..d6d54ddca 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/Shard.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/Shard.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store; +package org.apache.hugegraph.backend.store; /** * Shard is used for backend storage (like cassandra, hbase) scanning diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/SystemSchemaStore.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/SystemSchemaStore.java similarity index 90% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/SystemSchemaStore.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/SystemSchemaStore.java index cd1424ef9..d67fda86a 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/SystemSchemaStore.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/SystemSchemaStore.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.backend.store; +package org.apache.hugegraph.backend.store; import java.util.Map; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.type.define.CollectionType; -import com.baidu.hugegraph.util.collection.CollectionFactory; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.type.define.CollectionType; +import org.apache.hugegraph.util.collection.CollectionFactory; /** * The system schema will be initialized when server started, and the diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/TableDefine.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/TableDefine.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/TableDefine.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/TableDefine.java index ee952bfa6..be0676808 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/TableDefine.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/TableDefine.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store; +package org.apache.hugegraph.backend.store; import java.util.Arrays; import java.util.Collection; @@ -26,8 +26,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.InsertionOrderUtil; import com.google.common.collect.ImmutableMap; public class TableDefine { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/memory/InMemoryDBStore.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/memory/InMemoryDBStore.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/memory/InMemoryDBStore.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/memory/InMemoryDBStore.java index ead055353..79ac8d538 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/memory/InMemoryDBStore.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/memory/InMemoryDBStore.java @@ -17,30 +17,31 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.memory; +package org.apache.hugegraph.backend.store.memory; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.LocalCounter; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.serializer.TextBackendEntry; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Action; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.LocalCounter; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.serializer.TextBackendEntry; -import com.baidu.hugegraph.backend.store.AbstractBackendStore; -import com.baidu.hugegraph.backend.store.BackendAction; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendFeatures; -import com.baidu.hugegraph.backend.store.BackendMutation; -import com.baidu.hugegraph.backend.store.BackendSession; -import com.baidu.hugegraph.backend.store.BackendStoreProvider; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.store.AbstractBackendStore; +import org.apache.hugegraph.backend.store.BackendAction; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendFeatures; +import org.apache.hugegraph.backend.store.BackendMutation; +import org.apache.hugegraph.backend.store.BackendSession; +import org.apache.hugegraph.backend.store.BackendStoreProvider; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.util.Log; /** * NOTE: diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/memory/InMemoryDBStoreProvider.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/memory/InMemoryDBStoreProvider.java similarity index 86% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/memory/InMemoryDBStoreProvider.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/memory/InMemoryDBStoreProvider.java index d9eef07dc..ccbf1c007 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/memory/InMemoryDBStoreProvider.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/memory/InMemoryDBStoreProvider.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.memory; +package org.apache.hugegraph.backend.store.memory; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import com.baidu.hugegraph.backend.store.AbstractBackendStoreProvider; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.store.memory.InMemoryDBStore.InMemoryGraphStore; -import com.baidu.hugegraph.backend.store.memory.InMemoryDBStore.InMemorySchemaStore; -import com.baidu.hugegraph.backend.store.memory.InMemoryDBStore.InMemorySystemStore; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.util.Events; +import org.apache.hugegraph.backend.store.AbstractBackendStoreProvider; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.util.Events; +import org.apache.hugegraph.backend.store.memory.InMemoryDBStore.InMemoryGraphStore; +import org.apache.hugegraph.backend.store.memory.InMemoryDBStore.InMemorySchemaStore; +import org.apache.hugegraph.backend.store.memory.InMemoryDBStore.InMemorySystemStore; +import org.apache.hugegraph.config.HugeConfig; public class InMemoryDBStoreProvider extends AbstractBackendStoreProvider { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/memory/InMemoryDBTable.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/memory/InMemoryDBTable.java similarity index 91% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/memory/InMemoryDBTable.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/memory/InMemoryDBTable.java index 228048858..0ebb2a58f 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/memory/InMemoryDBTable.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/memory/InMemoryDBTable.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.memory; +package org.apache.hugegraph.backend.store.memory; import java.util.ArrayList; import java.util.Collection; @@ -27,28 +27,28 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.serializer.TextBackendEntry; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendSession; +import org.apache.hugegraph.backend.store.BackendTable; +import org.apache.hugegraph.backend.store.Shard; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.type.HugeType; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.Aggregate; -import com.baidu.hugegraph.backend.query.Aggregate.AggregateFunc; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.IdPrefixQuery; -import com.baidu.hugegraph.backend.query.IdRangeQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.backend.serializer.TextBackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendSession; -import com.baidu.hugegraph.backend.store.BackendTable; -import com.baidu.hugegraph.backend.store.Shard; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.query.Aggregate; +import org.apache.hugegraph.backend.query.Aggregate.AggregateFunc; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.IdPrefixQuery; +import org.apache.hugegraph.backend.query.IdRangeQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.Log; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/memory/InMemoryDBTables.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/memory/InMemoryDBTables.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/memory/InMemoryDBTables.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/memory/InMemoryDBTables.java index 96251b748..aa37998eb 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/memory/InMemoryDBTables.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/memory/InMemoryDBTables.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.memory; +package org.apache.hugegraph.backend.store.memory; import java.util.ArrayList; import java.util.Arrays; @@ -31,26 +31,26 @@ import java.util.NavigableMap; import java.util.SortedMap; import java.util.concurrent.ConcurrentSkipListMap; -import com.baidu.hugegraph.backend.id.EdgeId; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.Condition.RangeConditions; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.IdQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.backend.serializer.TextBackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumn; -import com.baidu.hugegraph.backend.store.BackendSession; -import com.baidu.hugegraph.iterator.ExtendableIterator; -import com.baidu.hugegraph.structure.HugeIndex; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.NumericUtil; +import org.apache.hugegraph.backend.id.EdgeId; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.serializer.TextBackendEntry; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumn; +import org.apache.hugegraph.backend.store.BackendSession; +import org.apache.hugegraph.structure.HugeIndex; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.Condition.RangeConditions; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.IdQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.iterator.ExtendableIterator; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.NumericUtil; import com.google.common.collect.ImmutableList; public class InMemoryDBTables { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/memory/InMemoryMetrics.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/memory/InMemoryMetrics.java similarity index 90% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/memory/InMemoryMetrics.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/memory/InMemoryMetrics.java index ab03cd4e2..3a7b784bc 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/memory/InMemoryMetrics.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/memory/InMemoryMetrics.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.memory; +package org.apache.hugegraph.backend.store.memory; import java.util.Map; -import com.baidu.hugegraph.backend.store.BackendMetrics; +import org.apache.hugegraph.backend.store.BackendMetrics; import com.google.common.collect.ImmutableMap; public class InMemoryMetrics implements BackendMetrics { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftAddPeerJob.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftAddPeerJob.java similarity index 90% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftAddPeerJob.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftAddPeerJob.java index 0fd1d49c3..5993d3f81 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftAddPeerJob.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftAddPeerJob.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.raft; +package org.apache.hugegraph.backend.store.raft; import java.util.Map; -import com.baidu.hugegraph.job.SysJob; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.job.SysJob; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.JsonUtil; public class RaftAddPeerJob extends SysJob { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftBackendStore.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftBackendStore.java similarity index 90% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftBackendStore.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftBackendStore.java index 8dacb8fef..36658d1c8 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftBackendStore.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftBackendStore.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.raft; +package org.apache.hugegraph.backend.store.raft; import java.util.ArrayList; import java.util.Iterator; @@ -29,20 +29,20 @@ import org.slf4j.Logger; import com.alipay.sofa.jraft.Status; import com.alipay.sofa.jraft.closure.ReadIndexClosure; import com.alipay.sofa.jraft.util.BytesUtil; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendFeatures; -import com.baidu.hugegraph.backend.store.BackendMutation; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.store.BackendStoreProvider; -import com.baidu.hugegraph.backend.store.SystemSchemaStore; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendFeatures; +import org.apache.hugegraph.backend.store.BackendMutation; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.backend.store.BackendStoreProvider; +import org.apache.hugegraph.backend.store.SystemSchemaStore; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; public class RaftBackendStore implements BackendStore { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftBackendStoreProvider.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftBackendStoreProvider.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftBackendStoreProvider.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftBackendStoreProvider.java index 695da68b2..bbc7ea2dc 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftBackendStoreProvider.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftBackendStoreProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.raft; +package org.apache.hugegraph.backend.store.raft; import java.util.Set; import java.util.concurrent.Future; @@ -25,18 +25,18 @@ import java.util.concurrent.Future; import org.slf4j.Logger; import com.alipay.remoting.rpc.RpcServer; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.store.BackendStoreProvider; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.event.EventHub; -import com.baidu.hugegraph.event.EventListener; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Events; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.backend.store.BackendStoreProvider; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.event.EventHub; +import org.apache.hugegraph.event.EventListener; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Events; +import org.apache.hugegraph.util.Log; import com.google.common.collect.ImmutableSet; public class RaftBackendStoreProvider implements BackendStoreProvider { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftClosure.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftClosure.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftClosure.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftClosure.java index d81559ea4..4866dde7b 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftClosure.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftClosure.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.raft; +package org.apache.hugegraph.backend.store.raft; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; @@ -29,8 +29,8 @@ import org.slf4j.Logger; import com.alipay.sofa.jraft.Closure; import com.alipay.sofa.jraft.Status; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.util.Log; public class RaftClosure implements Closure { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftContext.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftContext.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftContext.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftContext.java index bb1297b2f..92ca6c14c 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftContext.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftContext.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.raft; +package org.apache.hugegraph.backend.store.raft; import java.io.File; import java.io.IOException; @@ -32,6 +32,8 @@ import java.util.concurrent.RejectedExecutionHandler; import java.util.concurrent.ThreadPoolExecutor; import org.apache.commons.io.FileUtils; +import org.apache.hugegraph.backend.store.raft.rpc.ListPeersProcessor; +import org.apache.hugegraph.backend.store.raft.rpc.RpcForwarder; import org.slf4j.Logger; import com.alipay.sofa.jraft.NodeManager; @@ -45,29 +47,27 @@ import com.alipay.sofa.jraft.rpc.RpcServer; import com.alipay.sofa.jraft.rpc.impl.BoltRpcServer; import com.alipay.sofa.jraft.util.NamedThreadFactory; import com.alipay.sofa.jraft.util.ThreadPoolUtil; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.cache.Cache; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.BackendAction; -import com.baidu.hugegraph.backend.store.BackendMutation; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.store.BackendStoreProvider; -import com.baidu.hugegraph.backend.store.raft.rpc.ListPeersProcessor; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType; -import com.baidu.hugegraph.backend.store.raft.rpc.RpcForwarder; -import com.baidu.hugegraph.backend.store.raft.rpc.SetLeaderProcessor; -import com.baidu.hugegraph.backend.store.raft.rpc.StoreCommandProcessor; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.event.EventHub; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.GraphMode; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Events; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.backend.cache.Cache; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.BackendAction; +import org.apache.hugegraph.backend.store.BackendMutation; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.backend.store.BackendStoreProvider; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType; +import org.apache.hugegraph.backend.store.raft.rpc.SetLeaderProcessor; +import org.apache.hugegraph.backend.store.raft.rpc.StoreCommandProcessor; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.event.EventHub; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.GraphMode; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Events; +import org.apache.hugegraph.util.Log; public final class RaftContext { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftException.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftException.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftException.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftException.java index 0511d1333..9e4176419 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftException.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftException.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.raft; +package org.apache.hugegraph.backend.store.raft; -import com.baidu.hugegraph.HugeException; +import org.apache.hugegraph.HugeException; public class RaftException extends HugeException { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftGroupManager.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftGroupManager.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftGroupManager.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftGroupManager.java index 7a786863b..c4d10374c 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftGroupManager.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftGroupManager.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.raft; +package org.apache.hugegraph.backend.store.raft; import java.util.List; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftGroupManagerImpl.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftGroupManagerImpl.java similarity index 91% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftGroupManagerImpl.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftGroupManagerImpl.java index a00040371..fe8e988d1 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftGroupManagerImpl.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftGroupManagerImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.raft; +package org.apache.hugegraph.backend.store.raft; import java.util.List; import java.util.stream.Collectors; @@ -25,13 +25,13 @@ import java.util.stream.Collectors; import com.alipay.sofa.jraft.Node; import com.alipay.sofa.jraft.Status; import com.alipay.sofa.jraft.entity.PeerId; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse; -import com.baidu.hugegraph.backend.store.raft.rpc.RpcForwarder; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.store.raft.rpc.RpcForwarder; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse; +import org.apache.hugegraph.util.E; import com.google.protobuf.Message; public class RaftGroupManagerImpl implements RaftGroupManager { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftNode.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftNode.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftNode.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftNode.java index 53ad9bcbb..a762dbb3b 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftNode.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftNode.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.raft; +package org.apache.hugegraph.backend.store.raft; import java.io.IOException; import java.nio.ByteBuffer; @@ -39,9 +39,9 @@ import com.alipay.sofa.jraft.error.RaftError; import com.alipay.sofa.jraft.option.NodeOptions; import com.alipay.sofa.jraft.rpc.RpcServer; import com.alipay.sofa.jraft.util.BytesUtil; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.util.LZ4Util; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.util.LZ4Util; +import org.apache.hugegraph.util.Log; public final class RaftNode { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftRemovePeerJob.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftRemovePeerJob.java similarity index 90% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftRemovePeerJob.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftRemovePeerJob.java index eed62515d..f04d785f7 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftRemovePeerJob.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftRemovePeerJob.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.raft; +package org.apache.hugegraph.backend.store.raft; import java.util.Map; -import com.baidu.hugegraph.job.SysJob; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.job.SysJob; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.JsonUtil; public class RaftRemovePeerJob extends SysJob { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftResult.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftResult.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftResult.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftResult.java index 5f26993ff..2ef0396db 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftResult.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftResult.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.raft; +package org.apache.hugegraph.backend.store.raft; import java.util.function.Supplier; import com.alipay.sofa.jraft.Status; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.util.E; public final class RaftResult { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftStoreClosure.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftStoreClosure.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftStoreClosure.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftStoreClosure.java index f468b961a..640bb3d50 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftStoreClosure.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/RaftStoreClosure.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.raft; +package org.apache.hugegraph.backend.store.raft; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.util.E; public class RaftStoreClosure extends RaftClosure { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/StoreCommand.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/StoreCommand.java similarity index 91% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/StoreCommand.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/StoreCommand.java index c90ffe8da..126141535 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/StoreCommand.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/StoreCommand.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.raft; +package org.apache.hugegraph.backend.store.raft; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType; +import org.apache.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType; public final class StoreCommand { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/StoreSerializer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/StoreSerializer.java similarity index 86% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/StoreSerializer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/StoreSerializer.java index c64f9e2ff..07bd2af30 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/StoreSerializer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/StoreSerializer.java @@ -17,25 +17,25 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.raft; +package org.apache.hugegraph.backend.store.raft; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.serializer.BinaryBackendEntry; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; -import com.baidu.hugegraph.backend.store.BackendAction; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumn; -import com.baidu.hugegraph.backend.store.BackendMutation; -import com.baidu.hugegraph.backend.store.raft.RaftBackendStore.IncrCounter; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Action; -import com.baidu.hugegraph.type.define.SerialEnum; -import com.baidu.hugegraph.util.Bytes; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.serializer.BinaryBackendEntry; +import org.apache.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.backend.store.BackendAction; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumn; +import org.apache.hugegraph.backend.store.BackendMutation; +import org.apache.hugegraph.backend.store.raft.RaftBackendStore.IncrCounter; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Action; +import org.apache.hugegraph.type.define.SerialEnum; +import org.apache.hugegraph.util.Bytes; public final class StoreSerializer { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/StoreSnapshotFile.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/StoreSnapshotFile.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/StoreSnapshotFile.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/StoreSnapshotFile.java index e54fef62f..878644703 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/StoreSnapshotFile.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/StoreSnapshotFile.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.raft; +package org.apache.hugegraph.backend.store.raft; import java.io.File; import java.io.IOException; @@ -41,11 +41,11 @@ import com.alipay.sofa.jraft.error.RaftError; import com.alipay.sofa.jraft.storage.snapshot.SnapshotReader; import com.alipay.sofa.jraft.storage.snapshot.SnapshotWriter; import com.alipay.sofa.jraft.util.CRC64; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.util.CompressUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.util.CompressUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.Log; import com.google.protobuf.ByteString; public class StoreSnapshotFile { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/StoreStateMachine.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/StoreStateMachine.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/StoreStateMachine.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/StoreStateMachine.java index d06481bf7..b169611ec 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/StoreStateMachine.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/StoreStateMachine.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.raft; +package org.apache.hugegraph.backend.store.raft; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -37,16 +37,16 @@ import com.alipay.sofa.jraft.error.RaftError; import com.alipay.sofa.jraft.error.RaftException; import com.alipay.sofa.jraft.storage.snapshot.SnapshotReader; import com.alipay.sofa.jraft.storage.snapshot.SnapshotWriter; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; -import com.baidu.hugegraph.backend.store.BackendMutation; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.store.raft.RaftBackendStore.IncrCounter; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.LZ4Util; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.backend.store.BackendMutation; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.backend.store.raft.RaftBackendStore.IncrCounter; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.LZ4Util; +import org.apache.hugegraph.util.Log; public final class StoreStateMachine extends StateMachineAdapter { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/rpc/ListPeersProcessor.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/rpc/ListPeersProcessor.java similarity index 85% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/rpc/ListPeersProcessor.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/rpc/ListPeersProcessor.java index a79a07587..94178031a 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/rpc/ListPeersProcessor.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/rpc/ListPeersProcessor.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.raft.rpc; +package org.apache.hugegraph.backend.store.raft.rpc; import org.slf4j.Logger; import com.alipay.sofa.jraft.rpc.RpcRequestClosure; import com.alipay.sofa.jraft.rpc.RpcRequestProcessor; -import com.baidu.hugegraph.backend.store.raft.RaftGroupManager; -import com.baidu.hugegraph.backend.store.raft.RaftContext; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.store.raft.RaftGroupManager; +import org.apache.hugegraph.backend.store.raft.RaftContext; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse; +import org.apache.hugegraph.util.Log; import com.google.common.collect.ImmutableList; import com.google.protobuf.Message; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/rpc/RpcForwarder.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/rpc/RpcForwarder.java similarity index 90% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/rpc/RpcForwarder.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/rpc/RpcForwarder.java index 2d2b41c91..b9fe9d942 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/rpc/RpcForwarder.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/rpc/RpcForwarder.java @@ -17,10 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.raft.rpc; +package org.apache.hugegraph.backend.store.raft.rpc; import java.util.concurrent.ExecutionException; +import org.apache.hugegraph.backend.store.raft.RaftStoreClosure; +import org.apache.hugegraph.backend.store.raft.StoreCommand; import org.slf4j.Logger; import com.alipay.sofa.jraft.Node; @@ -31,16 +33,14 @@ import com.alipay.sofa.jraft.error.RaftError; import com.alipay.sofa.jraft.rpc.RaftClientService; import com.alipay.sofa.jraft.rpc.RpcResponseClosure; import com.alipay.sofa.jraft.util.Endpoint; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.store.raft.RaftClosure; -import com.baidu.hugegraph.backend.store.raft.RaftContext; -import com.baidu.hugegraph.backend.store.raft.RaftStoreClosure; -import com.baidu.hugegraph.backend.store.raft.StoreCommand; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.store.raft.RaftClosure; +import org.apache.hugegraph.backend.store.raft.RaftContext; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.google.protobuf.Descriptors.FieldDescriptor; import com.google.protobuf.Message; import com.google.protobuf.ZeroByteStringHelper; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/rpc/SetLeaderProcessor.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/rpc/SetLeaderProcessor.java similarity index 84% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/rpc/SetLeaderProcessor.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/rpc/SetLeaderProcessor.java index 56518f73f..c79d48b91 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/rpc/SetLeaderProcessor.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/rpc/SetLeaderProcessor.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.raft.rpc; +package org.apache.hugegraph.backend.store.raft.rpc; +import org.apache.hugegraph.backend.store.raft.RaftContext; +import org.apache.hugegraph.backend.store.raft.RaftGroupManager; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse; import org.slf4j.Logger; import com.alipay.sofa.jraft.rpc.RpcRequestClosure; import com.alipay.sofa.jraft.rpc.RpcRequestProcessor; -import com.baidu.hugegraph.backend.store.raft.RaftGroupManager; -import com.baidu.hugegraph.backend.store.raft.RaftContext; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.util.Log; import com.google.protobuf.Message; public class SetLeaderProcessor diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/rpc/StoreCommandProcessor.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/rpc/StoreCommandProcessor.java similarity index 81% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/rpc/StoreCommandProcessor.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/rpc/StoreCommandProcessor.java index 447f99013..cbeabeee1 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/rpc/StoreCommandProcessor.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/raft/rpc/StoreCommandProcessor.java @@ -17,21 +17,21 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.raft.rpc; +package org.apache.hugegraph.backend.store.raft.rpc; +import org.apache.hugegraph.backend.store.raft.RaftContext; +import org.apache.hugegraph.backend.store.raft.RaftNode; +import org.apache.hugegraph.backend.store.raft.RaftStoreClosure; +import org.apache.hugegraph.backend.store.raft.StoreCommand; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType; import org.slf4j.Logger; import com.alipay.sofa.jraft.rpc.RpcRequestClosure; import com.alipay.sofa.jraft.rpc.RpcRequestProcessor; -import com.baidu.hugegraph.backend.store.raft.RaftNode; -import com.baidu.hugegraph.backend.store.raft.RaftContext; -import com.baidu.hugegraph.backend.store.raft.RaftStoreClosure; -import com.baidu.hugegraph.backend.store.raft.StoreCommand; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.util.Log; import com.google.protobuf.Message; public class StoreCommandProcessor diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/ram/IntIntMap.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/ram/IntIntMap.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/ram/IntIntMap.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/ram/IntIntMap.java index 755cbe9eb..a7a93fa12 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/ram/IntIntMap.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/ram/IntIntMap.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.ram; +package org.apache.hugegraph.backend.store.ram; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.Arrays; -import com.baidu.hugegraph.HugeException; +import org.apache.hugegraph.HugeException; public final class IntIntMap implements RamMap { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/ram/IntLongMap.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/ram/IntLongMap.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/ram/IntLongMap.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/ram/IntLongMap.java index 36ef9428f..2a689725d 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/ram/IntLongMap.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/ram/IntLongMap.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.ram; +package org.apache.hugegraph.backend.store.ram; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.Arrays; -import com.baidu.hugegraph.HugeException; +import org.apache.hugegraph.HugeException; public final class IntLongMap implements RamMap { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/ram/IntObjectMap.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/ram/IntObjectMap.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/ram/IntObjectMap.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/ram/IntObjectMap.java index 72b379c16..f40052681 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/ram/IntObjectMap.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/ram/IntObjectMap.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.ram; +package org.apache.hugegraph.backend.store.ram; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.Arrays; -import com.baidu.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.exception.NotSupportException; public final class IntObjectMap implements RamMap { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/ram/RamMap.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/ram/RamMap.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/ram/RamMap.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/ram/RamMap.java index 456f97e58..5ee3bde21 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/ram/RamMap.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/ram/RamMap.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.ram; +package org.apache.hugegraph.backend.store.ram; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/ram/RamTable.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/ram/RamTable.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/ram/RamTable.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/ram/RamTable.java index ba2bbc4bd..1cbe73afc 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/ram/RamTable.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/ram/RamTable.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.ram; +package org.apache.hugegraph.backend.store.ram; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -43,25 +43,25 @@ import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.slf4j.Logger; -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.backend.query.Condition; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.ConditionQueryFlatten; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.iterator.FlatMapperIterator; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.Consumers; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.ConditionQueryFlatten; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.iterator.FlatMapperIterator; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.Consumers; +import org.apache.hugegraph.util.Log; public final class RamTable { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/AbstractTransaction.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/AbstractTransaction.java similarity index 90% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/AbstractTransaction.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/AbstractTransaction.java index 1fb280719..6f403e7a0 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/AbstractTransaction.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/AbstractTransaction.java @@ -17,38 +17,38 @@ * under the License. */ -package com.baidu.hugegraph.backend.tx; +package org.apache.hugegraph.backend.tx; import java.util.Set; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.backend.query.IdQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.query.QueryResults; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.Transaction; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.IdQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.backend.serializer.AbstractSerializer; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntryIterator; -import com.baidu.hugegraph.backend.store.BackendFeatures; -import com.baidu.hugegraph.backend.store.BackendMutation; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Action; -import com.baidu.hugegraph.type.define.CollectionType; -import com.baidu.hugegraph.type.define.GraphMode; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; -import com.baidu.hugegraph.util.collection.IdSet; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.Transaction; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.serializer.AbstractSerializer; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendEntryIterator; +import org.apache.hugegraph.backend.store.BackendFeatures; +import org.apache.hugegraph.backend.store.BackendMutation; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Action; +import org.apache.hugegraph.type.define.CollectionType; +import org.apache.hugegraph.type.define.GraphMode; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; +import org.apache.hugegraph.util.collection.IdSet; import com.google.common.util.concurrent.RateLimiter; public abstract class AbstractTransaction implements Transaction { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphIndexTransaction.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/GraphIndexTransaction.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphIndexTransaction.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/GraphIndexTransaction.java index 26b896d46..de2135052 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphIndexTransaction.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/GraphIndexTransaction.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.tx; +package org.apache.hugegraph.backend.tx; import java.nio.CharBuffer; import java.util.ArrayList; @@ -34,65 +34,66 @@ import java.util.function.Function; import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.backend.page.PageIds; +import org.apache.hugegraph.backend.page.PageState; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendStore; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.analyzer.Analyzer; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.page.IdHolder; -import com.baidu.hugegraph.backend.page.IdHolder.BatchIdHolder; -import com.baidu.hugegraph.backend.page.IdHolder.FixedIdHolder; -import com.baidu.hugegraph.backend.page.IdHolder.PagingIdHolder; -import com.baidu.hugegraph.backend.page.IdHolderList; -import com.baidu.hugegraph.backend.page.PageIds; -import com.baidu.hugegraph.backend.page.PageInfo; -import com.baidu.hugegraph.backend.page.PageState; -import com.baidu.hugegraph.backend.page.SortByCountIdHolderList; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.Condition.RangeConditions; -import com.baidu.hugegraph.backend.query.Condition.Relation; -import com.baidu.hugegraph.backend.query.Condition.RelationType; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.ConditionQuery.OptimizedType; -import com.baidu.hugegraph.backend.query.ConditionQueryFlatten; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.backend.serializer.AbstractSerializer; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.exception.NoIndexException; -import com.baidu.hugegraph.exception.NotAllowException; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.iterator.Metadatable; -import com.baidu.hugegraph.job.EphemeralJob; -import com.baidu.hugegraph.job.EphemeralJobBuilder; -import com.baidu.hugegraph.job.system.DeleteExpiredJob; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.structure.HugeIndex; -import com.baidu.hugegraph.structure.HugeProperty; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.task.HugeTask; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Action; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.type.define.IndexType; -import com.baidu.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.LockUtil; -import com.baidu.hugegraph.util.LongEncoding; -import com.baidu.hugegraph.util.NumericUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.analyzer.Analyzer; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.page.IdHolder; +import org.apache.hugegraph.backend.page.IdHolder.BatchIdHolder; +import org.apache.hugegraph.backend.page.IdHolder.FixedIdHolder; +import org.apache.hugegraph.backend.page.IdHolder.PagingIdHolder; +import org.apache.hugegraph.backend.page.IdHolderList; +import org.apache.hugegraph.backend.page.PageInfo; +import org.apache.hugegraph.backend.page.SortByCountIdHolderList; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.Condition.RangeConditions; +import org.apache.hugegraph.backend.query.Condition.Relation; +import org.apache.hugegraph.backend.query.Condition.RelationType; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.ConditionQuery.OptimizedType; +import org.apache.hugegraph.backend.query.ConditionQueryFlatten; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.backend.serializer.AbstractSerializer; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.exception.NoIndexException; +import org.apache.hugegraph.exception.NotAllowException; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.iterator.Metadatable; +import org.apache.hugegraph.job.EphemeralJob; +import org.apache.hugegraph.job.EphemeralJobBuilder; +import org.apache.hugegraph.job.system.DeleteExpiredJob; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaLabel; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.structure.HugeIndex; +import org.apache.hugegraph.structure.HugeIndex.IdWithExpiredTime; +import org.apache.hugegraph.structure.HugeProperty; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.task.HugeTask; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Action; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.type.define.IndexType; +import org.apache.hugegraph.util.CollectionUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.LockUtil; +import org.apache.hugegraph.util.LongEncoding; +import org.apache.hugegraph.util.NumericUtil; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -913,7 +914,7 @@ public class GraphIndexTransaction extends AbstractTransaction { if (this.store().features().supportsTtl() || showExpired) { return; } - for (HugeIndex.IdWithExpiredTime id : index.expiredElementIds()) { + for (IdWithExpiredTime id : index.expiredElementIds()) { HugeIndex removeIndex = index.clone(); removeIndex.resetElementIds(); removeIndex.elementIds(id.id(), id.expiredTime()); @@ -1024,7 +1025,7 @@ public class GraphIndexTransaction extends AbstractTransaction { ConditionQuery query, Set indexLabels) { Set matchedIndexLabels = InsertionOrderUtil.newSet(); - for (Condition.Relation relation : query.userpropRelations()) { + for (Relation relation : query.userpropRelations()) { if (!relation.relation().isRangeType() && !relation.relation().isSearchType()) { continue; @@ -1250,10 +1251,10 @@ public class GraphIndexTransaction extends AbstractTransaction { indexQuery = new ConditionQuery(indexType.type(), query); indexQuery.eq(HugeKeys.INDEX_LABEL_ID, indexLabel.id()); for (Condition condition : query.userpropConditions()) { - assert condition instanceof Condition.Relation; - Condition.Relation r = (Condition.Relation) condition; + assert condition instanceof Relation; + Relation r = (Relation) condition; Number value = NumericUtil.convertToNumber(r.value()); - Condition.Relation sys = new Condition.SyspropRelation( + Relation sys = new Condition.SyspropRelation( HugeKeys.FIELD_VALUES, r.relation(), value); condition = condition.replace(r, sys); @@ -1382,9 +1383,9 @@ public class GraphIndexTransaction extends AbstractTransaction { } private static Relation shardFieldValuesCondition(HugeKeys key, - List prefixes, - Object number, - RelationType type) { + List prefixes, + Object number, + RelationType type) { List values = new ArrayList<>(prefixes); String num = LongEncoding.encodeNumber(number); if (type == RelationType.LTE) { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphTransaction.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/GraphTransaction.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphTransaction.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/GraphTransaction.java index 2dbd76776..66986407c 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphTransaction.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/GraphTransaction.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.tx; +package org.apache.hugegraph.backend.tx; import java.util.ArrayList; import java.util.Arrays; @@ -34,6 +34,9 @@ import java.util.function.Function; import jakarta.ws.rs.ForbiddenException; import org.apache.commons.collections.CollectionUtils; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendMutation; +import org.apache.hugegraph.backend.store.BackendStore; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Element; import org.apache.tinkerpop.gremlin.structure.Graph; @@ -42,62 +45,59 @@ import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator; import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.EdgeId; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.SplicingIdGenerator; -import com.baidu.hugegraph.backend.page.IdHolderList; -import com.baidu.hugegraph.backend.page.PageInfo; -import com.baidu.hugegraph.backend.page.QueryList; -import com.baidu.hugegraph.backend.query.Aggregate; -import com.baidu.hugegraph.backend.query.Aggregate.AggregateFunc; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.ConditionQuery.OptimizedType; -import com.baidu.hugegraph.backend.query.ConditionQueryFlatten; -import com.baidu.hugegraph.backend.query.IdQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendMutation; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.exception.LimitExceedException; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.iterator.BatchMapperIterator; -import com.baidu.hugegraph.iterator.ExtendableIterator; -import com.baidu.hugegraph.iterator.FilterIterator; -import com.baidu.hugegraph.iterator.FlatMapperIterator; -import com.baidu.hugegraph.iterator.LimitIterator; -import com.baidu.hugegraph.iterator.ListIterator; -import com.baidu.hugegraph.iterator.MapperIterator; -import com.baidu.hugegraph.job.system.DeleteExpiredJob; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaLabel; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeEdgeProperty; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.structure.HugeFeatures.HugeVertexFeatures; -import com.baidu.hugegraph.structure.HugeIndex; -import com.baidu.hugegraph.structure.HugeProperty; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.structure.HugeVertexProperty; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Action; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.type.define.IdStrategy; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.LockUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.EdgeId; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.SplicingIdGenerator; +import org.apache.hugegraph.backend.page.IdHolderList; +import org.apache.hugegraph.backend.page.PageInfo; +import org.apache.hugegraph.backend.page.QueryList; +import org.apache.hugegraph.backend.query.Aggregate; +import org.apache.hugegraph.backend.query.Aggregate.AggregateFunc; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.ConditionQuery.OptimizedType; +import org.apache.hugegraph.backend.query.ConditionQueryFlatten; +import org.apache.hugegraph.backend.query.IdQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.exception.LimitExceedException; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.iterator.BatchMapperIterator; +import org.apache.hugegraph.iterator.ExtendableIterator; +import org.apache.hugegraph.iterator.FilterIterator; +import org.apache.hugegraph.iterator.FlatMapperIterator; +import org.apache.hugegraph.iterator.LimitIterator; +import org.apache.hugegraph.iterator.ListIterator; +import org.apache.hugegraph.iterator.MapperIterator; +import org.apache.hugegraph.job.system.DeleteExpiredJob; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaLabel; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeEdgeProperty; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.structure.HugeFeatures.HugeVertexFeatures; +import org.apache.hugegraph.structure.HugeIndex; +import org.apache.hugegraph.structure.HugeProperty; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.structure.HugeVertexProperty; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Action; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.type.define.IdStrategy; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.LockUtil; import com.google.common.collect.ImmutableList; public class GraphTransaction extends IndexableTransaction { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/IndexableTransaction.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/IndexableTransaction.java similarity index 91% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/IndexableTransaction.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/IndexableTransaction.java index 68c91d960..e9ded8514 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/IndexableTransaction.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/IndexableTransaction.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.backend.tx; +package org.apache.hugegraph.backend.tx; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.store.BackendMutation; -import com.baidu.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.backend.store.BackendMutation; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.backend.BackendException; public abstract class IndexableTransaction extends AbstractTransaction { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/SchemaIndexTransaction.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/SchemaIndexTransaction.java similarity index 84% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/SchemaIndexTransaction.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/SchemaIndexTransaction.java index 153d730e3..885fa2f85 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/SchemaIndexTransaction.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/SchemaIndexTransaction.java @@ -17,26 +17,26 @@ * under the License. */ -package com.baidu.hugegraph.backend.tx; +package org.apache.hugegraph.backend.tx; import java.util.Iterator; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.IdQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendStore; import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.IdQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.structure.HugeIndex; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.structure.HugeIndex; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.E; public class SchemaIndexTransaction extends AbstractTransaction { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/SchemaTransaction.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/SchemaTransaction.java similarity index 91% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/SchemaTransaction.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/SchemaTransaction.java index 77ebba1d8..a75f8917f 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/SchemaTransaction.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/SchemaTransaction.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.tx; +package org.apache.hugegraph.backend.tx; import java.util.ArrayList; import java.util.Iterator; @@ -25,49 +25,49 @@ import java.util.List; import java.util.Set; import java.util.function.Consumer; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.backend.store.SystemSchemaStore; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.LocalCounter; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.store.SystemSchemaStore; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.exception.NotAllowException; -import com.baidu.hugegraph.job.JobBuilder; -import com.baidu.hugegraph.job.schema.EdgeLabelRemoveJob; -import com.baidu.hugegraph.job.schema.IndexLabelRebuildJob; -import com.baidu.hugegraph.job.schema.IndexLabelRemoveJob; -import com.baidu.hugegraph.job.schema.OlapPropertyKeyClearJob; -import com.baidu.hugegraph.job.schema.OlapPropertyKeyCreateJob; -import com.baidu.hugegraph.job.schema.OlapPropertyKeyRemoveJob; -import com.baidu.hugegraph.job.schema.SchemaJob; -import com.baidu.hugegraph.job.schema.VertexLabelRemoveJob; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.schema.SchemaLabel; -import com.baidu.hugegraph.schema.Userdata; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.task.HugeTask; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.GraphMode; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.type.define.SchemaStatus; -import com.baidu.hugegraph.type.define.WriteType; -import com.baidu.hugegraph.util.DateUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.LockUtil; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.LocalCounter; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.exception.NotAllowException; +import org.apache.hugegraph.job.JobBuilder; +import org.apache.hugegraph.job.schema.EdgeLabelRemoveJob; +import org.apache.hugegraph.job.schema.IndexLabelRebuildJob; +import org.apache.hugegraph.job.schema.IndexLabelRemoveJob; +import org.apache.hugegraph.job.schema.OlapPropertyKeyClearJob; +import org.apache.hugegraph.job.schema.OlapPropertyKeyCreateJob; +import org.apache.hugegraph.job.schema.OlapPropertyKeyRemoveJob; +import org.apache.hugegraph.job.schema.SchemaJob; +import org.apache.hugegraph.job.schema.VertexLabelRemoveJob; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.schema.SchemaLabel; +import org.apache.hugegraph.schema.Userdata; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.task.HugeTask; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.GraphMode; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.type.define.SchemaStatus; +import org.apache.hugegraph.type.define.WriteType; +import org.apache.hugegraph.util.DateUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.LockUtil; import com.google.common.collect.ImmutableSet; public class SchemaTransaction extends IndexableTransaction { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/config/AuthOptions.java b/hugegraph-core/src/main/java/org/apache/hugegraph/config/AuthOptions.java similarity index 87% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/config/AuthOptions.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/config/AuthOptions.java index f8b59e3c7..e3a8b1f8b 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/config/AuthOptions.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/config/AuthOptions.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.config; +package org.apache.hugegraph.config; -import static com.baidu.hugegraph.config.OptionChecker.disallowEmpty; -import static com.baidu.hugegraph.config.OptionChecker.rangeDouble; -import static com.baidu.hugegraph.config.OptionChecker.rangeInt; +import static org.apache.hugegraph.config.OptionChecker.disallowEmpty; +import static org.apache.hugegraph.config.OptionChecker.rangeDouble; +import static org.apache.hugegraph.config.OptionChecker.rangeInt; public class AuthOptions extends OptionHolder { @@ -43,8 +43,8 @@ public class AuthOptions extends OptionHolder { new ConfigOption<>( "auth.authenticator", "The class path of authenticator implementation. " + - "e.g., com.baidu.hugegraph.auth.StandardAuthenticator, " + - "or com.baidu.hugegraph.auth.ConfigAuthenticator.", + "e.g., org.apache.hugegraph.auth.StandardAuthenticator, " + + "or org.apache.hugegraph.auth.ConfigAuthenticator.", null, "" ); @@ -53,7 +53,7 @@ public class AuthOptions extends OptionHolder { new ConfigOption<>( "auth.graph_store", "The name of graph used to store authentication information, " + - "like users, only for com.baidu.hugegraph.auth.StandardAuthenticator.", + "like users, only for org.apache.hugegraph.auth.StandardAuthenticator.", disallowEmpty(), "hugegraph" ); @@ -62,7 +62,7 @@ public class AuthOptions extends OptionHolder { new ConfigOption<>( "auth.admin_token", "Token for administrator operations, " + - "only for com.baidu.hugegraph.auth.ConfigAuthenticator.", + "only for org.apache.hugegraph.auth.ConfigAuthenticator.", disallowEmpty(), "162f7848-0b6d-4faf-b557-3a0797869c55" ); @@ -71,7 +71,7 @@ public class AuthOptions extends OptionHolder { new ConfigListOption<>( "auth.user_tokens", "The map of user tokens with name and password, " + - "only for com.baidu.hugegraph.auth.ConfigAuthenticator.", + "only for org.apache.hugegraph.auth.ConfigAuthenticator.", disallowEmpty(), "hugegraph:9fd95c9c-711b-415b-b85f-d4df46ba5c31" ); diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/config/CoreOptions.java b/hugegraph-core/src/main/java/org/apache/hugegraph/config/CoreOptions.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/config/CoreOptions.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/config/CoreOptions.java index c2596cbc4..ed7c26f32 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/config/CoreOptions.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/config/CoreOptions.java @@ -17,17 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.config; +package org.apache.hugegraph.config; -import static com.baidu.hugegraph.backend.tx.GraphTransaction.COMMIT_BATCH; -import static com.baidu.hugegraph.config.OptionChecker.allowValues; -import static com.baidu.hugegraph.config.OptionChecker.disallowEmpty; -import static com.baidu.hugegraph.config.OptionChecker.positiveInt; -import static com.baidu.hugegraph.config.OptionChecker.rangeInt; +import static org.apache.hugegraph.backend.tx.GraphTransaction.COMMIT_BATCH; +import static org.apache.hugegraph.config.OptionChecker.allowValues; +import static org.apache.hugegraph.config.OptionChecker.disallowEmpty; +import static org.apache.hugegraph.config.OptionChecker.positiveInt; +import static org.apache.hugegraph.config.OptionChecker.rangeInt; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.type.define.CollectionType; -import com.baidu.hugegraph.util.Bytes; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.type.define.CollectionType; +import org.apache.hugegraph.util.Bytes; public class CoreOptions extends OptionHolder { @@ -53,7 +54,7 @@ public class CoreOptions extends OptionHolder { "gremlin.graph", "Gremlin entrance to create graph.", disallowEmpty(), - "com.baidu.hugegraph.HugeFactory" + "org.apache.hugegraph.HugeFactory" ); public static final ConfigOption BACKEND = diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/Config.java b/hugegraph-core/src/main/java/org/apache/hugegraph/election/Config.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/election/Config.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/election/Config.java index ad39c0b5e..86a2f4b57 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/Config.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/election/Config.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.election; +package org.apache.hugegraph.election; public interface Config { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/RoleElectionStateMachine.java b/hugegraph-core/src/main/java/org/apache/hugegraph/election/RoleElectionStateMachine.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/election/RoleElectionStateMachine.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/election/RoleElectionStateMachine.java index 4bc258623..cdce6261a 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/RoleElectionStateMachine.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/election/RoleElectionStateMachine.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.election; +package org.apache.hugegraph.election; public interface RoleElectionStateMachine { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/RoleElectionStateMachineImpl.java b/hugegraph-core/src/main/java/org/apache/hugegraph/election/RoleElectionStateMachineImpl.java similarity index 99% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/election/RoleElectionStateMachineImpl.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/election/RoleElectionStateMachineImpl.java index 69f8d5a3d..d69fe65cc 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/RoleElectionStateMachineImpl.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/election/RoleElectionStateMachineImpl.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.election; +package org.apache.hugegraph.election; import java.security.SecureRandom; import java.util.Optional; import java.util.concurrent.locks.LockSupport; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.util.E; public class RoleElectionStateMachineImpl implements RoleElectionStateMachine { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/RoleTypeData.java b/hugegraph-core/src/main/java/org/apache/hugegraph/election/RoleTypeData.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/election/RoleTypeData.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/election/RoleTypeData.java index aa60c47ac..240c721b3 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/RoleTypeData.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/election/RoleTypeData.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.election; +package org.apache.hugegraph.election; import java.util.Objects; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/RoleTypeDataAdapter.java b/hugegraph-core/src/main/java/org/apache/hugegraph/election/RoleTypeDataAdapter.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/election/RoleTypeDataAdapter.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/election/RoleTypeDataAdapter.java index 41a2021f0..74f7a03d4 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/RoleTypeDataAdapter.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/election/RoleTypeDataAdapter.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.election; +package org.apache.hugegraph.election; import java.util.Optional; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/StateMachineCallback.java b/hugegraph-core/src/main/java/org/apache/hugegraph/election/StateMachineCallback.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/election/StateMachineCallback.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/election/StateMachineCallback.java index 8403b5950..f0bb7933b 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/StateMachineCallback.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/election/StateMachineCallback.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.election; +package org.apache.hugegraph.election; public interface StateMachineCallback { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/StateMachineContext.java b/hugegraph-core/src/main/java/org/apache/hugegraph/election/StateMachineContext.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/election/StateMachineContext.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/election/StateMachineContext.java index a3693f5fa..ee2f499a9 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/StateMachineContext.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/election/StateMachineContext.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.election; +package org.apache.hugegraph.election; public interface StateMachineContext { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/exception/ConnectionException.java b/hugegraph-core/src/main/java/org/apache/hugegraph/exception/ConnectionException.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/exception/ConnectionException.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/exception/ConnectionException.java index 9e3191be8..645fb6fb8 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/exception/ConnectionException.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/exception/ConnectionException.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.exception; +package org.apache.hugegraph.exception; -import com.baidu.hugegraph.HugeException; +import org.apache.hugegraph.HugeException; public class ConnectionException extends HugeException { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/exception/ExistedException.java b/hugegraph-core/src/main/java/org/apache/hugegraph/exception/ExistedException.java similarity index 90% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/exception/ExistedException.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/exception/ExistedException.java index b4024f145..6a769cae0 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/exception/ExistedException.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/exception/ExistedException.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.exception; +package org.apache.hugegraph.exception; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.type.HugeType; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.type.HugeType; public class ExistedException extends HugeException { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/exception/HugeGremlinException.java b/hugegraph-core/src/main/java/org/apache/hugegraph/exception/HugeGremlinException.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/exception/HugeGremlinException.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/exception/HugeGremlinException.java index 2604230a9..3e105b6e4 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/exception/HugeGremlinException.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/exception/HugeGremlinException.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.exception; +package org.apache.hugegraph.exception; import java.util.Map; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.util.E; public class HugeGremlinException extends RuntimeException { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/exception/LimitExceedException.java b/hugegraph-core/src/main/java/org/apache/hugegraph/exception/LimitExceedException.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/exception/LimitExceedException.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/exception/LimitExceedException.java index 9b1f11acf..112a2e51c 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/exception/LimitExceedException.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/exception/LimitExceedException.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.exception; +package org.apache.hugegraph.exception; -import com.baidu.hugegraph.HugeException; +import org.apache.hugegraph.HugeException; public class LimitExceedException extends HugeException { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/exception/NoIndexException.java b/hugegraph-core/src/main/java/org/apache/hugegraph/exception/NoIndexException.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/exception/NoIndexException.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/exception/NoIndexException.java index c201fd152..23e8ed8fc 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/exception/NoIndexException.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/exception/NoIndexException.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.exception; +package org.apache.hugegraph.exception; -import com.baidu.hugegraph.HugeException; +import org.apache.hugegraph.HugeException; public class NoIndexException extends HugeException { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/exception/NotAllowException.java b/hugegraph-core/src/main/java/org/apache/hugegraph/exception/NotAllowException.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/exception/NotAllowException.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/exception/NotAllowException.java index f25bd8ce7..d48e7be46 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/exception/NotAllowException.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/exception/NotAllowException.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.exception; +package org.apache.hugegraph.exception; -import com.baidu.hugegraph.HugeException; +import org.apache.hugegraph.HugeException; public class NotAllowException extends HugeException { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/exception/NotFoundException.java b/hugegraph-core/src/main/java/org/apache/hugegraph/exception/NotFoundException.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/exception/NotFoundException.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/exception/NotFoundException.java index 1f7dc0852..88c0d8ec5 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/exception/NotFoundException.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/exception/NotFoundException.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.exception; +package org.apache.hugegraph.exception; -import com.baidu.hugegraph.HugeException; +import org.apache.hugegraph.HugeException; public class NotFoundException extends HugeException { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/exception/NotSupportException.java b/hugegraph-core/src/main/java/org/apache/hugegraph/exception/NotSupportException.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/exception/NotSupportException.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/exception/NotSupportException.java index 934171369..62c1473a8 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/exception/NotSupportException.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/exception/NotSupportException.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.exception; +package org.apache.hugegraph.exception; -import com.baidu.hugegraph.HugeException; +import org.apache.hugegraph.HugeException; public class NotSupportException extends HugeException { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/io/GraphSONSchemaSerializer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/io/GraphSONSchemaSerializer.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/io/GraphSONSchemaSerializer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/io/GraphSONSchemaSerializer.java index 5f8fc8fa4..d4803094a 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/io/GraphSONSchemaSerializer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/io/GraphSONSchemaSerializer.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.io; +package org.apache.hugegraph.io; import java.util.LinkedHashMap; import java.util.Map; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.HugeKeys; public class GraphSONSchemaSerializer { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/io/HugeGraphIoRegistry.java b/hugegraph-core/src/main/java/org/apache/hugegraph/io/HugeGraphIoRegistry.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/io/HugeGraphIoRegistry.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/io/HugeGraphIoRegistry.java index 0ae0d59c8..754066298 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/io/HugeGraphIoRegistry.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/io/HugeGraphIoRegistry.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.io; +package org.apache.hugegraph.io; import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry; import org.apache.tinkerpop.gremlin.structure.io.Io; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/io/HugeGraphSONModule.java b/hugegraph-core/src/main/java/org/apache/hugegraph/io/HugeGraphSONModule.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/io/HugeGraphSONModule.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/io/HugeGraphSONModule.java index 33b89c361..436d03d83 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/io/HugeGraphSONModule.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/io/HugeGraphSONModule.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.io; +package org.apache.hugegraph.io; import java.io.File; import java.io.IOException; @@ -31,6 +31,19 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; +import org.apache.hugegraph.backend.id.EdgeId; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.id.IdGenerator.LongId; +import org.apache.hugegraph.backend.id.IdGenerator.StringId; +import org.apache.hugegraph.backend.id.IdGenerator.UuidId; +import org.apache.hugegraph.backend.store.Shard; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.Blob; import org.apache.tinkerpop.gremlin.process.traversal.Path; import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree; import org.apache.tinkerpop.gremlin.structure.Element; @@ -53,24 +66,11 @@ import org.apache.tinkerpop.shaded.jackson.databind.ser.std.DateSerializer; import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer; import org.apache.tinkerpop.shaded.jackson.databind.ser.std.UUIDSerializer; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.backend.id.EdgeId; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.id.IdGenerator.LongId; -import com.baidu.hugegraph.backend.id.IdGenerator.StringId; -import com.baidu.hugegraph.backend.id.IdGenerator.UuidId; -import com.baidu.hugegraph.backend.store.Shard; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.structure.HugeProperty; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.Blob; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.structure.HugeProperty; +import org.apache.hugegraph.structure.HugeVertex; @SuppressWarnings("serial") public class HugeGraphSONModule extends TinkerPopJacksonModule { @@ -99,8 +99,8 @@ public class HugeGraphSONModule extends TinkerPopJacksonModule { TYPE_DEFINITIONS.put(UUID.class, "UUID"); // HugeGraph id serializer - TYPE_DEFINITIONS.put(IdGenerator.StringId.class, "StringId"); - TYPE_DEFINITIONS.put(IdGenerator.LongId.class, "LongId"); + TYPE_DEFINITIONS.put(StringId.class, "StringId"); + TYPE_DEFINITIONS.put(LongId.class, "LongId"); TYPE_DEFINITIONS.put(EdgeId.class, "EdgeId"); // HugeGraph schema serializer @@ -276,13 +276,13 @@ public class HugeGraphSONModule extends TinkerPopJacksonModule { DeserializationContext ctxt) throws IOException { Class clazz = this.handledType(); - if (clazz.equals(IdGenerator.LongId.class)) { + if (clazz.equals(LongId.class)) { Number idValue = ctxt.readValue(jsonParser, Number.class); return (T) IdGenerator.of(idValue.longValue()); - } else if (clazz.equals(IdGenerator.StringId.class)) { + } else if (clazz.equals(StringId.class)) { String idValue = ctxt.readValue(jsonParser, String.class); return (T) IdGenerator.of(idValue); - } else if (clazz.equals(IdGenerator.UuidId.class)) { + } else if (clazz.equals(UuidId.class)) { UUID idValue = ctxt.readValue(jsonParser, UUID.class); return (T) IdGenerator.of(idValue); } else { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/io/HugeGryoModule.java b/hugegraph-core/src/main/java/org/apache/hugegraph/io/HugeGryoModule.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/io/HugeGryoModule.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/io/HugeGryoModule.java index 1453808b3..7cdca4f07 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/io/HugeGryoModule.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/io/HugeGryoModule.java @@ -17,29 +17,28 @@ * under the License. */ -package com.baidu.hugegraph.io; +package org.apache.hugegraph.io; import java.util.LinkedHashMap; import java.util.Map; import java.util.Optional; +import org.apache.hugegraph.backend.id.EdgeId; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.Id.IdType; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.StringEncoding; import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo; import org.apache.tinkerpop.shaded.kryo.Kryo; import org.apache.tinkerpop.shaded.kryo.Serializer; import org.apache.tinkerpop.shaded.kryo.io.Input; import org.apache.tinkerpop.shaded.kryo.io.Output; -import com.baidu.hugegraph.backend.id.EdgeId; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.Id.IdType; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.StringEncoding; - public class HugeGryoModule { private static GraphSONSchemaSerializer schemaSerializer = diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/AlgorithmJob.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/AlgorithmJob.java similarity index 91% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/AlgorithmJob.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/AlgorithmJob.java index f25c1b250..345a5a532 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/AlgorithmJob.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/AlgorithmJob.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.job; +package org.apache.hugegraph.job; import java.util.Map; -import com.baidu.hugegraph.job.algorithm.Algorithm; -import com.baidu.hugegraph.job.algorithm.AlgorithmPool; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.job.algorithm.Algorithm; +import org.apache.hugegraph.job.algorithm.AlgorithmPool; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.JsonUtil; public class AlgorithmJob extends UserJob { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/ComputerJob.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/ComputerJob.java similarity index 90% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/ComputerJob.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/ComputerJob.java index 7c90c507d..ee4c5096c 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/ComputerJob.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/ComputerJob.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.job; +package org.apache.hugegraph.job; import java.util.Map; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.job.computer.Computer; -import com.baidu.hugegraph.job.computer.ComputerPool; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.job.computer.Computer; +import org.apache.hugegraph.job.computer.ComputerPool; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.E; public class ComputerJob extends SysJob { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/EphemeralJob.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/EphemeralJob.java similarity index 91% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/EphemeralJob.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/EphemeralJob.java index 88f44375f..5d8560be6 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/EphemeralJob.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/EphemeralJob.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.job; +package org.apache.hugegraph.job; -import com.baidu.hugegraph.task.TaskCallable.SysTaskCallable; +import org.apache.hugegraph.task.TaskCallable.SysTaskCallable; public abstract class EphemeralJob extends SysTaskCallable { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/EphemeralJobBuilder.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/EphemeralJobBuilder.java similarity index 88% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/EphemeralJobBuilder.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/EphemeralJobBuilder.java index 9baf00c80..12d1a51d2 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/EphemeralJobBuilder.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/EphemeralJobBuilder.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.job; +package org.apache.hugegraph.job; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.task.HugeTask; -import com.baidu.hugegraph.task.TaskScheduler; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.task.HugeTask; +import org.apache.hugegraph.task.TaskScheduler; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.util.E; public class EphemeralJobBuilder { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/GremlinJob.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/GremlinJob.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/GremlinJob.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/GremlinJob.java index 8fb050ad9..684cfe9ec 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/GremlinJob.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/GremlinJob.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.job; +package org.apache.hugegraph.job; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.exception.LimitExceedException; -import com.baidu.hugegraph.traversal.optimize.HugeScriptTraversal; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.exception.LimitExceedException; +import org.apache.hugegraph.traversal.optimize.HugeScriptTraversal; +import org.apache.hugegraph.util.E; public class GremlinJob extends UserJob { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/Job.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/Job.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/Job.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/Job.java index 32325a96f..1eac003f2 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/Job.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/Job.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.job; +package org.apache.hugegraph.job; public interface Job { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/JobBuilder.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/JobBuilder.java similarity index 89% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/JobBuilder.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/JobBuilder.java index 584d89228..219dafee2 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/JobBuilder.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/JobBuilder.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.job; +package org.apache.hugegraph.job; import java.util.Set; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.task.HugeTask; -import com.baidu.hugegraph.task.TaskCallable; -import com.baidu.hugegraph.task.TaskScheduler; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.task.HugeTask; +import org.apache.hugegraph.task.TaskCallable; +import org.apache.hugegraph.task.TaskScheduler; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.util.E; public class JobBuilder { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/SysJob.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/SysJob.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/SysJob.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/SysJob.java index 283374c08..ae3c8d7c0 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/SysJob.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/SysJob.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.job; +package org.apache.hugegraph.job; -import com.baidu.hugegraph.task.TaskCallable.SysTaskCallable; +import org.apache.hugegraph.task.TaskCallable.SysTaskCallable; public abstract class SysJob extends SysTaskCallable implements Job { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/UserJob.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/UserJob.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/UserJob.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/UserJob.java index bc3ba0372..64cbb57b2 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/UserJob.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/UserJob.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.job; +package org.apache.hugegraph.job; -import com.baidu.hugegraph.task.TaskCallable; +import org.apache.hugegraph.task.TaskCallable; public abstract class UserJob extends TaskCallable implements Job { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/AbstractAlgorithm.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/AbstractAlgorithm.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/AbstractAlgorithm.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/AbstractAlgorithm.java index dbe3f7e2b..ce3958bc4 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/AbstractAlgorithm.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/AbstractAlgorithm.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm; +package org.apache.hugegraph.job.algorithm; import java.util.HashMap; import java.util.Iterator; @@ -31,6 +31,9 @@ import java.util.function.Consumer; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.mutable.MutableLong; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.Query; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Element; @@ -39,24 +42,21 @@ import org.apache.tinkerpop.gremlin.structure.Transaction; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.iterator.FilterIterator; -import com.baidu.hugegraph.iterator.FlatMapperIterator; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.job.algorithm.Consumers.StopExecution; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.ParameterUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.iterator.FilterIterator; +import org.apache.hugegraph.iterator.FlatMapperIterator; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.job.algorithm.Consumers.StopExecution; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.CollectionUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.ParameterUtil; import com.google.common.base.Objects; @SuppressWarnings("deprecation") // StringEscapeUtils diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/Algorithm.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/Algorithm.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/Algorithm.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/Algorithm.java index 856e38dbc..ac6e485eb 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/Algorithm.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/Algorithm.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm; +package org.apache.hugegraph.job.algorithm; import java.util.Map; -import com.baidu.hugegraph.job.UserJob; +import org.apache.hugegraph.job.UserJob; public interface Algorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/AlgorithmPool.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/AlgorithmPool.java similarity index 68% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/AlgorithmPool.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/AlgorithmPool.java index 7031318ac..79afde963 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/AlgorithmPool.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/AlgorithmPool.java @@ -17,29 +17,29 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm; +package org.apache.hugegraph.job.algorithm; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import com.baidu.hugegraph.job.algorithm.cent.BetweennessCentralityAlgorithm; -import com.baidu.hugegraph.job.algorithm.cent.BetweennessCentralityAlgorithmV2; -import com.baidu.hugegraph.job.algorithm.cent.ClosenessCentralityAlgorithm; -import com.baidu.hugegraph.job.algorithm.cent.ClosenessCentralityAlgorithmV2; -import com.baidu.hugegraph.job.algorithm.cent.DegreeCentralityAlgorithm; -import com.baidu.hugegraph.job.algorithm.cent.EigenvectorCentralityAlgorithm; -import com.baidu.hugegraph.job.algorithm.cent.StressCentralityAlgorithm; -import com.baidu.hugegraph.job.algorithm.cent.StressCentralityAlgorithmV2; -import com.baidu.hugegraph.job.algorithm.comm.ClusterCoefficientAlgorithm; -import com.baidu.hugegraph.job.algorithm.comm.KCoreAlgorithm; -import com.baidu.hugegraph.job.algorithm.comm.LouvainAlgorithm; -import com.baidu.hugegraph.job.algorithm.comm.LpaAlgorithm; -import com.baidu.hugegraph.job.algorithm.comm.TriangleCountAlgorithm; -import com.baidu.hugegraph.job.algorithm.comm.WeakConnectedComponent; -import com.baidu.hugegraph.job.algorithm.path.RingsDetectAlgorithm; -import com.baidu.hugegraph.job.algorithm.rank.PageRankAlgorithm; -import com.baidu.hugegraph.job.algorithm.similarity.FusiformSimilarityAlgorithm; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.job.algorithm.path.RingsDetectAlgorithm; +import org.apache.hugegraph.job.algorithm.rank.PageRankAlgorithm; +import org.apache.hugegraph.job.algorithm.similarity.FusiformSimilarityAlgorithm; +import org.apache.hugegraph.job.algorithm.cent.BetweennessCentralityAlgorithm; +import org.apache.hugegraph.job.algorithm.cent.BetweennessCentralityAlgorithmV2; +import org.apache.hugegraph.job.algorithm.cent.ClosenessCentralityAlgorithm; +import org.apache.hugegraph.job.algorithm.cent.ClosenessCentralityAlgorithmV2; +import org.apache.hugegraph.job.algorithm.cent.DegreeCentralityAlgorithm; +import org.apache.hugegraph.job.algorithm.cent.EigenvectorCentralityAlgorithm; +import org.apache.hugegraph.job.algorithm.cent.StressCentralityAlgorithm; +import org.apache.hugegraph.job.algorithm.cent.StressCentralityAlgorithmV2; +import org.apache.hugegraph.job.algorithm.comm.ClusterCoefficientAlgorithm; +import org.apache.hugegraph.job.algorithm.comm.KCoreAlgorithm; +import org.apache.hugegraph.job.algorithm.comm.LouvainAlgorithm; +import org.apache.hugegraph.job.algorithm.comm.LpaAlgorithm; +import org.apache.hugegraph.job.algorithm.comm.TriangleCountAlgorithm; +import org.apache.hugegraph.job.algorithm.comm.WeakConnectedComponent; +import org.apache.hugegraph.util.E; public class AlgorithmPool { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/BfsTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/BfsTraverser.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/BfsTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/BfsTraverser.java index a85cef022..11149ccd3 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/BfsTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/BfsTraverser.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm; +package org.apache.hugegraph.job.algorithm; import java.util.HashMap; import java.util.Iterator; @@ -25,12 +25,12 @@ import java.util.LinkedList; import java.util.Map; import java.util.Stack; +import org.apache.hugegraph.backend.id.Id; import org.apache.tinkerpop.gremlin.structure.Edge; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.type.define.Directions; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.type.define.Directions; public abstract class BfsTraverser extends AbstractAlgorithm.AlgoTraverser diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/Consumers.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/Consumers.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/Consumers.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/Consumers.java index 9a60e3031..47da65bda 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/Consumers.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/Consumers.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm; +package org.apache.hugegraph.job.algorithm; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; @@ -29,10 +29,10 @@ import java.util.function.Consumer; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.task.TaskManager.ContextCallable; -import com.baidu.hugegraph.util.ExecutorUtil; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.task.TaskManager.ContextCallable; +import org.apache.hugegraph.util.ExecutorUtil; +import org.apache.hugegraph.util.Log; public class Consumers { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/CountEdgeAlgorithm.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/CountEdgeAlgorithm.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/CountEdgeAlgorithm.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/CountEdgeAlgorithm.java index 9ed617b08..2ca7190f9 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/CountEdgeAlgorithm.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/CountEdgeAlgorithm.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm; +package org.apache.hugegraph.job.algorithm; import java.util.HashMap; import java.util.Iterator; @@ -26,8 +26,8 @@ import java.util.Map; import org.apache.commons.lang3.mutable.MutableLong; import org.apache.tinkerpop.gremlin.structure.Edge; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.util.JsonUtil; public class CountEdgeAlgorithm extends AbstractAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/CountVertexAlgorithm.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/CountVertexAlgorithm.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/CountVertexAlgorithm.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/CountVertexAlgorithm.java index 721979c35..0db431973 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/CountVertexAlgorithm.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/CountVertexAlgorithm.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm; +package org.apache.hugegraph.job.algorithm; import java.util.HashMap; import java.util.Iterator; import java.util.Map; import org.apache.commons.lang3.mutable.MutableLong; +import org.apache.hugegraph.util.JsonUtil; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.job.UserJob; public class CountVertexAlgorithm extends AbstractAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/SubgraphStatAlgorithm.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/SubgraphStatAlgorithm.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/SubgraphStatAlgorithm.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/SubgraphStatAlgorithm.java index 814277b2a..e6330fc9d 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/SubgraphStatAlgorithm.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/SubgraphStatAlgorithm.java @@ -17,29 +17,29 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm; +package org.apache.hugegraph.job.algorithm; import java.util.Iterator; import java.util.Map; import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.util.ParameterUtil; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.StandardHugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.task.HugeTask; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.traversal.optimize.HugeScriptTraversal; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.Log; -import com.baidu.hugegraph.util.ParameterUtil; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.StandardHugeGraph; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.task.HugeTask; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.traversal.optimize.HugeScriptTraversal; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.Log; import com.google.common.collect.ImmutableMap; public class SubgraphStatAlgorithm extends AbstractAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/AbstractCentAlgorithm.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/AbstractCentAlgorithm.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/AbstractCentAlgorithm.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/AbstractCentAlgorithm.java index 6a7ba396a..84b952439 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/AbstractCentAlgorithm.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/AbstractCentAlgorithm.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm.cent; +package org.apache.hugegraph.job.algorithm.cent; import java.util.Collections; import java.util.HashMap; @@ -26,6 +26,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang3.tuple.Pair; +import org.apache.hugegraph.backend.id.Id; import org.apache.tinkerpop.gremlin.process.traversal.Order; import org.apache.tinkerpop.gremlin.process.traversal.Pop; import org.apache.tinkerpop.gremlin.process.traversal.Scope; @@ -36,14 +37,13 @@ import org.apache.tinkerpop.gremlin.structure.Direction; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.iterator.MapperIterator; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.job.algorithm.AbstractAlgorithm; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.iterator.MapperIterator; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.job.algorithm.AbstractAlgorithm; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.Log; public abstract class AbstractCentAlgorithm extends AbstractAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/BetweennessCentralityAlgorithm.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/BetweennessCentralityAlgorithm.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/BetweennessCentralityAlgorithm.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/BetweennessCentralityAlgorithm.java index 25e1451cf..4ee69e412 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/BetweennessCentralityAlgorithm.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/BetweennessCentralityAlgorithm.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm.cent; +package org.apache.hugegraph.job.algorithm.cent; import java.util.ArrayList; import java.util.HashMap; @@ -25,17 +25,17 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang3.mutable.MutableFloat; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.SplicingIdGenerator; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.Pop; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.SplicingIdGenerator; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.type.define.Directions; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.type.define.Directions; public class BetweennessCentralityAlgorithm extends AbstractCentAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/BetweennessCentralityAlgorithmV2.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/BetweennessCentralityAlgorithmV2.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/BetweennessCentralityAlgorithmV2.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/BetweennessCentralityAlgorithmV2.java index 0cb2fef32..e8fbdaff6 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/BetweennessCentralityAlgorithmV2.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/BetweennessCentralityAlgorithmV2.java @@ -17,22 +17,22 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm.cent; +package org.apache.hugegraph.job.algorithm.cent; import java.util.HashMap; import java.util.Iterator; import java.util.Map; import org.apache.commons.lang3.mutable.MutableFloat; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.Query; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.job.algorithm.BfsTraverser; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.type.define.Directions; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.job.algorithm.BfsTraverser; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.type.define.Directions; public class BetweennessCentralityAlgorithmV2 extends AbstractCentAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/ClosenessCentralityAlgorithm.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/ClosenessCentralityAlgorithm.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/ClosenessCentralityAlgorithm.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/ClosenessCentralityAlgorithm.java index 81979dc01..0c9fa8f84 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/ClosenessCentralityAlgorithm.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/ClosenessCentralityAlgorithm.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm.cent; +package org.apache.hugegraph.job.algorithm.cent; import java.util.Map; @@ -29,8 +29,8 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.type.define.Directions; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.type.define.Directions; public class ClosenessCentralityAlgorithm extends AbstractCentAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/ClosenessCentralityAlgorithmV2.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/ClosenessCentralityAlgorithmV2.java similarity index 91% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/ClosenessCentralityAlgorithmV2.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/ClosenessCentralityAlgorithmV2.java index 55dc93ad9..cfb286b85 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/ClosenessCentralityAlgorithmV2.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/ClosenessCentralityAlgorithmV2.java @@ -16,16 +16,16 @@ * License for the specific language governing permissions and limitations * under the License. */ -package com.baidu.hugegraph.job.algorithm.cent; +package org.apache.hugegraph.job.algorithm.cent; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.job.algorithm.BfsTraverser; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.type.define.Directions; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.job.algorithm.BfsTraverser; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.type.define.Directions; import org.apache.tinkerpop.gremlin.structure.Vertex; import java.util.HashMap; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/DegreeCentralityAlgorithm.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/DegreeCentralityAlgorithm.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/DegreeCentralityAlgorithm.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/DegreeCentralityAlgorithm.java index 6032b56e2..38de89232 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/DegreeCentralityAlgorithm.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/DegreeCentralityAlgorithm.java @@ -17,21 +17,21 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm.cent; +package org.apache.hugegraph.job.algorithm.cent; import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.hugegraph.backend.id.Id; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.type.define.Directions; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.type.define.Directions; public class DegreeCentralityAlgorithm extends AbstractCentAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/EigenvectorCentralityAlgorithm.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/EigenvectorCentralityAlgorithm.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/EigenvectorCentralityAlgorithm.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/EigenvectorCentralityAlgorithm.java index d396f3cf3..f025a4b76 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/EigenvectorCentralityAlgorithm.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/EigenvectorCentralityAlgorithm.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm.cent; +package org.apache.hugegraph.job.algorithm.cent; import java.util.Map; @@ -26,8 +26,8 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.type.define.Directions; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.type.define.Directions; public class EigenvectorCentralityAlgorithm extends AbstractCentAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/StressCentralityAlgorithm.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/StressCentralityAlgorithm.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/StressCentralityAlgorithm.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/StressCentralityAlgorithm.java index 6f4189255..3ee8cdf87 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/StressCentralityAlgorithm.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/StressCentralityAlgorithm.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm.cent; +package org.apache.hugegraph.job.algorithm.cent; import java.util.Map; @@ -26,9 +26,9 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.ParameterUtil; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.ParameterUtil; public class StressCentralityAlgorithm extends AbstractCentAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/StressCentralityAlgorithmV2.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/StressCentralityAlgorithmV2.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/StressCentralityAlgorithmV2.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/StressCentralityAlgorithmV2.java index bbce4d7ad..4c46c516d 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/cent/StressCentralityAlgorithmV2.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/StressCentralityAlgorithmV2.java @@ -17,22 +17,22 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm.cent; +package org.apache.hugegraph.job.algorithm.cent; import java.util.HashMap; import java.util.Iterator; import java.util.Map; import org.apache.commons.lang3.mutable.MutableLong; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.Query; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.job.algorithm.BfsTraverser; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.type.define.Directions; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.job.algorithm.BfsTraverser; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.type.define.Directions; public class StressCentralityAlgorithmV2 extends AbstractCentAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/AbstractCommAlgorithm.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/AbstractCommAlgorithm.java similarity index 91% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/AbstractCommAlgorithm.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/AbstractCommAlgorithm.java index 82bba9bc3..c7ced8e82 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/AbstractCommAlgorithm.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/AbstractCommAlgorithm.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm.comm; +package org.apache.hugegraph.job.algorithm.comm; import java.util.Map; -import com.baidu.hugegraph.job.algorithm.AbstractAlgorithm; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.ParameterUtil; +import org.apache.hugegraph.job.algorithm.AbstractAlgorithm; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.ParameterUtil; public abstract class AbstractCommAlgorithm extends AbstractAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/ClusterCoefficientAlgorithm.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/ClusterCoefficientAlgorithm.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/ClusterCoefficientAlgorithm.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/ClusterCoefficientAlgorithm.java index b7a3895a3..68110f471 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/ClusterCoefficientAlgorithm.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/ClusterCoefficientAlgorithm.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm.comm; +package org.apache.hugegraph.job.algorithm.comm; import java.util.Map; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; public class ClusterCoefficientAlgorithm extends AbstractCommAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/KCoreAlgorithm.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/KCoreAlgorithm.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/KCoreAlgorithm.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/KCoreAlgorithm.java index de707ff35..ea3450b33 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/KCoreAlgorithm.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/KCoreAlgorithm.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm.comm; +package org.apache.hugegraph.job.algorithm.comm; import java.util.HashMap; import java.util.HashSet; @@ -28,18 +28,18 @@ import java.util.Set; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.mutable.MutableInt; +import org.apache.hugegraph.backend.id.Id; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.traversal.algorithm.FusiformSimilarityTraverser; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.ParameterUtil; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.traversal.algorithm.FusiformSimilarityTraverser; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.CollectionUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.ParameterUtil; import com.google.common.collect.ImmutableSet; public class KCoreAlgorithm extends AbstractCommAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/LouvainAlgorithm.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/LouvainAlgorithm.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/LouvainAlgorithm.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/LouvainAlgorithm.java index 3789d6a19..603dc97b2 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/LouvainAlgorithm.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/LouvainAlgorithm.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm.comm; +package org.apache.hugegraph.job.algorithm.comm; import java.util.Map; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.util.ParameterUtil; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.util.ParameterUtil; public class LouvainAlgorithm extends AbstractCommAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/LouvainTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/LouvainTraverser.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/LouvainTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/LouvainTraverser.java index d6f647baf..ae190401f 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/LouvainTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/LouvainTraverser.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm.comm; +package org.apache.hugegraph.job.algorithm.comm; import java.io.BufferedOutputStream; import java.io.OutputStream; @@ -40,6 +40,12 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.commons.lang.mutable.MutableFloat; import org.apache.commons.lang3.mutable.MutableInt; import org.apache.commons.lang3.tuple.Pair; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.job.algorithm.Consumers; +import org.apache.hugegraph.schema.SchemaLabel; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.schema.VertexLabel; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Edge; @@ -47,23 +53,17 @@ import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.exception.ExistedException; -import com.baidu.hugegraph.iterator.ListIterator; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.job.algorithm.AbstractAlgorithm; -import com.baidu.hugegraph.job.algorithm.AbstractAlgorithm.AlgoTraverser; -import com.baidu.hugegraph.job.algorithm.Consumers; -import com.baidu.hugegraph.schema.SchemaLabel; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.Log; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.exception.ExistedException; +import org.apache.hugegraph.iterator.ListIterator; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.job.algorithm.AbstractAlgorithm; +import org.apache.hugegraph.job.algorithm.AbstractAlgorithm.AlgoTraverser; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.Log; +import org.apache.hugegraph.util.StringEncoding; import com.google.common.collect.ImmutableMap; public class LouvainTraverser extends AlgoTraverser { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/LpaAlgorithm.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/LpaAlgorithm.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/LpaAlgorithm.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/LpaAlgorithm.java index 59d53245f..355f4f683 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/LpaAlgorithm.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/LpaAlgorithm.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm.comm; +package org.apache.hugegraph.job.algorithm.comm; import java.util.ArrayList; import java.util.HashMap; @@ -28,16 +28,16 @@ import java.util.Random; import java.util.concurrent.atomic.AtomicLong; import org.apache.commons.lang3.mutable.MutableInt; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.schema.VertexLabel; import org.apache.tinkerpop.gremlin.process.traversal.Scope; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableMap; public class LpaAlgorithm extends AbstractCommAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/TriangleCountAlgorithm.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/TriangleCountAlgorithm.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/TriangleCountAlgorithm.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/TriangleCountAlgorithm.java index 4cecc623b..fbdc9be7d 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/TriangleCountAlgorithm.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/TriangleCountAlgorithm.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm.comm; +package org.apache.hugegraph.job.algorithm.comm; import java.util.Iterator; import java.util.Map; @@ -26,15 +26,15 @@ import java.util.TreeSet; import java.util.concurrent.atomic.AtomicLong; import org.apache.commons.lang.mutable.MutableLong; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; import org.apache.tinkerpop.gremlin.structure.Edge; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; import com.google.common.collect.ImmutableMap; public class TriangleCountAlgorithm extends AbstractCommAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/WeakConnectedComponent.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/WeakConnectedComponent.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/WeakConnectedComponent.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/WeakConnectedComponent.java index 435a6e777..7aa682f64 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/comm/WeakConnectedComponent.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/WeakConnectedComponent.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm.comm; +package org.apache.hugegraph.job.algorithm.comm; import java.util.ArrayList; import java.util.HashMap; @@ -25,18 +25,18 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.schema.VertexLabel; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.Log; import com.google.common.collect.ImmutableMap; public class WeakConnectedComponent extends AbstractCommAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/path/RingsDetectAlgorithm.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/path/RingsDetectAlgorithm.java similarity index 91% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/path/RingsDetectAlgorithm.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/path/RingsDetectAlgorithm.java index e6c6435c4..55747987d 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/path/RingsDetectAlgorithm.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/path/RingsDetectAlgorithm.java @@ -17,19 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm.path; +package org.apache.hugegraph.job.algorithm.path; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.job.algorithm.AbstractAlgorithm; -import com.baidu.hugegraph.job.algorithm.Consumers.StopExecution; -import com.baidu.hugegraph.traversal.algorithm.SubGraphTraverser; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.ParameterUtil; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.job.algorithm.AbstractAlgorithm; +import org.apache.hugegraph.job.algorithm.Consumers.StopExecution; +import org.apache.hugegraph.traversal.algorithm.SubGraphTraverser; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.ParameterUtil; public class RingsDetectAlgorithm extends AbstractAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/rank/PageRankAlgorithm.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/rank/PageRankAlgorithm.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/rank/PageRankAlgorithm.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/rank/PageRankAlgorithm.java index 651aa9125..d39208685 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/rank/PageRankAlgorithm.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/rank/PageRankAlgorithm.java @@ -17,9 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm.rank; +package org.apache.hugegraph.job.algorithm.rank; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; import java.util.ArrayList; import java.util.HashMap; @@ -31,15 +32,14 @@ import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.job.algorithm.comm.AbstractCommAlgorithm; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.job.algorithm.comm.AbstractCommAlgorithm; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.Log; import com.google.common.collect.ImmutableMap; public class PageRankAlgorithm extends AbstractCommAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/similarity/FusiformSimilarityAlgorithm.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/similarity/FusiformSimilarityAlgorithm.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/similarity/FusiformSimilarityAlgorithm.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/similarity/FusiformSimilarityAlgorithm.java index cb62d71ff..5d9502351 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/algorithm/similarity/FusiformSimilarityAlgorithm.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/similarity/FusiformSimilarityAlgorithm.java @@ -17,23 +17,23 @@ * under the License. */ -package com.baidu.hugegraph.job.algorithm.similarity; +package org.apache.hugegraph.job.algorithm.similarity; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.job.UserJob; -import com.baidu.hugegraph.job.algorithm.AbstractAlgorithm; -import com.baidu.hugegraph.job.algorithm.Consumers.StopExecution; -import com.baidu.hugegraph.traversal.algorithm.FusiformSimilarityTraverser; -import com.baidu.hugegraph.traversal.algorithm.FusiformSimilarityTraverser.SimilarsMap; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.ParameterUtil; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.job.UserJob; +import org.apache.hugegraph.job.algorithm.AbstractAlgorithm; +import org.apache.hugegraph.job.algorithm.Consumers.StopExecution; +import org.apache.hugegraph.traversal.algorithm.FusiformSimilarityTraverser; +import org.apache.hugegraph.traversal.algorithm.FusiformSimilarityTraverser.SimilarsMap; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.ParameterUtil; public class FusiformSimilarityAlgorithm extends AbstractAlgorithm { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/AbstractComputer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/AbstractComputer.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/AbstractComputer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/AbstractComputer.java index 3ef49c751..34e29e21d 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/AbstractComputer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/AbstractComputer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.job.computer; +package org.apache.hugegraph.job.computer; import java.io.File; import java.io.InputStreamReader; @@ -34,16 +34,16 @@ import org.apache.commons.configuration2.io.FileHandler; import org.apache.commons.configuration2.tree.ImmutableNode; import org.apache.commons.configuration2.tree.NodeHandler; import org.apache.commons.configuration2.tree.NodeModel; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.ParameterUtil; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.job.ComputerJob; -import com.baidu.hugegraph.job.Job; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; -import com.baidu.hugegraph.util.ParameterUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.job.ComputerJob; +import org.apache.hugegraph.job.Job; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; public abstract class AbstractComputer implements Computer { @@ -57,6 +57,7 @@ public abstract class AbstractComputer implements Computer { private static final String EQUAL = "="; private static final String SPACE = " "; + // TODO: 2022/11/18 wait computer project adapt private static final String MAIN_COMMAND = "%s/bin/hadoop jar hugegraph-computer.jar " + "com.baidu.hugegraph.Computer " + diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/Computer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/Computer.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/Computer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/Computer.java index f73579659..55476a670 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/Computer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/Computer.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.job.computer; +package org.apache.hugegraph.job.computer; import java.util.Map; -import com.baidu.hugegraph.job.Job; +import org.apache.hugegraph.job.Job; public interface Computer { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/ComputerPool.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/ComputerPool.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/ComputerPool.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/ComputerPool.java index 699430398..ed5c1dc7a 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/ComputerPool.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/ComputerPool.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.job.computer; +package org.apache.hugegraph.job.computer; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/LouvainComputer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/LouvainComputer.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/LouvainComputer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/LouvainComputer.java index c463ede2e..a6f8207dd 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/LouvainComputer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/LouvainComputer.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.job.computer; +package org.apache.hugegraph.job.computer; import java.util.Map; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.ParameterUtil; +import org.apache.hugegraph.util.ParameterUtil; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableMap; public class LouvainComputer extends AbstractComputer { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/LpaComputer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/LpaComputer.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/LpaComputer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/LpaComputer.java index cb1fec943..a008542b5 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/LpaComputer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/LpaComputer.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.job.computer; +package org.apache.hugegraph.job.computer; import java.util.Map; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.ParameterUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.ParameterUtil; import com.google.common.collect.ImmutableMap; public class LpaComputer extends AbstractComputer { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/PageRankComputer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/PageRankComputer.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/PageRankComputer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/PageRankComputer.java index 8bbd81ac5..1dd1f865d 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/PageRankComputer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/PageRankComputer.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.job.computer; +package org.apache.hugegraph.job.computer; import java.util.Map; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.ParameterUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.ParameterUtil; import com.google.common.collect.ImmutableMap; public class PageRankComputer extends AbstractComputer { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/TriangleCountComputer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/TriangleCountComputer.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/TriangleCountComputer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/TriangleCountComputer.java index d4a882b27..c950d5b94 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/TriangleCountComputer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/TriangleCountComputer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.job.computer; +package org.apache.hugegraph.job.computer; import java.util.Map; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/WeakConnectedComponentComputer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/WeakConnectedComponentComputer.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/WeakConnectedComponentComputer.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/WeakConnectedComponentComputer.java index 11644fd49..3d04b8aba 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/computer/WeakConnectedComponentComputer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/computer/WeakConnectedComponentComputer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.job.computer; +package org.apache.hugegraph.job.computer; import java.util.Map; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/EdgeLabelRemoveJob.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/EdgeLabelRemoveJob.java similarity index 88% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/EdgeLabelRemoveJob.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/EdgeLabelRemoveJob.java index 92bafcd90..1e3edacd5 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/EdgeLabelRemoveJob.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/EdgeLabelRemoveJob.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.job.schema; +package org.apache.hugegraph.job.schema; import java.util.Set; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.backend.tx.SchemaTransaction; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.type.define.SchemaStatus; -import com.baidu.hugegraph.util.LockUtil; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.backend.tx.SchemaTransaction; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.type.define.SchemaStatus; +import org.apache.hugegraph.util.LockUtil; +import org.apache.hugegraph.HugeGraphParams; import com.google.common.collect.ImmutableSet; public class EdgeLabelRemoveJob extends SchemaJob { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/IndexLabelRebuildJob.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/IndexLabelRebuildJob.java similarity index 91% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/IndexLabelRebuildJob.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/IndexLabelRebuildJob.java index faeab1d9d..31c797795 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/IndexLabelRebuildJob.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/IndexLabelRebuildJob.java @@ -17,28 +17,28 @@ * under the License. */ -package com.baidu.hugegraph.job.schema; +package org.apache.hugegraph.job.schema; import java.util.Collection; import java.util.Set; import java.util.function.Consumer; import java.util.stream.Collectors; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.backend.tx.SchemaTransaction; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.SchemaStatus; +import org.apache.hugegraph.util.LockUtil; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.backend.tx.SchemaTransaction; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.schema.SchemaLabel; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.SchemaStatus; -import com.baidu.hugegraph.util.LockUtil; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.schema.SchemaLabel; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.structure.HugeElement; import com.google.common.collect.ImmutableSet; public class IndexLabelRebuildJob extends SchemaJob { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/IndexLabelRemoveJob.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/IndexLabelRemoveJob.java similarity index 88% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/IndexLabelRemoveJob.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/IndexLabelRemoveJob.java index 085b72aa1..b17b52b49 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/IndexLabelRemoveJob.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/IndexLabelRemoveJob.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.job.schema; +package org.apache.hugegraph.job.schema; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.backend.tx.SchemaTransaction; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.type.define.SchemaStatus; -import com.baidu.hugegraph.util.LockUtil; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.backend.tx.SchemaTransaction; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.type.define.SchemaStatus; +import org.apache.hugegraph.util.LockUtil; +import org.apache.hugegraph.HugeGraphParams; public class IndexLabelRemoveJob extends SchemaJob { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/OlapPropertyKeyClearJob.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/OlapPropertyKeyClearJob.java similarity index 88% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/OlapPropertyKeyClearJob.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/OlapPropertyKeyClearJob.java index a1639bdd1..beecc15f0 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/OlapPropertyKeyClearJob.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/OlapPropertyKeyClearJob.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.job.schema; +package org.apache.hugegraph.job.schema; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.backend.tx.SchemaTransaction; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.type.define.SchemaStatus; -import com.baidu.hugegraph.util.LockUtil; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.backend.tx.SchemaTransaction; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.type.define.SchemaStatus; +import org.apache.hugegraph.util.LockUtil; +import org.apache.hugegraph.HugeGraphParams; public class OlapPropertyKeyClearJob extends IndexLabelRemoveJob { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/OlapPropertyKeyCreateJob.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/OlapPropertyKeyCreateJob.java similarity index 90% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/OlapPropertyKeyCreateJob.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/OlapPropertyKeyCreateJob.java index fe515a635..f5c635b1f 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/OlapPropertyKeyCreateJob.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/OlapPropertyKeyCreateJob.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.job.schema; +package org.apache.hugegraph.job.schema; -import com.baidu.hugegraph.backend.tx.SchemaTransaction; -import com.baidu.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.backend.tx.SchemaTransaction; +import org.apache.hugegraph.schema.PropertyKey; public class OlapPropertyKeyCreateJob extends SchemaJob { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/OlapPropertyKeyRemoveJob.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/OlapPropertyKeyRemoveJob.java similarity index 89% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/OlapPropertyKeyRemoveJob.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/OlapPropertyKeyRemoveJob.java index dec00756e..e0caab566 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/OlapPropertyKeyRemoveJob.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/OlapPropertyKeyRemoveJob.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.job.schema; +package org.apache.hugegraph.job.schema; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.tx.SchemaTransaction; -import com.baidu.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.tx.SchemaTransaction; +import org.apache.hugegraph.schema.PropertyKey; public class OlapPropertyKeyRemoveJob extends OlapPropertyKeyClearJob { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/SchemaJob.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/SchemaJob.java similarity index 91% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/SchemaJob.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/SchemaJob.java index 4841ac484..3e7b49570 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/SchemaJob.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/SchemaJob.java @@ -17,21 +17,21 @@ * under the License. */ -package com.baidu.hugegraph.job.schema; +package org.apache.hugegraph.job.schema; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.tx.SchemaTransaction; +import org.apache.hugegraph.job.SysJob; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.type.HugeType; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.tx.SchemaTransaction; -import com.baidu.hugegraph.job.SysJob; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; public abstract class SchemaJob extends SysJob { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/VertexLabelRemoveJob.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/VertexLabelRemoveJob.java similarity index 88% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/VertexLabelRemoveJob.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/VertexLabelRemoveJob.java index 1b033c77d..61a70ea7b 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/VertexLabelRemoveJob.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/schema/VertexLabelRemoveJob.java @@ -17,20 +17,20 @@ * under the License. */ -package com.baidu.hugegraph.job.schema; +package org.apache.hugegraph.job.schema; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.backend.tx.SchemaTransaction; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.type.define.SchemaStatus; -import com.baidu.hugegraph.util.LockUtil; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.backend.tx.SchemaTransaction; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.type.define.SchemaStatus; +import org.apache.hugegraph.util.LockUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraphParams; import com.google.common.collect.ImmutableSet; public class VertexLabelRemoveJob extends SchemaJob { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/system/DeleteExpiredElementJob.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/system/DeleteExpiredElementJob.java similarity index 89% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/system/DeleteExpiredElementJob.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/system/DeleteExpiredElementJob.java index 21f721525..00de9a137 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/system/DeleteExpiredElementJob.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/system/DeleteExpiredElementJob.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.job.system; +package org.apache.hugegraph.job.system; import java.util.Set; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.util.E; public class DeleteExpiredElementJob extends DeleteExpiredJob { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/system/DeleteExpiredIndexJob.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/system/DeleteExpiredIndexJob.java similarity index 89% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/system/DeleteExpiredIndexJob.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/system/DeleteExpiredIndexJob.java index d7889a3be..213ddd1e3 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/system/DeleteExpiredIndexJob.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/system/DeleteExpiredIndexJob.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.job.system; +package org.apache.hugegraph.job.system; import java.util.Iterator; import java.util.Set; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.query.IdQuery; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.structure.HugeIndex; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.query.IdQuery; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.structure.HugeIndex; +import org.apache.hugegraph.util.E; public class DeleteExpiredIndexJob extends DeleteExpiredJob { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/system/DeleteExpiredJob.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/system/DeleteExpiredJob.java similarity index 85% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/system/DeleteExpiredJob.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/system/DeleteExpiredJob.java index ea5cdcfd3..11ba58fa4 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/system/DeleteExpiredJob.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/system/DeleteExpiredJob.java @@ -17,20 +17,20 @@ * under the License. */ -package com.baidu.hugegraph.job.system; +package org.apache.hugegraph.job.system; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.task.HugeTask; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.job.EphemeralJob; -import com.baidu.hugegraph.job.EphemeralJobBuilder; -import com.baidu.hugegraph.job.system.JobCounters.JobCounter; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.structure.HugeIndex; -import com.baidu.hugegraph.task.HugeTask; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.job.EphemeralJob; +import org.apache.hugegraph.job.EphemeralJobBuilder; +import org.apache.hugegraph.job.system.JobCounters.JobCounter; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.structure.HugeIndex; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; public abstract class DeleteExpiredJob extends EphemeralJob { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/system/JobCounters.java b/hugegraph-core/src/main/java/org/apache/hugegraph/job/system/JobCounters.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/job/system/JobCounters.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/job/system/JobCounters.java index 9f4bb1cae..0b8c7e279 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/system/JobCounters.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/job/system/JobCounters.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.job.system; +package org.apache.hugegraph.job.system; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.structure.HugeIndex; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.structure.HugeIndex; public class JobCounters { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/plugin/HugeGraphGremlinPlugin.java b/hugegraph-core/src/main/java/org/apache/hugegraph/plugin/HugeGraphGremlinPlugin.java similarity index 90% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/plugin/HugeGraphGremlinPlugin.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/plugin/HugeGraphGremlinPlugin.java index 6051a0546..732f324aa 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/plugin/HugeGraphGremlinPlugin.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/plugin/HugeGraphGremlinPlugin.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.plugin; +package org.apache.hugegraph.plugin; import java.io.IOException; import java.util.HashSet; @@ -28,14 +28,14 @@ import org.apache.tinkerpop.gremlin.jsr223.AbstractGremlinPlugin; import org.apache.tinkerpop.gremlin.jsr223.DefaultImportCustomizer; import org.apache.tinkerpop.gremlin.jsr223.ImportCustomizer; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.util.ReflectionUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.util.ReflectionUtil; import com.google.common.reflect.ClassPath; public class HugeGraphGremlinPlugin extends AbstractGremlinPlugin { - private static final String PACKAGE = "com.baidu.hugegraph.type.define"; + private static final String PACKAGE = "org.apache.hugegraph.type.define"; private static final String NAME = "HugeGraph"; private static final HugeGraphGremlinPlugin INSTANCE; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/plugin/HugeGraphPlugin.java b/hugegraph-core/src/main/java/org/apache/hugegraph/plugin/HugeGraphPlugin.java similarity index 84% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/plugin/HugeGraphPlugin.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/plugin/HugeGraphPlugin.java index 742e56ef4..1cf8b68f4 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/plugin/HugeGraphPlugin.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/plugin/HugeGraphPlugin.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.plugin; +package org.apache.hugegraph.plugin; -import com.baidu.hugegraph.analyzer.AnalyzerFactory; -import com.baidu.hugegraph.backend.serializer.SerializerFactory; -import com.baidu.hugegraph.backend.store.BackendProviderFactory; -import com.baidu.hugegraph.config.OptionSpace; +import org.apache.hugegraph.backend.store.BackendProviderFactory; +import org.apache.hugegraph.analyzer.AnalyzerFactory; +import org.apache.hugegraph.backend.serializer.SerializerFactory; +import org.apache.hugegraph.config.OptionSpace; public interface HugeGraphPlugin { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/rpc/RpcServiceConfig4Client.java b/hugegraph-core/src/main/java/org/apache/hugegraph/rpc/RpcServiceConfig4Client.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/rpc/RpcServiceConfig4Client.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/rpc/RpcServiceConfig4Client.java index 0833980d9..333f0abc8 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/rpc/RpcServiceConfig4Client.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/rpc/RpcServiceConfig4Client.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.rpc; +package org.apache.hugegraph.rpc; public interface RpcServiceConfig4Client { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/rpc/RpcServiceConfig4Server.java b/hugegraph-core/src/main/java/org/apache/hugegraph/rpc/RpcServiceConfig4Server.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/rpc/RpcServiceConfig4Server.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/rpc/RpcServiceConfig4Server.java index 23541e313..adf125c5b 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/rpc/RpcServiceConfig4Server.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/rpc/RpcServiceConfig4Server.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.rpc; +package org.apache.hugegraph.rpc; public interface RpcServiceConfig4Server { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/EdgeLabel.java b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/EdgeLabel.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/schema/EdgeLabel.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/schema/EdgeLabel.java index 742b9de07..5f5a25d53 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/EdgeLabel.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/EdgeLabel.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.schema; +package org.apache.hugegraph.schema; import java.util.ArrayList; import java.util.Arrays; @@ -25,12 +25,12 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.schema.builder.SchemaBuilder; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Frequency; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.schema.builder.SchemaBuilder; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Frequency; +import org.apache.hugegraph.util.E; import com.google.common.base.Objects; public class EdgeLabel extends SchemaLabel { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/IndexLabel.java b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/IndexLabel.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/schema/IndexLabel.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/schema/IndexLabel.java index 64c9723e2..392d4dde0 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/IndexLabel.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/IndexLabel.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.schema; +package org.apache.hugegraph.schema; import java.util.ArrayList; import java.util.Arrays; @@ -25,13 +25,13 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.schema.builder.SchemaBuilder; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.IndexType; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.schema.builder.SchemaBuilder; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.IndexType; +import org.apache.hugegraph.util.E; import com.google.common.base.Objects; public class IndexLabel extends SchemaElement { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/PropertyKey.java b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/PropertyKey.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/schema/PropertyKey.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/schema/PropertyKey.java index b38070b07..e397af2b0 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/PropertyKey.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/PropertyKey.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.schema; +package org.apache.hugegraph.schema; import java.util.ArrayList; import java.util.Collection; @@ -27,19 +27,19 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -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.Propertiable; -import com.baidu.hugegraph.type.define.AggregateType; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.type.define.WriteType; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.LongEncoding; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.schema.builder.SchemaBuilder; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.Propertiable; +import org.apache.hugegraph.type.define.AggregateType; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.DataType; +import org.apache.hugegraph.type.define.WriteType; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.LongEncoding; public class PropertyKey extends SchemaElement implements Propertiable { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/SchemaElement.java b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/SchemaElement.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/schema/SchemaElement.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/schema/SchemaElement.java index 5b37e91e3..3dcc6f5ec 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/SchemaElement.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/SchemaElement.java @@ -17,21 +17,21 @@ * under the License. */ -package com.baidu.hugegraph.schema; +package org.apache.hugegraph.schema; import java.util.Collections; import java.util.Map; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; import org.apache.tinkerpop.gremlin.structure.Graph; -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.Nameable; -import com.baidu.hugegraph.type.Typeable; -import com.baidu.hugegraph.type.define.SchemaStatus; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.type.Nameable; +import org.apache.hugegraph.type.Typeable; +import org.apache.hugegraph.type.define.SchemaStatus; +import org.apache.hugegraph.util.E; import com.google.common.base.Objects; public abstract class SchemaElement implements Nameable, Typeable, diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/SchemaLabel.java b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/SchemaLabel.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/schema/SchemaLabel.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/schema/SchemaLabel.java index ed8c1c1a8..35124a74d 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/SchemaLabel.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/SchemaLabel.java @@ -17,21 +17,21 @@ * under the License. */ -package com.baidu.hugegraph.schema; +package org.apache.hugegraph.schema; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.Set; -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.HugeType; -import com.baidu.hugegraph.type.Indexable; -import com.baidu.hugegraph.type.Propertiable; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.Indexable; +import org.apache.hugegraph.type.Propertiable; +import org.apache.hugegraph.util.E; import com.google.common.base.Objects; public abstract class SchemaLabel extends SchemaElement diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/SchemaManager.java b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/SchemaManager.java similarity index 90% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/schema/SchemaManager.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/schema/SchemaManager.java index 587e966e9..ccaa4e303 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/SchemaManager.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/SchemaManager.java @@ -17,22 +17,22 @@ * under the License. */ -package com.baidu.hugegraph.schema; +package org.apache.hugegraph.schema; import java.util.List; import java.util.stream.Collectors; +import org.apache.hugegraph.backend.tx.SchemaTransaction; import org.apache.tinkerpop.gremlin.structure.Graph; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.tx.SchemaTransaction; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.schema.builder.EdgeLabelBuilder; -import com.baidu.hugegraph.schema.builder.IndexLabelBuilder; -import com.baidu.hugegraph.schema.builder.PropertyKeyBuilder; -import com.baidu.hugegraph.schema.builder.VertexLabelBuilder; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.schema.builder.EdgeLabelBuilder; +import org.apache.hugegraph.schema.builder.IndexLabelBuilder; +import org.apache.hugegraph.schema.builder.PropertyKeyBuilder; +import org.apache.hugegraph.schema.builder.VertexLabelBuilder; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.E; public class SchemaManager { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/Userdata.java b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/Userdata.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/schema/Userdata.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/schema/Userdata.java index 7fcbdad83..654047da5 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/Userdata.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/Userdata.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.schema; +package org.apache.hugegraph.schema; import java.util.HashMap; import java.util.Map; -import com.baidu.hugegraph.exception.NotAllowException; -import com.baidu.hugegraph.type.define.Action; +import org.apache.hugegraph.exception.NotAllowException; +import org.apache.hugegraph.type.define.Action; public class Userdata extends HashMap { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/VertexLabel.java b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/VertexLabel.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/schema/VertexLabel.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/schema/VertexLabel.java index 49f4d84cb..61459db9f 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/VertexLabel.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/VertexLabel.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.schema; +package org.apache.hugegraph.schema; import java.util.ArrayList; import java.util.Arrays; @@ -25,12 +25,12 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.schema.builder.SchemaBuilder; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.IdStrategy; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.schema.builder.SchemaBuilder; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.IdStrategy; import com.google.common.base.Objects; public class VertexLabel extends SchemaLabel { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/builder/AbstractBuilder.java b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/builder/AbstractBuilder.java similarity index 81% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/schema/builder/AbstractBuilder.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/schema/builder/AbstractBuilder.java index 152f6584d..81bca2fb0 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/builder/AbstractBuilder.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/builder/AbstractBuilder.java @@ -17,26 +17,26 @@ * under the License. */ -package com.baidu.hugegraph.schema.builder; +package org.apache.hugegraph.schema.builder; import java.util.Set; import java.util.function.Function; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.tx.SchemaTransaction; -import com.baidu.hugegraph.exception.ExistedException; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.GraphMode; -import com.baidu.hugegraph.type.define.SchemaStatus; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.LockUtil; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.tx.SchemaTransaction; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.exception.ExistedException; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.GraphMode; +import org.apache.hugegraph.type.define.SchemaStatus; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.LockUtil; public abstract class AbstractBuilder { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/builder/EdgeLabelBuilder.java b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/builder/EdgeLabelBuilder.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/schema/builder/EdgeLabelBuilder.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/schema/builder/EdgeLabelBuilder.java index 13b84d2be..57a480fbd 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/builder/EdgeLabelBuilder.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/builder/EdgeLabelBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.schema.builder; +package org.apache.hugegraph.schema.builder; import java.util.ArrayList; import java.util.Arrays; @@ -29,22 +29,22 @@ import java.util.Set; import org.apache.commons.collections.CollectionUtils; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.tx.SchemaTransaction; -import com.baidu.hugegraph.exception.ExistedException; -import com.baidu.hugegraph.exception.NotAllowException; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.Userdata; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Action; -import com.baidu.hugegraph.type.define.Frequency; -import com.baidu.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.tx.SchemaTransaction; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.Userdata; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.exception.ExistedException; +import org.apache.hugegraph.exception.NotAllowException; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Action; +import org.apache.hugegraph.type.define.Frequency; +import org.apache.hugegraph.util.CollectionUtil; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableList; public class EdgeLabelBuilder extends AbstractBuilder diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/builder/IndexLabelBuilder.java b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/builder/IndexLabelBuilder.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/schema/builder/IndexLabelBuilder.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/schema/builder/IndexLabelBuilder.java index ab00d7f81..48bd55b4d 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/builder/IndexLabelBuilder.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/builder/IndexLabelBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.schema.builder; +package org.apache.hugegraph.schema.builder; import java.util.ArrayList; import java.util.Arrays; @@ -27,31 +27,31 @@ import java.util.Set; import java.util.concurrent.TimeoutException; import java.util.function.BiPredicate; -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.backend.tx.SchemaTransaction; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.exception.ExistedException; -import com.baidu.hugegraph.exception.NotAllowException; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.schema.SchemaLabel; -import com.baidu.hugegraph.schema.Userdata; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Action; -import com.baidu.hugegraph.type.define.CollectionType; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.type.define.IndexType; -import com.baidu.hugegraph.type.define.SchemaStatus; -import com.baidu.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.collection.IdSet; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.tx.SchemaTransaction; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.exception.ExistedException; +import org.apache.hugegraph.exception.NotAllowException; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.schema.SchemaLabel; +import org.apache.hugegraph.schema.Userdata; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Action; +import org.apache.hugegraph.type.define.CollectionType; +import org.apache.hugegraph.type.define.DataType; +import org.apache.hugegraph.type.define.IndexType; +import org.apache.hugegraph.type.define.SchemaStatus; +import org.apache.hugegraph.util.CollectionUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.collection.IdSet; public class IndexLabelBuilder extends AbstractBuilder implements IndexLabel.Builder { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/builder/PropertyKeyBuilder.java b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/builder/PropertyKeyBuilder.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/schema/builder/PropertyKeyBuilder.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/schema/builder/PropertyKeyBuilder.java index 92941cfcc..10b0c19c1 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/builder/PropertyKeyBuilder.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/builder/PropertyKeyBuilder.java @@ -17,31 +17,31 @@ * under the License. */ -package com.baidu.hugegraph.schema.builder; +package org.apache.hugegraph.schema.builder; import java.util.Map; import java.util.concurrent.TimeoutException; -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.backend.tx.SchemaTransaction; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.exception.ExistedException; -import com.baidu.hugegraph.exception.NotAllowException; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.schema.Userdata; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Action; -import com.baidu.hugegraph.type.define.AggregateType; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.type.define.WriteType; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.tx.SchemaTransaction; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.schema.Userdata; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.exception.ExistedException; +import org.apache.hugegraph.exception.NotAllowException; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Action; +import org.apache.hugegraph.type.define.AggregateType; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.DataType; +import org.apache.hugegraph.type.define.WriteType; +import org.apache.hugegraph.util.E; public class PropertyKeyBuilder extends AbstractBuilder implements PropertyKey.Builder { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/builder/SchemaBuilder.java b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/builder/SchemaBuilder.java similarity index 88% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/schema/builder/SchemaBuilder.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/schema/builder/SchemaBuilder.java index f09d4644a..b6cf47ee4 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/builder/SchemaBuilder.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/builder/SchemaBuilder.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.schema.builder; +package org.apache.hugegraph.schema.builder; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.schema.SchemaElement; public interface SchemaBuilder { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/builder/VertexLabelBuilder.java b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/builder/VertexLabelBuilder.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/schema/builder/VertexLabelBuilder.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/schema/builder/VertexLabelBuilder.java index 533245d71..71161b94f 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/schema/builder/VertexLabelBuilder.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/schema/builder/VertexLabelBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.schema.builder; +package org.apache.hugegraph.schema.builder; import java.util.ArrayList; import java.util.Arrays; @@ -29,21 +29,21 @@ import java.util.Set; import org.apache.commons.collections.CollectionUtils; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.tx.SchemaTransaction; -import com.baidu.hugegraph.exception.ExistedException; -import com.baidu.hugegraph.exception.NotAllowException; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.Userdata; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Action; -import com.baidu.hugegraph.type.define.IdStrategy; -import com.baidu.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.tx.SchemaTransaction; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.Userdata; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.exception.ExistedException; +import org.apache.hugegraph.exception.NotAllowException; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Action; +import org.apache.hugegraph.type.define.IdStrategy; +import org.apache.hugegraph.util.CollectionUtil; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableList; public class VertexLabelBuilder extends AbstractBuilder diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/security/HugeSecurityManager.java b/hugegraph-core/src/main/java/org/apache/hugegraph/security/HugeSecurityManager.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/security/HugeSecurityManager.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/security/HugeSecurityManager.java index 55e33b825..e18702aa1 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/security/HugeSecurityManager.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/security/HugeSecurityManager.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.security; +package org.apache.hugegraph.security; import java.io.FileDescriptor; import java.net.InetAddress; @@ -28,7 +28,7 @@ import java.util.concurrent.CopyOnWriteArraySet; import org.slf4j.Logger; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.util.Log; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -76,22 +76,22 @@ public class HugeSecurityManager extends SecurityManager { private static final Map> ASYNC_TASKS = ImmutableMap.of( // Fixed https://github.com/hugegraph/hugegraph/pull/892#issue-387202362 - "com.baidu.hugegraph.backend.tx.SchemaTransaction", + "org.apache.hugegraph.backend.tx.SchemaTransaction", ImmutableSet.of("removeVertexLabel", "removeEdgeLabel", "removeIndexLabel", "rebuildIndex"), - "com.baidu.hugegraph.backend.tx.GraphIndexTransaction", + "org.apache.hugegraph.backend.tx.GraphIndexTransaction", ImmutableSet.of("asyncRemoveIndexLeft") ); private static final Map> BACKEND_SOCKET = ImmutableMap.of( // Fixed #758 - "com.baidu.hugegraph.backend.store.mysql.MysqlStore", + "org.apache.hugegraph.backend.store.mysql.MysqlStore", ImmutableSet.of("open", "init", "clear", "opened", "initialized") ); private static final Map> BACKEND_THREAD = ImmutableMap.of( // Fixed #758 - "com.baidu.hugegraph.backend.store.cassandra.CassandraStore", + "org.apache.hugegraph.backend.store.cassandra.CassandraStore", ImmutableSet.of("open", "opened", "init"), // Fixed https://github.com/hugegraph/hugegraph/pull/892#issuecomment-598545072 "com.datastax.driver.core.AbstractSession", @@ -99,24 +99,24 @@ public class HugeSecurityManager extends SecurityManager { ); private static final Map> BACKEND_SNAPSHOT = ImmutableMap.of( - "com.baidu.hugegraph.backend.store.AbstractBackendStoreProvider", + "org.apache.hugegraph.backend.store.AbstractBackendStoreProvider", ImmutableSet.of("createSnapshot", "resumeSnapshot"), - "com.baidu.hugegraph.backend.store.raft.RaftBackendStoreProvider", + "org.apache.hugegraph.backend.store.raft.RaftBackendStoreProvider", ImmutableSet.of("createSnapshot", "resumeSnapshot") ); private static final Set HBASE_CLASSES = ImmutableSet.of( // Fixed #758 - "com.baidu.hugegraph.backend.store.hbase.HbaseStore", - "com.baidu.hugegraph.backend.store.hbase.HbaseStore$HbaseSchemaStore", - "com.baidu.hugegraph.backend.store.hbase.HbaseStore$HbaseGraphStore", - "com.baidu.hugegraph.backend.store.hbase.HbaseSessions$RowIterator" + "org.apache.hugegraph.backend.store.hbase.HbaseStore", + "org.apache.hugegraph.backend.store.hbase.HbaseStore$HbaseSchemaStore", + "org.apache.hugegraph.backend.store.hbase.HbaseStore$HbaseGraphStore", + "org.apache.hugegraph.backend.store.hbase.HbaseSessions$RowIterator" ); private static final Set RAFT_CLASSES = ImmutableSet.of( - "com.baidu.hugegraph.backend.store.raft.RaftNode", - "com.baidu.hugegraph.backend.store.raft.StoreStateMachine", - "com.baidu.hugegraph.backend.store.raft.rpc.RpcForwarder" + "org.apache.hugegraph.backend.store.raft.RaftNode", + "org.apache.hugegraph.backend.store.raft.StoreStateMachine", + "org.apache.hugegraph.backend.store.raft.rpc.RpcForwarder" ); private static final Set SOFA_RPC_CLASSES = ImmutableSet.of( @@ -125,7 +125,7 @@ public class HugeSecurityManager extends SecurityManager { ); private static final Map> NEW_SECURITY_EXCEPTION = ImmutableMap.of( - "com.baidu.hugegraph.security.HugeSecurityManager", + "org.apache.hugegraph.security.HugeSecurityManager", ImmutableSet.of("newSecurityException") ); @@ -433,7 +433,7 @@ public class HugeSecurityManager extends SecurityManager { private static boolean callFromEventHubNotify() { // Fixed issue #758 // notify() will create thread when submit task to executor - return callFromMethod("com.baidu.hugegraph.event.EventHub", "notify"); + return callFromMethod("org.apache.hugegraph.event.EventHub", "notify"); } private static boolean callFromAsyncTasks() { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/GraphType.java b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/GraphType.java similarity index 87% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/structure/GraphType.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/structure/GraphType.java index c93cfac69..e964a19d5 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/GraphType.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/GraphType.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.structure; +package org.apache.hugegraph.structure; -import com.baidu.hugegraph.type.Nameable; -import com.baidu.hugegraph.type.Typeable; +import org.apache.hugegraph.type.Nameable; +import org.apache.hugegraph.type.Typeable; public interface GraphType extends Nameable, Typeable { } diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeEdge.java b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeEdge.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeEdge.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeEdge.java index 5f8c24852..daa091202 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeEdge.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeEdge.java @@ -17,12 +17,26 @@ * under the License. */ -package com.baidu.hugegraph.structure; +package org.apache.hugegraph.structure; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.EdgeId; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.HugeKeys; import org.apache.logging.log4j.util.Strings; import org.apache.tinkerpop.gremlin.structure.Direction; import org.apache.tinkerpop.gremlin.structure.Edge; @@ -30,23 +44,9 @@ import org.apache.tinkerpop.gremlin.structure.Property; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.util.StringFactory; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.EdgeId; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableList; public class HugeEdge extends HugeElement implements Edge, Cloneable { @@ -492,7 +492,7 @@ public class HugeEdge extends HugeElement implements Edge, Cloneable { public static final EdgeId getIdValue(Object idValue, boolean returnNullIfError) { - Id id = HugeElement.getIdValue(idValue); + Id id = getIdValue(idValue); if (id == null || id instanceof EdgeId) { return (EdgeId) id; } diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeEdgeProperty.java b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeEdgeProperty.java similarity index 91% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeEdgeProperty.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeEdgeProperty.java index c19152bae..2b93a22e0 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeEdgeProperty.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeEdgeProperty.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.structure; +package org.apache.hugegraph.structure; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.type.HugeType; import org.apache.tinkerpop.gremlin.structure.Property; import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.util.E; public class HugeEdgeProperty extends HugeProperty { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeElement.java b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeElement.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeElement.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeElement.java index 7c5a2598f..3e5d56ca0 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeElement.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeElement.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure; +package org.apache.hugegraph.structure; import java.util.ArrayList; import java.util.Collection; @@ -29,6 +29,19 @@ import java.util.Set; import java.util.UUID; import java.util.function.Supplier; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.EdgeId; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaLabel; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.Idfiable; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.collection.CollectionFactory; import org.apache.tinkerpop.gremlin.structure.Element; import org.apache.tinkerpop.gremlin.structure.Property; import org.apache.tinkerpop.gremlin.structure.T; @@ -36,24 +49,11 @@ import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; import org.eclipse.collections.api.iterator.IntIterator; import org.eclipse.collections.api.map.primitive.MutableIntObjectMap; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.EdgeId; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaLabel; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.Idfiable; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.collection.CollectionFactory; +import org.apache.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.util.CollectionUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; public abstract class HugeElement implements Element, GraphType, Idfiable { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeFeatures.java b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeFeatures.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeFeatures.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeFeatures.java index 1823cd957..85517c9d6 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeFeatures.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeFeatures.java @@ -17,19 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.structure; +package org.apache.hugegraph.structure; import java.util.UUID; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.config.CoreOptions; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.VertexProperty; import org.apache.tinkerpop.gremlin.structure.util.FeatureDescriptor; import org.apache.tinkerpop.gremlin.structure.util.StringFactory; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.config.CoreOptions; - public class HugeFeatures implements Graph.Features { protected final HugeGraph graph; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeIndex.java b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeIndex.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeIndex.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeIndex.java index fec8a0a94..6de1833f5 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeIndex.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeIndex.java @@ -17,28 +17,28 @@ * under the License. */ -package com.baidu.hugegraph.structure; +package org.apache.hugegraph.structure; import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.Id.IdType; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.id.SplicingIdGenerator; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.HashUtil; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.NumericUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.Id.IdType; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.id.SplicingIdGenerator; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.DataType; +import org.apache.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.HashUtil; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.NumericUtil; public class HugeIndex implements GraphType, Cloneable { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeProperty.java b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeProperty.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeProperty.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeProperty.java index bbcce906d..829efb3ba 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeProperty.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeProperty.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.structure; +package org.apache.hugegraph.structure; import java.util.NoSuchElementException; +import org.apache.hugegraph.backend.id.SplicingIdGenerator; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.type.HugeType; import org.apache.tinkerpop.gremlin.structure.Property; import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; import org.apache.tinkerpop.gremlin.structure.util.StringFactory; -import com.baidu.hugegraph.backend.id.SplicingIdGenerator; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.util.E; public abstract class HugeProperty implements Property, GraphType { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeVertex.java b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeVertex.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeVertex.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeVertex.java index f8021ea87..9fae700e6 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeVertex.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeVertex.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure; +package org.apache.hugegraph.structure; import java.util.ArrayList; import java.util.Collection; @@ -28,6 +28,22 @@ import java.util.List; import java.util.Set; import org.apache.commons.collections.CollectionUtils; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.id.SnowflakeIdGenerator; +import org.apache.hugegraph.backend.id.SplicingIdGenerator; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.collection.CollectionFactory; import org.apache.logging.log4j.util.Strings; import org.apache.tinkerpop.gremlin.structure.Direction; import org.apache.tinkerpop.gremlin.structure.Edge; @@ -37,30 +53,14 @@ import org.apache.tinkerpop.gremlin.structure.VertexProperty; import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; import org.apache.tinkerpop.gremlin.structure.util.StringFactory; -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.backend.id.SnowflakeIdGenerator; -import com.baidu.hugegraph.backend.id.SplicingIdGenerator; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.CollectionType; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.type.define.IdStrategy; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.collection.CollectionFactory; +import org.apache.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.CollectionType; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.type.define.IdStrategy; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableList; public class HugeVertex extends HugeElement implements Vertex, Cloneable { @@ -277,7 +277,7 @@ public class HugeVertex extends HugeElement implements Vertex, Cloneable { public HugeEdge constructEdge(String label, HugeVertex vertex, Object... keyValues) { - ElementKeys elemKeys = HugeElement.classifyKeys(keyValues); + ElementKeys elemKeys = classifyKeys(keyValues); // Check id (must be null) if (elemKeys.id() != null) { throw Edge.Exceptions.userSuppliedIdsNotSupported(); diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeVertexProperty.java b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeVertexProperty.java similarity index 90% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeVertexProperty.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeVertexProperty.java index aaa0ebb89..406a22a7a 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeVertexProperty.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeVertexProperty.java @@ -17,20 +17,20 @@ * under the License. */ -package com.baidu.hugegraph.structure; +package org.apache.hugegraph.structure; import java.util.Iterator; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.type.HugeType; import org.apache.tinkerpop.gremlin.structure.Element; import org.apache.tinkerpop.gremlin.structure.Property; import org.apache.tinkerpop.gremlin.structure.VertexProperty; import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.util.E; public class HugeVertexProperty extends HugeProperty implements VertexProperty { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/task/HugeServerInfo.java b/hugegraph-core/src/main/java/org/apache/hugegraph/task/HugeServerInfo.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/task/HugeServerInfo.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/task/HugeServerInfo.java index f43bf9ec0..17b0c8548 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/task/HugeServerInfo.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/task/HugeServerInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.task; +package org.apache.hugegraph.task; import java.util.ArrayList; import java.util.Date; @@ -26,26 +26,26 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.DataType; +import org.apache.hugegraph.type.define.NodeRole; +import org.apache.hugegraph.type.define.SerialEnum; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.VertexProperty; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.type.define.NodeRole; -import com.baidu.hugegraph.type.define.SerialEnum; -import com.baidu.hugegraph.util.DateUtil; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.util.DateUtil; +import org.apache.hugegraph.util.E; public class HugeServerInfo { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/task/HugeTask.java b/hugegraph-core/src/main/java/org/apache/hugegraph/task/HugeTask.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/task/HugeTask.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/task/HugeTask.java index bf60af396..908155ff0 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/task/HugeTask.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/task/HugeTask.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.task; +package org.apache.hugegraph.task; import java.util.ArrayList; import java.util.Collections; @@ -31,29 +31,27 @@ import java.util.concurrent.FutureTask; import java.util.stream.Collector; import java.util.stream.Collectors; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.type.define.SerialEnum; +import org.apache.hugegraph.util.*; import org.apache.tinkerpop.gremlin.structure.Graph.Hidden; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.hugegraph.util.Blob; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.StringEncoding; import org.slf4j.Logger; -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.backend.serializer.BytesBuffer; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.exception.LimitExceedException; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.job.ComputerJob; -import com.baidu.hugegraph.job.EphemeralJob; -import com.baidu.hugegraph.type.define.SerialEnum; -import com.baidu.hugegraph.util.Blob; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.Log; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.exception.LimitExceedException; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.job.ComputerJob; +import org.apache.hugegraph.job.EphemeralJob; public class HugeTask extends FutureTask { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/task/ServerInfoManager.java b/hugegraph-core/src/main/java/org/apache/hugegraph/task/ServerInfoManager.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/task/ServerInfoManager.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/task/ServerInfoManager.java index ce7e0e3b0..db91e09cb 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/task/ServerInfoManager.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/task/ServerInfoManager.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.task; +package org.apache.hugegraph.task; -import static com.baidu.hugegraph.backend.query.Query.NO_LIMIT; +import static org.apache.hugegraph.backend.query.Query.NO_LIMIT; import java.util.Collection; import java.util.Iterator; @@ -27,30 +27,31 @@ import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.page.PageInfo; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.type.define.NodeRole; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.page.PageInfo; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.exception.ConnectionException; -import com.baidu.hugegraph.iterator.ListIterator; -import com.baidu.hugegraph.iterator.MapperIterator; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.type.define.NodeRole; -import com.baidu.hugegraph.util.DateUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.exception.ConnectionException; +import org.apache.hugegraph.iterator.ListIterator; +import org.apache.hugegraph.iterator.MapperIterator; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.util.DateUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.google.common.collect.ImmutableMap; public class ServerInfoManager { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/task/StandardTaskScheduler.java b/hugegraph-core/src/main/java/org/apache/hugegraph/task/StandardTaskScheduler.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/task/StandardTaskScheduler.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/task/StandardTaskScheduler.java index bdeb9fc22..b6570f14c 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/task/StandardTaskScheduler.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/task/StandardTaskScheduler.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.task; +package org.apache.hugegraph.task; import java.util.ArrayList; import java.util.Collection; @@ -31,40 +31,40 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeoutException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.page.PageInfo; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.DataType; +import org.apache.hugegraph.type.define.HugeKeys; import org.apache.tinkerpop.gremlin.structure.Graph.Hidden; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.page.PageInfo; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.exception.ConnectionException; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.iterator.ExtendableIterator; -import com.baidu.hugegraph.iterator.MapperIterator; -import com.baidu.hugegraph.job.EphemeralJob; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.task.HugeTask.P; -import com.baidu.hugegraph.task.TaskCallable.SysTaskCallable; -import com.baidu.hugegraph.task.TaskManager.ContextCallable; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.exception.ConnectionException; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.iterator.ExtendableIterator; +import org.apache.hugegraph.iterator.MapperIterator; +import org.apache.hugegraph.job.EphemeralJob; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.task.HugeTask.P; +import org.apache.hugegraph.task.TaskCallable.SysTaskCallable; +import org.apache.hugegraph.task.TaskManager.ContextCallable; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.google.common.collect.ImmutableMap; public class StandardTaskScheduler implements TaskScheduler { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/task/TaskCallable.java b/hugegraph-core/src/main/java/org/apache/hugegraph/task/TaskCallable.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/task/TaskCallable.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/task/TaskCallable.java index d439f1d56..151b49139 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/task/TaskCallable.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/task/TaskCallable.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.task; +package org.apache.hugegraph.task; import java.util.Date; import java.util.Set; @@ -26,11 +26,11 @@ import java.util.concurrent.Callable; import org.apache.tinkerpop.gremlin.structure.Transaction; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.google.common.collect.ImmutableSet; public abstract class TaskCallable implements Callable { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/task/TaskManager.java b/hugegraph-core/src/main/java/org/apache/hugegraph/task/TaskManager.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/task/TaskManager.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/task/TaskManager.java index 723391e0b..4086390b5 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/task/TaskManager.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/task/TaskManager.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.task; +package org.apache.hugegraph.task; import java.util.Map; import java.util.Queue; @@ -28,16 +28,14 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import org.apache.hugegraph.util.*; +import org.apache.hugegraph.util.Consumers; +import org.apache.hugegraph.util.LockUtil; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.concurrent.PausableScheduledThreadPool; -import com.baidu.hugegraph.util.Consumers; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.ExecutorUtil; -import com.baidu.hugegraph.util.LockUtil; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.concurrent.PausableScheduledThreadPool; public final class TaskManager { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/task/TaskScheduler.java b/hugegraph-core/src/main/java/org/apache/hugegraph/task/TaskScheduler.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/task/TaskScheduler.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/task/TaskScheduler.java index 22e4864ff..0a0e97d4f 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/task/TaskScheduler.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/task/TaskScheduler.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.task; +package org.apache.hugegraph.task; import java.util.Iterator; import java.util.List; import java.util.concurrent.Future; import java.util.concurrent.TimeoutException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.HugeGraph; public interface TaskScheduler { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/task/TaskStatus.java b/hugegraph-core/src/main/java/org/apache/hugegraph/task/TaskStatus.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/task/TaskStatus.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/task/TaskStatus.java index ec5053d31..3fa7b4b15 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/task/TaskStatus.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/task/TaskStatus.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.task; +package org.apache.hugegraph.task; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.type.define.SerialEnum; +import org.apache.hugegraph.type.define.SerialEnum; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/CollectionPathsTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/CollectionPathsTraverser.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/CollectionPathsTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/CollectionPathsTraverser.java index 256269739..1558428aa 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/CollectionPathsTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/CollectionPathsTraverser.java @@ -17,21 +17,21 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.traversal.algorithm.strategy.TraverseStrategy; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.traversal.algorithm.strategy.TraverseStrategy; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableList; public class CollectionPathsTraverser extends HugeTraverser { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/CountTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/CountTraverser.java similarity index 90% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/CountTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/CountTraverser.java index af8ad2c83..1e46620e6 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/CountTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/CountTraverser.java @@ -17,23 +17,23 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Iterator; import java.util.List; import java.util.Set; import org.apache.commons.lang.mutable.MutableLong; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; import org.apache.tinkerpop.gremlin.structure.Edge; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.iterator.FilterIterator; -import com.baidu.hugegraph.iterator.FlatMapperIterator; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.iterator.FilterIterator; +import org.apache.hugegraph.iterator.FlatMapperIterator; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.util.E; public class CountTraverser extends HugeTraverser { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/CustomizePathsTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/CustomizePathsTraverser.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/CustomizePathsTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/CustomizePathsTraverser.java index ea2333f77..087a624d7 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/CustomizePathsTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/CustomizePathsTraverser.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Collections; import java.util.Iterator; @@ -26,16 +26,16 @@ import java.util.Map; import jakarta.ws.rs.core.MultivaluedMap; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.traversal.algorithm.steps.WeightedEdgeStep; -import com.baidu.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.traversal.algorithm.steps.WeightedEdgeStep; +import org.apache.hugegraph.util.CollectionUtil; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -144,7 +144,7 @@ public class CustomizePathsTraverser extends HugeTraverser { return incr ? result : -result; }); - if (limit == HugeTraverser.NO_LIMIT || paths.size() <= limit) { + if (limit == NO_LIMIT || paths.size() <= limit) { return paths; } return paths.subList(0, (int) limit); diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/CustomizedCrosspointsTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/CustomizedCrosspointsTraverser.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/CustomizedCrosspointsTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/CustomizedCrosspointsTraverser.java index 312f126dd..3a79428d0 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/CustomizedCrosspointsTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/CustomizedCrosspointsTraverser.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Collection; import java.util.Iterator; @@ -28,17 +28,17 @@ import java.util.stream.Collectors; import jakarta.ws.rs.core.MultivaluedMap; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.type.define.Directions; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.util.CollectionUtil; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/FusiformSimilarityTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/FusiformSimilarityTraverser.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/FusiformSimilarityTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/FusiformSimilarityTraverser.java index 00c6b4eaa..443e50924 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/FusiformSimilarityTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/FusiformSimilarityTraverser.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Iterator; import java.util.List; @@ -28,19 +28,19 @@ import jakarta.ws.rs.core.MultivaluedHashMap; import jakarta.ws.rs.core.MultivaluedMap; import org.apache.commons.lang3.mutable.MutableInt; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.Frequency; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.Frequency; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/HugeTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/HugeTraverser.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/HugeTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/HugeTraverser.java index 70843a451..03d8a7f2a 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/HugeTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/HugeTraverser.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Collection; import java.util.Collections; @@ -32,37 +32,37 @@ import jakarta.ws.rs.core.MultivaluedHashMap; import jakarta.ws.rs.core.MultivaluedMap; import org.apache.commons.collections.CollectionUtils; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.Aggregate; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.schema.SchemaLabel; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.CollectionType; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.collection.CollectionFactory; import org.apache.tinkerpop.gremlin.structure.Edge; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.Aggregate; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.iterator.ExtendableIterator; -import com.baidu.hugegraph.iterator.FilterIterator; -import com.baidu.hugegraph.iterator.LimitIterator; -import com.baidu.hugegraph.iterator.MapperIterator; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.schema.SchemaLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.traversal.optimize.TraversalUtil; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.CollectionType; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.Log; -import com.baidu.hugegraph.util.collection.CollectionFactory; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.iterator.ExtendableIterator; +import org.apache.hugegraph.iterator.FilterIterator; +import org.apache.hugegraph.iterator.LimitIterator; +import org.apache.hugegraph.iterator.MapperIterator; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.traversal.optimize.TraversalUtil; +import org.apache.hugegraph.util.CollectionUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.Log; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/JaccardSimilarTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/JaccardSimilarTraverser.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/JaccardSimilarTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/JaccardSimilarTraverser.java index a0b3d2d9a..6f6a1e6c9 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/JaccardSimilarTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/JaccardSimilarTraverser.java @@ -17,22 +17,22 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.type.define.Directions; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.util.CollectionUtil; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableMap; public class JaccardSimilarTraverser extends OltpTraverser { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/KneighborTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/KneighborTraverser.java similarity index 89% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/KneighborTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/KneighborTraverser.java index 2fdaee838..cf2661ff6 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/KneighborTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/KneighborTraverser.java @@ -17,21 +17,21 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Iterator; import java.util.Set; import java.util.function.Consumer; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.records.KneighborRecords; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.type.define.Directions; import org.apache.tinkerpop.gremlin.structure.Edge; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.traversal.algorithm.records.KneighborRecords; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.util.E; public class KneighborTraverser extends OltpTraverser { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/KoutTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/KoutTraverser.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/KoutTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/KoutTraverser.java index dcbebb61e..f49183eef 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/KoutTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/KoutTraverser.java @@ -17,22 +17,22 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Iterator; import java.util.Set; import java.util.function.Consumer; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.records.KoutRecords; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.type.define.Directions; import org.apache.tinkerpop.gremlin.structure.Edge; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.traversal.algorithm.records.KoutRecords; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.util.E; public class KoutTraverser extends OltpTraverser { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/MultiNodeShortestPathTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/MultiNodeShortestPathTraverser.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/MultiNodeShortestPathTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/MultiNodeShortestPathTraverser.java index 0a11323d5..8a114d919 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/MultiNodeShortestPathTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/MultiNodeShortestPathTraverser.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Iterator; import java.util.List; @@ -25,14 +25,14 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Consumer; import org.apache.commons.lang3.tuple.Pair; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.util.E; public class MultiNodeShortestPathTraverser extends OltpTraverser { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/NeighborRankTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/NeighborRankTraverser.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/NeighborRankTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/NeighborRankTraverser.java index c1441b473..cd8c9c02c 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/NeighborRankTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/NeighborRankTraverser.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Iterator; import java.util.List; @@ -26,15 +26,15 @@ import java.util.Set; import jakarta.ws.rs.core.MultivaluedMap; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.type.define.Directions; import org.apache.tinkerpop.gremlin.structure.Edge; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.OrderLimitMap; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.OrderLimitMap; public class NeighborRankTraverser extends HugeTraverser { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/OltpTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/OltpTraverser.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/OltpTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/OltpTraverser.java index c83833793..ca1c2ec5c 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/OltpTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/OltpTraverser.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Iterator; import java.util.List; @@ -27,16 +27,16 @@ import java.util.function.Consumer; import com.google.common.base.Objects; import org.apache.commons.lang3.tuple.Pair; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.util.Consumers; import org.apache.tinkerpop.gremlin.structure.Element; import org.apache.tinkerpop.gremlin.structure.Property; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.iterator.FilterIterator; -import com.baidu.hugegraph.util.Consumers; +import org.apache.hugegraph.iterator.FilterIterator; public abstract class OltpTraverser extends HugeTraverser implements AutoCloseable { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/PathTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/PathTraverser.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/PathTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/PathTraverser.java index df9f017cc..6731593ec 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/PathTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/PathTraverser.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Collection; import java.util.Iterator; @@ -26,14 +26,14 @@ import java.util.Map; import java.util.Set; import java.util.function.BiConsumer; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.traversal.algorithm.strategy.TraverseStrategy; import org.apache.tinkerpop.gremlin.structure.Edge; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.traversal.algorithm.strategy.TraverseStrategy; +import org.apache.hugegraph.structure.HugeEdge; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.NO_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.NO_LIMIT; public abstract class PathTraverser { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/PathsTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/PathsTraverser.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/PathsTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/PathsTraverser.java index 8de63f9e2..fa85f6840 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/PathsTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/PathsTraverser.java @@ -17,19 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Iterator; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.records.PathsRecords; +import org.apache.hugegraph.type.define.Directions; import org.apache.tinkerpop.gremlin.structure.Edge; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.traversal.algorithm.records.PathsRecords; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.util.E; public class PathsTraverser extends HugeTraverser { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/PersonalRankTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/PersonalRankTraverser.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/PersonalRankTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/PersonalRankTraverser.java index d656de559..fa4f1f72a 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/PersonalRankTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/PersonalRankTraverser.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Iterator; import java.util.List; @@ -25,15 +25,15 @@ import java.util.Map; import java.util.Set; import java.util.function.BiFunction; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.type.define.Directions; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.util.E; public class PersonalRankTraverser extends HugeTraverser { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/PredictionTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/PredictionTraverser.java similarity index 91% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/PredictionTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/PredictionTraverser.java index 86191453d..06b58a215 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/PredictionTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/PredictionTraverser.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Set; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableList; public class PredictionTraverser extends OltpTraverser { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/SameNeighborTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/SameNeighborTraverser.java similarity index 89% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/SameNeighborTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/SameNeighborTraverser.java index cafcd9059..b3b21d0c3 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/SameNeighborTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/SameNeighborTraverser.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Set; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.type.define.Directions; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.util.CollectionUtil; +import org.apache.hugegraph.util.E; public class SameNeighborTraverser extends HugeTraverser { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/ShortestPathTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/ShortestPathTraverser.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/ShortestPathTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/ShortestPathTraverser.java index bb3e8460b..fe136ba71 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/ShortestPathTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/ShortestPathTraverser.java @@ -17,23 +17,23 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.records.ShortestPathRecords; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.type.define.Directions; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.traversal.algorithm.records.ShortestPathRecords; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableList; public class ShortestPathTraverser extends HugeTraverser { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/SingleSourceShortestPathTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/SingleSourceShortestPathTraverser.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/SingleSourceShortestPathTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/SingleSourceShortestPathTraverser.java index ce1f4afe2..4de1ac389 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/SingleSourceShortestPathTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/SingleSourceShortestPathTraverser.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Iterator; import java.util.LinkedHashMap; @@ -25,17 +25,17 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.type.define.Directions; import org.apache.tinkerpop.gremlin.structure.Edge; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.NumericUtil; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.util.CollectionUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.NumericUtil; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/SubGraphTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/SubGraphTraverser.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/SubGraphTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/SubGraphTraverser.java index abf78c058..073b76d09 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/SubGraphTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/SubGraphTraverser.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Iterator; import java.util.List; @@ -26,14 +26,14 @@ import java.util.Set; import jakarta.ws.rs.core.MultivaluedMap; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.type.define.Directions; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.util.E; public class SubGraphTraverser extends HugeTraverser { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/TemplatePathsTraverser.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/TemplatePathsTraverser.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/TemplatePathsTraverser.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/TemplatePathsTraverser.java index 2a3971ced..5cdefdec8 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/TemplatePathsTraverser.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/TemplatePathsTraverser.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm; +package org.apache.hugegraph.traversal.algorithm; import java.util.Collection; import java.util.Iterator; @@ -25,15 +25,15 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.traversal.algorithm.steps.RepeatEdgeStep; +import org.apache.hugegraph.traversal.algorithm.strategy.TraverseStrategy; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.traversal.algorithm.steps.RepeatEdgeStep; -import com.baidu.hugegraph.traversal.algorithm.strategy.TraverseStrategy; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.util.E; public class TemplatePathsTraverser extends HugeTraverser { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/AbstractRecords.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/AbstractRecords.java similarity index 80% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/AbstractRecords.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/AbstractRecords.java index 55f56cb75..b0db3f019 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/AbstractRecords.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/AbstractRecords.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.records; +package org.apache.hugegraph.traversal.algorithm.records; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.traversal.algorithm.records.record.Record; -import com.baidu.hugegraph.traversal.algorithm.records.record.RecordFactory; -import com.baidu.hugegraph.traversal.algorithm.records.record.RecordType; -import com.baidu.hugegraph.util.collection.ObjectIntMappingFactory; -import com.baidu.hugegraph.util.collection.ObjectIntMapping; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.util.collection.ObjectIntMapping; +import org.apache.hugegraph.util.collection.ObjectIntMappingFactory; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.traversal.algorithm.records.record.Record; +import org.apache.hugegraph.traversal.algorithm.records.record.RecordFactory; +import org.apache.hugegraph.traversal.algorithm.records.record.RecordType; public abstract class AbstractRecords implements Records { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/DoubleWayMultiPathsRecords.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/DoubleWayMultiPathsRecords.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/DoubleWayMultiPathsRecords.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/DoubleWayMultiPathsRecords.java index 9ac6c94f8..bfbd333b2 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/DoubleWayMultiPathsRecords.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/DoubleWayMultiPathsRecords.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.records; +package org.apache.hugegraph.traversal.algorithm.records; import java.util.ArrayList; import java.util.List; @@ -25,13 +25,13 @@ import java.util.Stack; import org.apache.commons.collections.CollectionUtils; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser.Path; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser.PathSet; -import com.baidu.hugegraph.traversal.algorithm.records.record.Record; -import com.baidu.hugegraph.traversal.algorithm.records.record.RecordType; -import com.baidu.hugegraph.util.collection.IntIterator; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.util.collection.IntIterator; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser.Path; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser.PathSet; +import org.apache.hugegraph.traversal.algorithm.records.record.Record; +import org.apache.hugegraph.traversal.algorithm.records.record.RecordType; import com.google.common.collect.Lists; public abstract class DoubleWayMultiPathsRecords extends AbstractRecords { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/KneighborRecords.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/KneighborRecords.java similarity index 74% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/KneighborRecords.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/KneighborRecords.java index 71725caa6..00c327c34 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/KneighborRecords.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/KneighborRecords.java @@ -17,20 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.records; - -import static com.baidu.hugegraph.backend.query.Query.NO_LIMIT; +package org.apache.hugegraph.traversal.algorithm.records; import java.util.List; import java.util.Stack; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser.PathSet; -import com.baidu.hugegraph.traversal.algorithm.records.record.Record; -import com.baidu.hugegraph.traversal.algorithm.records.record.RecordType; -import com.baidu.hugegraph.type.define.CollectionType; -import com.baidu.hugegraph.util.collection.CollectionFactory; -import com.baidu.hugegraph.util.collection.IntIterator; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.type.define.CollectionType; +import org.apache.hugegraph.util.collection.CollectionFactory; +import org.apache.hugegraph.util.collection.IntIterator; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser.PathSet; +import org.apache.hugegraph.traversal.algorithm.records.record.Record; +import org.apache.hugegraph.traversal.algorithm.records.record.RecordType; public class KneighborRecords extends SingleWayMultiPathsRecords { @@ -51,7 +50,7 @@ public class KneighborRecords extends SingleWayMultiPathsRecords { // Not include record(i=0) to ignore source vertex for (int i = 1; i < records.size(); i++) { IntIterator iterator = records.get(i).keys(); - while ((limit == NO_LIMIT || limit > 0L) && iterator.hasNext()) { + while ((limit == Query.NO_LIMIT || limit > 0L) && iterator.hasNext()) { ids.add(this.id(iterator.next())); limit--; } @@ -65,7 +64,7 @@ public class KneighborRecords extends SingleWayMultiPathsRecords { Stack records = this.records(); for (int i = 1; i < records.size(); i++) { IntIterator iterator = records.get(i).keys(); - while ((limit == NO_LIMIT || limit > 0L) && iterator.hasNext()) { + while ((limit == Query.NO_LIMIT || limit > 0L) && iterator.hasNext()) { paths.add(this.linkPath(i, iterator.next())); limit--; } diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/KoutRecords.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/KoutRecords.java similarity index 71% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/KoutRecords.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/KoutRecords.java index 15fea77d5..ac8a11628 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/KoutRecords.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/KoutRecords.java @@ -17,20 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.records; - -import static com.baidu.hugegraph.backend.query.Query.NO_LIMIT; +package org.apache.hugegraph.traversal.algorithm.records; import java.util.List; import java.util.Stack; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser.PathSet; -import com.baidu.hugegraph.traversal.algorithm.records.record.Record; -import com.baidu.hugegraph.traversal.algorithm.records.record.RecordType; -import com.baidu.hugegraph.type.define.CollectionType; -import com.baidu.hugegraph.util.collection.CollectionFactory; -import com.baidu.hugegraph.util.collection.IntIterator; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.traversal.algorithm.records.record.Record; +import org.apache.hugegraph.traversal.algorithm.records.record.RecordType; +import org.apache.hugegraph.type.define.CollectionType; +import org.apache.hugegraph.util.collection.CollectionFactory; +import org.apache.hugegraph.util.collection.IntIterator; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser.PathSet; public class KoutRecords extends SingleWayMultiPathsRecords { @@ -47,7 +46,7 @@ public class KoutRecords extends SingleWayMultiPathsRecords { public List ids(long limit) { List ids = CollectionFactory.newList(CollectionType.EC); IntIterator iterator = this.records().peek().keys(); - while ((limit == NO_LIMIT || limit-- > 0L) && iterator.hasNext()) { + while ((limit == Query.NO_LIMIT || limit-- > 0L) && iterator.hasNext()) { ids.add(this.id(iterator.next())); } return ids; @@ -58,7 +57,7 @@ public class KoutRecords extends SingleWayMultiPathsRecords { PathSet paths = new PathSet(); Stack records = this.records(); IntIterator iterator = records.peek().keys(); - while ((limit == NO_LIMIT || limit-- > 0L) && iterator.hasNext()) { + while ((limit == Query.NO_LIMIT || limit-- > 0L) && iterator.hasNext()) { paths.add(this.linkPath(records.size() - 1, iterator.next())); } return paths; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/PathsRecords.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/PathsRecords.java similarity index 86% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/PathsRecords.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/PathsRecords.java index 5c0765873..c3a60dcf4 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/PathsRecords.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/PathsRecords.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.records; +package org.apache.hugegraph.traversal.algorithm.records; import java.util.function.Function; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser.PathSet; -import com.baidu.hugegraph.traversal.algorithm.records.record.RecordType; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser.PathSet; +import org.apache.hugegraph.traversal.algorithm.records.record.RecordType; public class PathsRecords extends DoubleWayMultiPathsRecords { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/Records.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/Records.java similarity index 87% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/Records.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/Records.java index d5444cd82..c5cc5378a 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/Records.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/Records.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.records; +package org.apache.hugegraph.traversal.algorithm.records; import java.util.function.Function; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser.PathSet; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser.PathSet; public interface Records { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/ShortestPathRecords.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/ShortestPathRecords.java similarity index 85% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/ShortestPathRecords.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/ShortestPathRecords.java index 691b61902..27e114ba5 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/ShortestPathRecords.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/ShortestPathRecords.java @@ -17,22 +17,22 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.records; +package org.apache.hugegraph.traversal.algorithm.records; import java.util.ArrayList; import java.util.List; import java.util.Stack; import java.util.function.Function; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser.Path; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser.PathSet; -import com.baidu.hugegraph.traversal.algorithm.records.record.Int2IntRecord; -import com.baidu.hugegraph.traversal.algorithm.records.record.Record; -import com.baidu.hugegraph.traversal.algorithm.records.record.RecordType; -import com.baidu.hugegraph.util.collection.CollectionFactory; -import com.baidu.hugegraph.util.collection.IntMap; -import com.baidu.hugegraph.util.collection.IntSet; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.records.record.Int2IntRecord; +import org.apache.hugegraph.traversal.algorithm.records.record.Record; +import org.apache.hugegraph.traversal.algorithm.records.record.RecordType; +import org.apache.hugegraph.util.collection.CollectionFactory; +import org.apache.hugegraph.util.collection.IntMap; +import org.apache.hugegraph.util.collection.IntSet; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser.Path; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser.PathSet; public class ShortestPathRecords extends DoubleWayMultiPathsRecords { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/SingleWayMultiPathsRecords.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/SingleWayMultiPathsRecords.java similarity index 84% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/SingleWayMultiPathsRecords.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/SingleWayMultiPathsRecords.java index 01b1acc6e..8d20c42e6 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/SingleWayMultiPathsRecords.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/SingleWayMultiPathsRecords.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.records; +package org.apache.hugegraph.traversal.algorithm.records; import java.util.Collections; import java.util.Iterator; @@ -25,20 +25,19 @@ import java.util.List; import java.util.Stack; import java.util.function.Function; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser.Path; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser.PathSet; -import com.baidu.hugegraph.traversal.algorithm.records.record.Int2IntRecord; -import com.baidu.hugegraph.traversal.algorithm.records.record.Record; -import com.baidu.hugegraph.traversal.algorithm.records.record.RecordType; -import com.baidu.hugegraph.type.define.CollectionType; -import com.baidu.hugegraph.util.collection.CollectionFactory; -import com.baidu.hugegraph.util.collection.IntIterator; -import com.baidu.hugegraph.util.collection.IntIterator.MapperInt2ObjectIterator; -import com.baidu.hugegraph.util.collection.IntMap; -import com.baidu.hugegraph.util.collection.IntSet; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.type.define.CollectionType; +import org.apache.hugegraph.util.collection.CollectionFactory; +import org.apache.hugegraph.util.collection.IntIterator; +import org.apache.hugegraph.util.collection.IntMap; +import org.apache.hugegraph.util.collection.IntSet; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser.Path; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser.PathSet; +import org.apache.hugegraph.traversal.algorithm.records.record.Int2IntRecord; +import org.apache.hugegraph.traversal.algorithm.records.record.Record; +import org.apache.hugegraph.traversal.algorithm.records.record.RecordType; public abstract class SingleWayMultiPathsRecords extends AbstractRecords { @@ -106,7 +105,7 @@ public abstract class SingleWayMultiPathsRecords extends AbstractRecords { } public Iterator keys() { - return new MapperInt2ObjectIterator<>(this.parentRecordKeys, this::id); + return new IntIterator.MapperInt2ObjectIterator<>(this.parentRecordKeys, this::id); } @Watched diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/Int2ArrayRecord.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/Int2ArrayRecord.java similarity index 90% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/Int2ArrayRecord.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/Int2ArrayRecord.java index a42ee8c0a..a17b08343 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/Int2ArrayRecord.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/Int2ArrayRecord.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.records.record; +package org.apache.hugegraph.traversal.algorithm.records.record; -import com.baidu.hugegraph.util.collection.Int2IntsMap; -import com.baidu.hugegraph.util.collection.IntIterator; +import org.apache.hugegraph.util.collection.Int2IntsMap; +import org.apache.hugegraph.util.collection.IntIterator; public class Int2ArrayRecord implements Record { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/Int2IntRecord.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/Int2IntRecord.java similarity index 88% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/Int2IntRecord.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/Int2IntRecord.java index 5c55f8592..1a5a8fef3 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/Int2IntRecord.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/Int2IntRecord.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.records.record; +package org.apache.hugegraph.traversal.algorithm.records.record; -import com.baidu.hugegraph.util.collection.CollectionFactory; -import com.baidu.hugegraph.util.collection.IntIterator; -import com.baidu.hugegraph.util.collection.IntMap; +import org.apache.hugegraph.util.collection.CollectionFactory; +import org.apache.hugegraph.util.collection.IntIterator; +import org.apache.hugegraph.util.collection.IntMap; public class Int2IntRecord implements Record { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/Int2SetRecord.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/Int2SetRecord.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/Int2SetRecord.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/Int2SetRecord.java index 7a7bec79a..3badbc2d6 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/Int2SetRecord.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/Int2SetRecord.java @@ -17,13 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.records.record; +package org.apache.hugegraph.traversal.algorithm.records.record; +import org.apache.hugegraph.util.collection.IntIterator; import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap; import org.eclipse.collections.impl.set.mutable.primitive.IntHashSet; -import com.baidu.hugegraph.util.collection.IntIterator; - public class Int2SetRecord implements Record { private final IntObjectHashMap layer; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/Record.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/Record.java similarity index 89% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/Record.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/Record.java index 0f50fa7b1..4b7990f4a 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/Record.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/Record.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.records.record; +package org.apache.hugegraph.traversal.algorithm.records.record; -import com.baidu.hugegraph.util.collection.IntIterator; +import org.apache.hugegraph.util.collection.IntIterator; public interface Record { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/RecordFactory.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/RecordFactory.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/RecordFactory.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/RecordFactory.java index 18c0e9b32..ea8420f5d 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/RecordFactory.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/RecordFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.records.record; +package org.apache.hugegraph.traversal.algorithm.records.record; public class RecordFactory { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/RecordType.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/RecordType.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/RecordType.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/RecordType.java index 749825ee3..4f03a393e 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/RecordType.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/RecordType.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.records.record; +package org.apache.hugegraph.traversal.algorithm.records.record; -import com.baidu.hugegraph.type.define.SerialEnum; +import org.apache.hugegraph.type.define.SerialEnum; public enum RecordType implements SerialEnum { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/SyncRecord.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/SyncRecord.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/SyncRecord.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/SyncRecord.java index 394435b0b..6b27b81b3 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/records/record/SyncRecord.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/records/record/SyncRecord.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.records.record; +package org.apache.hugegraph.traversal.algorithm.records.record; -import com.baidu.hugegraph.util.collection.IntIterator; +import org.apache.hugegraph.util.collection.IntIterator; public class SyncRecord implements Record { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/steps/EdgeStep.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/steps/EdgeStep.java similarity index 88% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/steps/EdgeStep.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/steps/EdgeStep.java index 2c27eece3..cc61fc4b1 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/steps/EdgeStep.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/steps/EdgeStep.java @@ -17,25 +17,25 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.steps; +package org.apache.hugegraph.traversal.algorithm.steps; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.NO_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.NO_LIMIT; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.type.define.Directions; import org.apache.tinkerpop.gremlin.structure.Edge; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.traversal.optimize.TraversalUtil; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.traversal.optimize.TraversalUtil; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/steps/RepeatEdgeStep.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/steps/RepeatEdgeStep.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/steps/RepeatEdgeStep.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/steps/RepeatEdgeStep.java index 8d3ca246f..354aecf60 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/steps/RepeatEdgeStep.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/steps/RepeatEdgeStep.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.steps; +package org.apache.hugegraph.traversal.algorithm.steps; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.type.define.Directions; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.type.define.Directions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/steps/WeightedEdgeStep.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/steps/WeightedEdgeStep.java similarity index 87% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/steps/WeightedEdgeStep.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/steps/WeightedEdgeStep.java index 09218dee2..bbbcc7c08 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/steps/WeightedEdgeStep.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/steps/WeightedEdgeStep.java @@ -17,19 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.steps; +package org.apache.hugegraph.traversal.algorithm.steps; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_SAMPLE; -import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.NO_LIMIT; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_SAMPLE; +import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.NO_LIMIT; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/strategy/ConcurrentTraverseStrategy.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/strategy/ConcurrentTraverseStrategy.java similarity index 89% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/strategy/ConcurrentTraverseStrategy.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/strategy/ConcurrentTraverseStrategy.java index b2192ab53..be79699a2 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/strategy/ConcurrentTraverseStrategy.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/strategy/ConcurrentTraverseStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.strategy; +package org.apache.hugegraph.traversal.algorithm.strategy; import java.util.List; import java.util.Map; @@ -25,10 +25,10 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.BiConsumer; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.traversal.algorithm.OltpTraverser; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.OltpTraverser; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; public class ConcurrentTraverseStrategy extends OltpTraverser implements TraverseStrategy { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/strategy/SingleTraverseStrategy.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/strategy/SingleTraverseStrategy.java similarity index 87% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/strategy/SingleTraverseStrategy.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/strategy/SingleTraverseStrategy.java index 123015095..e2c9f0705 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/strategy/SingleTraverseStrategy.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/strategy/SingleTraverseStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.strategy; +package org.apache.hugegraph.traversal.algorithm.strategy; import java.util.List; import java.util.Map; @@ -26,11 +26,11 @@ import java.util.function.BiConsumer; import jakarta.ws.rs.core.MultivaluedMap; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; -import com.baidu.hugegraph.traversal.algorithm.OltpTraverser; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.traversal.algorithm.OltpTraverser; public class SingleTraverseStrategy extends OltpTraverser implements TraverseStrategy { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/strategy/TraverseStrategy.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/strategy/TraverseStrategy.java similarity index 86% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/strategy/TraverseStrategy.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/strategy/TraverseStrategy.java index 9d69e5cb5..7a866b35b 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/strategy/TraverseStrategy.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/strategy/TraverseStrategy.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.traversal.algorithm.strategy; +package org.apache.hugegraph.traversal.algorithm.strategy; import java.util.List; import java.util.Map; import java.util.Set; import java.util.function.BiConsumer; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep; -import com.baidu.hugegraph.traversal.algorithm.HugeTraverser; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep; +import org.apache.hugegraph.traversal.algorithm.HugeTraverser; public interface TraverseStrategy { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/ConditionP.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/ConditionP.java similarity index 76% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/ConditionP.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/ConditionP.java index 6a60c3f88..b0a1fa91f 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/ConditionP.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/ConditionP.java @@ -17,14 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.traversal.optimize; +package org.apache.hugegraph.traversal.optimize; import java.util.function.BiPredicate; +import org.apache.hugegraph.backend.query.Condition; import org.apache.tinkerpop.gremlin.process.traversal.P; -import com.baidu.hugegraph.backend.query.Condition.RelationType; - public class ConditionP extends P { private static final long serialVersionUID = 9094970577400072902L; @@ -35,23 +34,23 @@ public class ConditionP extends P { } public static ConditionP textContains(Object value) { - return new ConditionP(RelationType.TEXT_CONTAINS, value); + return new ConditionP(Condition.RelationType.TEXT_CONTAINS, value); } public static ConditionP contains(Object value) { - return new ConditionP(RelationType.CONTAINS, value); + return new ConditionP(Condition.RelationType.CONTAINS, value); } public static ConditionP containsK(Object value) { - return new ConditionP(RelationType.CONTAINS_KEY, value); + return new ConditionP(Condition.RelationType.CONTAINS_KEY, value); } public static ConditionP containsV(Object value) { - return new ConditionP(RelationType.CONTAINS_VALUE, value); + return new ConditionP(Condition.RelationType.CONTAINS_VALUE, value); } public static ConditionP eq(Object value) { // EQ that can compare two array - return new ConditionP(RelationType.EQ, value); + return new ConditionP(Condition.RelationType.EQ, value); } } diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeCountStep.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeCountStep.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeCountStep.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeCountStep.java index d13cc17f2..ea7c845c3 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeCountStep.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeCountStep.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.optimize; +package org.apache.hugegraph.traversal.optimize; import java.util.NoSuchElementException; import java.util.Objects; @@ -29,7 +29,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep; import org.apache.tinkerpop.gremlin.process.traversal.util.FastNoSuchElementException; import org.apache.tinkerpop.gremlin.structure.Element; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.util.E; public final class HugeCountStep extends AbstractStep { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeCountStepStrategy.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeCountStepStrategy.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeCountStepStrategy.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeCountStepStrategy.java index ec22a5809..699f32640 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeCountStepStrategy.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeCountStepStrategy.java @@ -17,13 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.traversal.optimize; +package org.apache.hugegraph.traversal.optimize; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; +import org.apache.hugegraph.backend.query.Aggregate; import org.apache.tinkerpop.gremlin.process.traversal.Step; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy.ProviderOptimizationStrategy; @@ -40,8 +41,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversal import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import org.apache.tinkerpop.gremlin.structure.Element; -import com.baidu.hugegraph.backend.query.Aggregate.AggregateFunc; - public final class HugeCountStepStrategy extends AbstractTraversalStrategy implements ProviderOptimizationStrategy { @@ -102,7 +101,7 @@ public final class HugeCountStepStrategy } // Replace with HugeCountStep - graphStep.queryInfo().aggregate(AggregateFunc.COUNT, null); + graphStep.queryInfo().aggregate(Aggregate.AggregateFunc.COUNT, null); HugeCountStep countStep = new HugeCountStep<>(traversal, graphStep); for (Step origin : originSteps) { traversal.removeStep(origin); diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeGraphStep.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeGraphStep.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeGraphStep.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeGraphStep.java index 6ec98aa43..2df10354a 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeGraphStep.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeGraphStep.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.optimize; +package org.apache.hugegraph.traversal.optimize; import java.util.ArrayList; import java.util.Arrays; @@ -25,6 +25,11 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.type.HugeType; import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep; import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer; import org.apache.tinkerpop.gremlin.structure.Element; @@ -32,12 +37,7 @@ import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.util.Log; public final class HugeGraphStep extends GraphStep implements QueryHolder { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeGraphStepStrategy.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeGraphStepStrategy.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeGraphStepStrategy.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeGraphStepStrategy.java index 72d25c2ed..bea1f19ae 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeGraphStepStrategy.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeGraphStepStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.optimize; +package org.apache.hugegraph.traversal.optimize; import java.util.Collections; import java.util.List; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeScriptTraversal.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeScriptTraversal.java similarity index 80% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeScriptTraversal.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeScriptTraversal.java index 5bd45b303..e0c9b24ea 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeScriptTraversal.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeScriptTraversal.java @@ -1,23 +1,23 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * Copyright 2017 HugeGraph Authors * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations * under the License. */ -package com.baidu.hugegraph.traversal.optimize; +package org.apache.hugegraph.traversal.optimize; import java.util.Map; @@ -25,6 +25,7 @@ import javax.script.Bindings; import javax.script.ScriptEngine; import javax.script.ScriptException; +import org.apache.hugegraph.HugeException; import org.apache.tinkerpop.gremlin.jsr223.SingleGremlinScriptEngineManager; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource; @@ -32,8 +33,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversal; -import com.baidu.hugegraph.HugeException; - /** * ScriptTraversal encapsulates a {@link ScriptEngine} and a script which is * compiled into a {@link Traversal} at {@link Admin#applyStrategies()}. diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeVertexStep.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeVertexStep.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeVertexStep.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeVertexStep.java index 17d5c645c..3fb3623ae 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeVertexStep.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeVertexStep.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.optimize; +package org.apache.hugegraph.traversal.optimize; import java.util.ArrayList; import java.util.Arrays; @@ -25,6 +25,13 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.type.define.Directions; import org.apache.tinkerpop.gremlin.process.traversal.Traverser; import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep; import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer; @@ -34,14 +41,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.util.Log; public class HugeVertexStep extends VertexStep implements QueryHolder { @@ -174,7 +174,7 @@ public class HugeVertexStep * exceeded when reaching the limit in tinkerpop layer */ if (withEdgeCond || withVertexCond) { - com.baidu.hugegraph.util.E.checkArgument(!this.queryInfo().paging(), + org.apache.hugegraph.util.E.checkArgument(!this.queryInfo().paging(), "Can't query by paging " + "and filtering"); this.queryInfo().limit(Query.NO_LIMIT); diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeVertexStepByBatch.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeVertexStepByBatch.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeVertexStepByBatch.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeVertexStepByBatch.java index af5b45380..8a992bda2 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeVertexStepByBatch.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeVertexStepByBatch.java @@ -17,11 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.traversal.optimize; +package org.apache.hugegraph.traversal.optimize; import java.util.Iterator; import java.util.List; +import org.apache.hugegraph.backend.query.BatchConditionQuery; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.HugeKeys; import org.apache.tinkerpop.gremlin.process.traversal.Traverser; import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep; import org.apache.tinkerpop.gremlin.process.traversal.util.FastNoSuchElementException; @@ -30,12 +35,7 @@ import org.apache.tinkerpop.gremlin.structure.Element; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator; -import com.baidu.hugegraph.backend.query.BatchConditionQuery; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.iterator.BatchMapperIterator; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.iterator.BatchMapperIterator; public class HugeVertexStepByBatch extends HugeVertexStep { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeVertexStepStrategy.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeVertexStepStrategy.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeVertexStepStrategy.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeVertexStepStrategy.java index 9321db703..9857ca400 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeVertexStepStrategy.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeVertexStepStrategy.java @@ -17,10 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.traversal.optimize; +package org.apache.hugegraph.traversal.optimize; import java.util.List; +import org.apache.hugegraph.HugeGraph; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy.ProviderOptimizationStrategy; import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; @@ -31,8 +32,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversal import org.apache.tinkerpop.gremlin.process.traversal.util.EmptyTraversal; import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; -import com.baidu.hugegraph.HugeGraph; - public final class HugeVertexStepStrategy extends AbstractTraversalStrategy implements ProviderOptimizationStrategy { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/QueryHolder.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/QueryHolder.java similarity index 88% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/QueryHolder.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/QueryHolder.java index 7584e4c55..894a7bd7c 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/QueryHolder.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/QueryHolder.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.traversal.optimize; +package org.apache.hugegraph.traversal.optimize; import java.util.Iterator; +import org.apache.hugegraph.backend.query.Aggregate; +import org.apache.hugegraph.backend.query.Query; import org.apache.tinkerpop.gremlin.process.traversal.Order; import org.apache.tinkerpop.gremlin.process.traversal.step.HasContainerHolder; -import com.baidu.hugegraph.backend.query.Aggregate.AggregateFunc; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.iterator.Metadatable; +import org.apache.hugegraph.iterator.Metadatable; public interface QueryHolder extends HasContainerHolder, Metadatable { @@ -62,7 +62,7 @@ public interface QueryHolder extends HasContainerHolder, Metadatable { this.queryInfo().capacity(Query.NO_CAPACITY); } - default void setAggregate(AggregateFunc func, String key) { + default void setAggregate(Aggregate.AggregateFunc func, String key) { this.queryInfo().aggregate(func, key); } diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/Text.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/Text.java similarity index 88% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/Text.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/Text.java index 84aa0a909..f66365504 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/Text.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/Text.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.traversal.optimize; +package org.apache.hugegraph.traversal.optimize; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; public class Text { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/TraversalUtil.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/TraversalUtil.java similarity index 93% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/TraversalUtil.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/TraversalUtil.java index ae2c333e8..d43dcb951 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/TraversalUtil.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/TraversalUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.traversal.optimize; +package org.apache.hugegraph.traversal.optimize; import java.util.ArrayList; import java.util.Collection; @@ -30,6 +30,22 @@ import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.page.PageInfo; +import org.apache.hugegraph.backend.page.PageState; +import org.apache.hugegraph.backend.query.Aggregate; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaLabel; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.JsonUtil; import org.apache.tinkerpop.gremlin.process.traversal.Compare; import org.apache.tinkerpop.gremlin.process.traversal.Contains; import org.apache.tinkerpop.gremlin.process.traversal.Order; @@ -67,31 +83,13 @@ import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.page.PageInfo; -import com.baidu.hugegraph.backend.page.PageState; -import com.baidu.hugegraph.backend.query.Aggregate.AggregateFunc; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.Condition.Relation; -import com.baidu.hugegraph.backend.query.Condition.RelationType; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.iterator.FilterIterator; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaLabel; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.structure.HugeProperty; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.DateUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.iterator.FilterIterator; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.structure.HugeProperty; +import org.apache.hugegraph.util.CollectionUtil; +import org.apache.hugegraph.util.DateUtil; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableList; public final class TraversalUtil { @@ -235,17 +233,17 @@ public final class TraversalUtil { } } else if (propertiesStep != null && step instanceof ReducingBarrierStep) { - AggregateFunc aggregateFunc; + Aggregate.AggregateFunc aggregateFunc; if (step instanceof CountGlobalStep) { - aggregateFunc = AggregateFunc.COUNT; + aggregateFunc = Aggregate.AggregateFunc.COUNT; } else if (step instanceof MaxGlobalStep) { - aggregateFunc = AggregateFunc.MAX; + aggregateFunc = Aggregate.AggregateFunc.MAX; } else if (step instanceof MinGlobalStep) { - aggregateFunc = AggregateFunc.MIN; + aggregateFunc = Aggregate.AggregateFunc.MIN; } else if (step instanceof MeanGlobalStep) { - aggregateFunc = AggregateFunc.AVG; + aggregateFunc = Aggregate.AggregateFunc.AVG; } else if (step instanceof SumGlobalStep) { - aggregateFunc = AggregateFunc.SUM; + aggregateFunc = Aggregate.AggregateFunc.SUM; } else { aggregateFunc = null; } @@ -310,7 +308,7 @@ public final class TraversalUtil { condition = convContains2Relation(graph, has); } else if (bp instanceof Compare) { condition = convCompare2Relation(graph, type, has); - } else if (bp instanceof RelationType) { + } else if (bp instanceof Condition.RelationType) { condition = convRelationType2Relation(graph, type, has); } else if (bp instanceof Contains) { condition = convIn2Relation(graph, type, has); @@ -373,9 +371,9 @@ public final class TraversalUtil { return cond; } - private static Relation convCompare2Relation(HugeGraph graph, - HugeType type, - HasContainer has) { + private static Condition.Relation convCompare2Relation(HugeGraph graph, + HugeType type, + HasContainer has) { assert type.isGraph(); BiPredicate bp = has.getPredicate().getBiPredicate(); assert bp instanceof Compare; @@ -385,9 +383,9 @@ public final class TraversalUtil { convCompare2UserpropRelation(graph, type, has); } - private static Relation convCompare2SyspropRelation(HugeGraph graph, - HugeType type, - HasContainer has) { + private static Condition.Relation convCompare2SyspropRelation(HugeGraph graph, + HugeType type, + HasContainer has) { BiPredicate bp = has.getPredicate().getBiPredicate(); assert bp instanceof Compare; @@ -413,9 +411,9 @@ public final class TraversalUtil { } } - private static Relation convCompare2UserpropRelation(HugeGraph graph, - HugeType type, - HasContainer has) { + private static Condition.Relation convCompare2UserpropRelation(HugeGraph graph, + HugeType type, + HasContainer has) { BiPredicate bp = has.getPredicate().getBiPredicate(); assert bp instanceof Compare; @@ -447,13 +445,13 @@ public final class TraversalUtil { HasContainer has) { assert type.isGraph(); BiPredicate bp = has.getPredicate().getBiPredicate(); - assert bp instanceof RelationType; + assert bp instanceof Condition.RelationType; String key = has.getKey(); PropertyKey pkey = graph.propertyKey(key); Id pkeyId = pkey.id(); Object value = validPropertyValue(has.getValue(), pkey); - return new Condition.UserpropRelation(pkeyId, (RelationType) bp, value); + return new Condition.UserpropRelation(pkeyId, (Condition.RelationType) bp, value); } public static Condition convIn2Relation(HugeGraph graph, diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/HugeType.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/HugeType.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/HugeType.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/HugeType.java index a5f69ba45..b77bfa20d 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/HugeType.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/HugeType.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.type; +package org.apache.hugegraph.type; import java.util.HashMap; import java.util.Map; -import com.baidu.hugegraph.type.define.SerialEnum; +import org.apache.hugegraph.type.define.SerialEnum; public enum HugeType implements SerialEnum { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/Idfiable.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/Idfiable.java similarity index 91% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/Idfiable.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/Idfiable.java index d2ab141e8..0182f1e11 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/Idfiable.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/Idfiable.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.type; +package org.apache.hugegraph.type; -import com.baidu.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.Id; public interface Idfiable { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/Indexable.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/Indexable.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/Indexable.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/Indexable.java index 08cb386f9..a36f4b95f 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/Indexable.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/Indexable.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.type; +package org.apache.hugegraph.type; import java.util.Set; -import com.baidu.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.Id; public interface Indexable { diff --git a/hugegraph-core/src/main/java/org/apache/hugegraph/type/Nameable.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/Nameable.java new file mode 100644 index 000000000..84fae87b4 --- /dev/null +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/Nameable.java @@ -0,0 +1,35 @@ +/* + * Copyright 2017 HugeGraph Authors + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + */ + +package org.apache.hugegraph.type; + +/** + * Represents an entity that can be uniquely identified by a String name. + * + * @author Matthias Broecheler (me@matthiasb.com) + */ +public interface Nameable { + /** + * Returns the unique name of this entity. + * + * @return Name of this entity. + */ + String name(); + +} diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/Propertiable.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/Propertiable.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/Propertiable.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/Propertiable.java index 4ca8df77b..5ae9b714d 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/Propertiable.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/Propertiable.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.type; +package org.apache.hugegraph.type; import java.util.Set; -import com.baidu.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.Id; public interface Propertiable { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/Typeable.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/Typeable.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/Typeable.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/Typeable.java index fb569fd02..61b4beea5 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/Typeable.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/Typeable.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.type; +package org.apache.hugegraph.type; public interface Typeable { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/Action.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Action.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/Action.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Action.java index 255627d53..042594c22 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/Action.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Action.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.type.define; +package org.apache.hugegraph.type.define; public enum Action implements SerialEnum { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/AggregateType.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/AggregateType.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/AggregateType.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/define/AggregateType.java index cf7f8f63e..e949d4af1 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/AggregateType.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/AggregateType.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.type.define; +package org.apache.hugegraph.type.define; public enum AggregateType implements SerialEnum { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/Cardinality.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Cardinality.java similarity index 64% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/Cardinality.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Cardinality.java index 9c1bfa7d5..07fcf81dd 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/Cardinality.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Cardinality.java @@ -1,18 +1,23 @@ -// Copyright 2017 JanusGraph Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2017 HugeGraph Authors + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + */ -package com.baidu.hugegraph.type.define; +package org.apache.hugegraph.type.define; import org.apache.tinkerpop.gremlin.structure.VertexProperty; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/CollectionType.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/CollectionType.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/CollectionType.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/define/CollectionType.java index 0d02fbb51..7525e2fdc 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/CollectionType.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/CollectionType.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.type.define; +package org.apache.hugegraph.type.define; public enum CollectionType implements SerialEnum { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/DataType.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/DataType.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/DataType.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/define/DataType.java index b5f13afc0..2b9abddb7 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/DataType.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/DataType.java @@ -17,20 +17,20 @@ * under the License. */ -package com.baidu.hugegraph.type.define; +package org.apache.hugegraph.type.define; import java.nio.ByteBuffer; import java.util.Date; import java.util.List; import java.util.UUID; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; -import com.baidu.hugegraph.util.Blob; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.DateUtil; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.util.Blob; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.DateUtil; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.StringEncoding; public enum DataType implements SerialEnum { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/Directions.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Directions.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/Directions.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Directions.java index 548325cf4..bd4afe152 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/Directions.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Directions.java @@ -17,12 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.type.define; +package org.apache.hugegraph.type.define; +import org.apache.hugegraph.type.HugeType; import org.apache.tinkerpop.gremlin.structure.Direction; -import com.baidu.hugegraph.type.HugeType; - public enum Directions implements SerialEnum { // TODO: add NONE enum for non-directional edges diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/Frequency.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Frequency.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/Frequency.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Frequency.java index 44f8d12e1..4ebe24867 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/Frequency.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Frequency.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.type.define; +package org.apache.hugegraph.type.define; public enum Frequency implements SerialEnum { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/GraphMode.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/GraphMode.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/GraphMode.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/define/GraphMode.java index 906051fe5..449ce7153 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/GraphMode.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/GraphMode.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.type.define; +package org.apache.hugegraph.type.define; public enum GraphMode { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/GraphReadMode.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/GraphReadMode.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/GraphReadMode.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/define/GraphReadMode.java index 6c1b70d7e..7945e1fe4 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/GraphReadMode.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/GraphReadMode.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.type.define; +package org.apache.hugegraph.type.define; public enum GraphReadMode { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/HugeKeys.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/HugeKeys.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/HugeKeys.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/define/HugeKeys.java index e7aba0fb1..a38406940 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/HugeKeys.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/HugeKeys.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.type.define; +package org.apache.hugegraph.type.define; public enum HugeKeys { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/IdStrategy.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/IdStrategy.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/IdStrategy.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/define/IdStrategy.java index 24a1fa0d2..4149c8db9 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/IdStrategy.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/IdStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.type.define; +package org.apache.hugegraph.type.define; public enum IdStrategy implements SerialEnum { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/IndexType.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/IndexType.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/IndexType.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/define/IndexType.java index 445b522d0..3accf15ee 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/IndexType.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/IndexType.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.type.define; +package org.apache.hugegraph.type.define; -import com.baidu.hugegraph.type.HugeType; +import org.apache.hugegraph.type.HugeType; public enum IndexType implements SerialEnum { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/NodeRole.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/NodeRole.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/NodeRole.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/define/NodeRole.java index c824b022a..ab565150c 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/NodeRole.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/NodeRole.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.type.define; +package org.apache.hugegraph.type.define; public enum NodeRole implements SerialEnum { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/SchemaStatus.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/SchemaStatus.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/SchemaStatus.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/define/SchemaStatus.java index be906dfed..92d88ca50 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/SchemaStatus.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/SchemaStatus.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.type.define; +package org.apache.hugegraph.type.define; public enum SchemaStatus implements SerialEnum { @@ -62,4 +62,4 @@ public enum SchemaStatus implements SerialEnum { public String string() { return this.name; } -} \ No newline at end of file +} diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/SerialEnum.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/SerialEnum.java similarity index 91% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/SerialEnum.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/define/SerialEnum.java index 45b370558..e0977545b 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/SerialEnum.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/SerialEnum.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.type.define; +package org.apache.hugegraph.type.define; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.CollectionUtil; +import org.apache.hugegraph.util.E; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/WriteType.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/WriteType.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/WriteType.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/type/define/WriteType.java index d8fa36d77..49aa69633 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/type/define/WriteType.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/WriteType.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.type.define; +package org.apache.hugegraph.type.define; public enum WriteType implements SerialEnum { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/Blob.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/Blob.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/Blob.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/Blob.java index d02faa243..f39ddf997 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/Blob.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/Blob.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.util.Arrays; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/CompressUtil.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/CompressUtil.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/CompressUtil.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/CompressUtil.java index 72034a6ea..158d4084c 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/CompressUtil.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/CompressUtil.java @@ -1,21 +1,23 @@ /* + * Copyright 2017 HugeGraph Authors + * * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -46,7 +48,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.io.output.NullOutputStream; -import com.baidu.hugegraph.backend.store.raft.RaftContext; +import org.apache.hugegraph.backend.store.raft.RaftContext; import net.jpountz.lz4.LZ4BlockInputStream; import net.jpountz.lz4.LZ4BlockOutputStream; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/ConfigUtil.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/ConfigUtil.java similarity index 89% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/ConfigUtil.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/ConfigUtil.java index 57462e7b9..9560fb4d8 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/ConfigUtil.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/ConfigUtil.java @@ -1,4 +1,5 @@ /* + * * Copyright 2017 HugeGraph Authors * * Licensed to the Apache Software Foundation (ASF) under one or more @@ -10,14 +11,15 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.io.File; import java.io.IOException; @@ -40,9 +42,9 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.config.HugeConfig; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.config.HugeConfig; public final class ConfigUtil { @@ -109,10 +111,10 @@ public final class ConfigUtil { public static String writeToFile(String dir, String graphName, HugeConfig config) { - File path = FileUtils.getFile(dir); - E.checkArgument(path.exists(), - "The directory '%s' must exist", dir); - String fileName = path.getPath() + File.separator + graphName + CONF_SUFFIX; + File file = FileUtils.getFile(dir); + E.checkArgument(file.exists(), + "The directory '%s' must exist", dir); + String fileName = file.getPath() + File.separator + graphName + CONF_SUFFIX; try { File newFile = FileUtils.getFile(fileName); config.save(newFile); diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/Consumers.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/Consumers.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/Consumers.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/Consumers.java index d833ea097..6a073b9f3 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/Consumers.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/Consumers.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.util.ArrayList; import java.util.List; @@ -34,11 +34,11 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; +import org.apache.hugegraph.config.CoreOptions; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.task.TaskManager.ContextCallable; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.task.TaskManager.ContextCallable; public final class Consumers { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/CopyUtil.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/CopyUtil.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/CopyUtil.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/CopyUtil.java index 52f2b5b38..8bbe1a72e 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/CopyUtil.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/CopyUtil.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.lang.reflect.Array; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import com.baidu.hugegraph.HugeException; +import org.apache.hugegraph.HugeException; public final class CopyUtil { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/Events.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/Events.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/Events.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/Events.java index dec1ed6b0..958e6c1ba 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/Events.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/Events.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; public final class Events { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/FixedTimerWindowRateLimiter.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/FixedTimerWindowRateLimiter.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/FixedTimerWindowRateLimiter.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/FixedTimerWindowRateLimiter.java index c1c6cdee1..88fe6d943 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/FixedTimerWindowRateLimiter.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/FixedTimerWindowRateLimiter.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.util.Timer; import java.util.TimerTask; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/FixedWatchWindowRateLimiter.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/FixedWatchWindowRateLimiter.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/FixedWatchWindowRateLimiter.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/FixedWatchWindowRateLimiter.java index 5678740cc..bfe13c8e2 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/FixedWatchWindowRateLimiter.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/FixedWatchWindowRateLimiter.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.LongAdder; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/GZipUtil.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/GZipUtil.java similarity index 94% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/GZipUtil.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/GZipUtil.java index 5f5b00c48..30b898334 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/GZipUtil.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/GZipUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.util.zip.DataFormatException; import java.util.zip.Deflater; @@ -25,8 +25,8 @@ import java.util.zip.Inflater; import org.apache.commons.codec.digest.DigestUtils; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.serializer.BytesBuffer; /** * Reference from https://dzone.com/articles/how-compress-and-uncompress diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/JsonUtil.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/JsonUtil.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/JsonUtil.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/JsonUtil.java index 85e4b56d9..508fb04fc 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/JsonUtil.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/JsonUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.io.IOException; import java.util.Date; @@ -32,8 +32,8 @@ import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider; import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule; import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.io.HugeGraphSONModule; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.io.HugeGraphSONModule; import com.google.common.collect.ImmutableSet; public final class JsonUtil { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/KryoUtil.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/KryoUtil.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/KryoUtil.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/KryoUtil.java index 1f5d66226..d5f95f5eb 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/KryoUtil.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/KryoUtil.java @@ -17,19 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.UUID; +import org.apache.hugegraph.backend.BackendException; import org.apache.tinkerpop.shaded.kryo.Kryo; import org.apache.tinkerpop.shaded.kryo.Serializer; import org.apache.tinkerpop.shaded.kryo.io.Input; import org.apache.tinkerpop.shaded.kryo.io.Output; -import com.baidu.hugegraph.backend.BackendException; - public final class KryoUtil { private static final ThreadLocal KRYOS = new ThreadLocal<>(); diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/LZ4Util.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/LZ4Util.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/LZ4Util.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/LZ4Util.java index fac78c22f..4a19d668c 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/LZ4Util.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/LZ4Util.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.io.ByteArrayInputStream; import java.io.IOException; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.serializer.BytesBuffer; import net.jpountz.lz4.LZ4BlockInputStream; import net.jpountz.lz4.LZ4BlockOutputStream; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/LockUtil.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/LockUtil.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/LockUtil.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/LockUtil.java index ea480cadf..55206172a 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/LockUtil.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/LockUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.util.ArrayList; import java.util.Arrays; @@ -31,14 +31,14 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; +import org.apache.hugegraph.backend.id.Id; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.concurrent.KeyLock; -import com.baidu.hugegraph.concurrent.LockManager; -import com.baidu.hugegraph.concurrent.RowLock; -import com.baidu.hugegraph.type.HugeType; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.concurrent.KeyLock; +import org.apache.hugegraph.concurrent.LockManager; +import org.apache.hugegraph.concurrent.RowLock; +import org.apache.hugegraph.type.HugeType; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/ParameterUtil.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/ParameterUtil.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/ParameterUtil.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/ParameterUtil.java index bcae5f655..bbe28806b 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/ParameterUtil.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/ParameterUtil.java @@ -17,7 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; + +import org.apache.hugegraph.util.E; import java.util.Map; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/RateLimiter.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/RateLimiter.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/RateLimiter.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/RateLimiter.java index 9888be99f..f5ec49ac9 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/RateLimiter.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/RateLimiter.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; // TODO: Move to common module (concurrent package) public interface RateLimiter { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/Reflection.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/Reflection.java similarity index 97% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/Reflection.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/Reflection.java index 4838b4b46..491a83b4e 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/Reflection.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/Reflection.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.exception.NotSupportException; import org.slf4j.Logger; import java.lang.reflect.InvocationTargetException; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/StringEncoding.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/StringEncoding.java similarity index 89% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/StringEncoding.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/StringEncoding.java index e8eabb9fc..883b5560d 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/StringEncoding.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/StringEncoding.java @@ -16,21 +16,8 @@ * License for the specific language governing permissions and limitations * under the License. */ -// Copyright 2017 JanusGraph Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; @@ -40,8 +27,8 @@ import java.util.UUID; import org.mindrot.jbcrypt.BCrypt; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.backend.serializer.BytesBuffer; import com.google.common.base.CharMatcher; /** diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/CollectionFactory.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/CollectionFactory.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/CollectionFactory.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/CollectionFactory.java index fc20af483..c4f9bf157 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/CollectionFactory.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/CollectionFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util.collection; +package org.apache.hugegraph.util.collection; import java.util.ArrayList; import java.util.Collection; @@ -27,6 +27,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.hugegraph.backend.id.Id; import org.eclipse.collections.api.map.primitive.IntObjectMap; import org.eclipse.collections.api.map.primitive.MutableIntObjectMap; import org.eclipse.collections.impl.list.mutable.FastList; @@ -34,9 +35,8 @@ import org.eclipse.collections.impl.map.mutable.UnifiedMap; import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap; import org.eclipse.collections.impl.set.mutable.UnifiedSet; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.type.define.CollectionType; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.type.define.CollectionType; +import org.apache.hugegraph.util.E; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectArrayList; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/IdSet.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/IdSet.java similarity index 92% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/IdSet.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/IdSet.java index a1e6d6393..858c9e09c 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/IdSet.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/IdSet.java @@ -17,19 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.util.collection; +package org.apache.hugegraph.util.collection; import java.util.AbstractSet; import java.util.Iterator; import java.util.Set; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; import org.eclipse.collections.api.iterator.MutableLongIterator; import org.eclipse.collections.impl.set.mutable.primitive.LongHashSet; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.iterator.ExtendableIterator; -import com.baidu.hugegraph.type.define.CollectionType; +import org.apache.hugegraph.iterator.ExtendableIterator; +import org.apache.hugegraph.type.define.CollectionType; public class IdSet extends AbstractSet { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/Int2IntsMap.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/Int2IntsMap.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/Int2IntsMap.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/Int2IntsMap.java index 72f7178c8..9db460266 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/Int2IntsMap.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/Int2IntsMap.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util.collection; +package org.apache.hugegraph.util.collection; import org.eclipse.collections.api.iterator.IntIterator; import org.eclipse.collections.impl.map.mutable.primitive.IntIntHashMap; @@ -149,7 +149,7 @@ public class Int2IntsMap { public int[] getValues(int key) { int firstChunk = this.chunkMap.getIfAbsent(key, -1); if (firstChunk == -1) { - return com.baidu.hugegraph.util.collection.IntIterator.EMPTY_INTS; + return org.apache.hugegraph.util.collection.IntIterator.EMPTY_INTS; } int size = this.chunkTable[firstChunk + OFFSET_SIZE]; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/IntIterator.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/IntIterator.java similarity index 99% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/IntIterator.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/IntIterator.java index e780dd56a..e2544f039 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/IntIterator.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/IntIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util.collection; +package org.apache.hugegraph.util.collection; import java.util.ArrayList; import java.util.Iterator; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/IntMap.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/IntMap.java similarity index 98% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/IntMap.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/IntMap.java index 5d624d5be..6d4cf0d17 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/IntMap.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/IntMap.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util.collection; +package org.apache.hugegraph.util.collection; import java.util.Arrays; import java.util.NoSuchElementException; @@ -27,9 +27,9 @@ import java.util.function.Function; import org.eclipse.collections.api.map.primitive.MutableIntIntMap; import org.eclipse.collections.impl.map.mutable.primitive.IntIntHashMap; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.collection.IntIterator.IntIterators; -import com.baidu.hugegraph.util.collection.IntIterator.MapperInt2IntIterator; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.collection.IntIterator.IntIterators; +import org.apache.hugegraph.util.collection.IntIterator.MapperInt2IntIterator; import sun.misc.Unsafe; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/IntSet.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/IntSet.java similarity index 99% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/IntSet.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/IntSet.java index 82f56a0a6..ab14c70a6 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/IntSet.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/IntSet.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util.collection; +package org.apache.hugegraph.util.collection; import java.util.Arrays; import java.util.concurrent.atomic.AtomicInteger; @@ -26,7 +26,7 @@ import java.util.function.Function; import org.eclipse.collections.api.collection.primitive.MutableIntCollection; import org.eclipse.collections.impl.set.mutable.primitive.IntHashSet; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.util.E; import io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/ObjectIntMapping.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/ObjectIntMapping.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/ObjectIntMapping.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/ObjectIntMapping.java index 072439b80..8eafe45f9 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/ObjectIntMapping.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/ObjectIntMapping.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util.collection; +package org.apache.hugegraph.util.collection; public interface ObjectIntMapping { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/ObjectIntMappingFactory.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/ObjectIntMappingFactory.java similarity index 96% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/ObjectIntMappingFactory.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/ObjectIntMappingFactory.java index 900b8c502..a473e5437 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/collection/ObjectIntMappingFactory.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/collection/ObjectIntMappingFactory.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.util.collection; +package org.apache.hugegraph.util.collection; import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.perf.PerfUtil.Watched; public class ObjectIntMappingFactory { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/variables/HugeVariables.java b/hugegraph-core/src/main/java/org/apache/hugegraph/variables/HugeVariables.java similarity index 95% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/variables/HugeVariables.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/variables/HugeVariables.java index 265345819..eeebc36a2 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/variables/HugeVariables.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/variables/HugeVariables.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.variables; +package org.apache.hugegraph.variables; import java.util.Arrays; import java.util.Collection; @@ -31,6 +31,19 @@ import java.util.Optional; import java.util.Set; import org.apache.commons.lang3.ArrayUtils; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.query.QueryResults; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.DataType; +import org.apache.hugegraph.type.define.HugeKeys; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Graph.Hidden; import org.apache.tinkerpop.gremlin.structure.Vertex; @@ -38,21 +51,8 @@ import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator; import org.apache.tinkerpop.gremlin.structure.util.StringFactory; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.query.QueryResults; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.util.Log; public class HugeVariables implements Graph.Variables { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/version/CoreVersion.java b/hugegraph-core/src/main/java/org/apache/hugegraph/version/CoreVersion.java similarity index 88% rename from hugegraph-core/src/main/java/com/baidu/hugegraph/version/CoreVersion.java rename to hugegraph-core/src/main/java/org/apache/hugegraph/version/CoreVersion.java index 9e5ae1222..e47fd8fc7 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/version/CoreVersion.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/version/CoreVersion.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.version; +package org.apache.hugegraph.version; -import com.baidu.hugegraph.util.VersionUtil; -import com.baidu.hugegraph.util.VersionUtil.Version; +import org.apache.hugegraph.util.VersionUtil; +import org.apache.hugegraph.util.VersionUtil.Version; public class CoreVersion { @@ -31,7 +31,7 @@ public class CoreVersion { public static final String NAME = "hugegraph-core"; - public static final String DEFAULT_VERSION = "0.13.0"; + public static final String DEFAULT_VERSION = "1.0.0"; // The second parameter of Version.of() is for IDE running without JAR public static final Version VERSION = Version.of(CoreVersion.class, diff --git a/hugegraph-core/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin b/hugegraph-core/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin index 5f43abfd9..f6a769b43 100644 --- a/hugegraph-core/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin +++ b/hugegraph-core/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin @@ -1 +1 @@ -com.baidu.hugegraph.plugin.HugeGraphGremlinPlugin +org.apache.hugegraph.plugin.HugeGraphGremlinPlugin diff --git a/hugegraph-core/src/main/resources/hugegraph.properties b/hugegraph-core/src/main/resources/hugegraph.properties index 4a6fa821e..2f2cb7190 100644 --- a/hugegraph-core/src/main/resources/hugegraph.properties +++ b/hugegraph-core/src/main/resources/hugegraph.properties @@ -1 +1 @@ -gremlin.graph=com.baidu.hugegraph.HugeFactory +gremlin.graph=org.apache.hugegraph.HugeFactory diff --git a/hugegraph-core/src/main/resources/proto/raft.proto b/hugegraph-core/src/main/resources/proto/raft.proto index fdfe107c3..425bfe95f 100644 --- a/hugegraph-core/src/main/resources/proto/raft.proto +++ b/hugegraph-core/src/main/resources/proto/raft.proto @@ -19,9 +19,9 @@ syntax="proto2"; -package com.baidu.hugegraph.backend.store.raft.rpc; +package org.apache.hugegraph.backend.store.raft.rpc; -option java_package="com.baidu.hugegraph.backend.store.raft.rpc"; +option java_package="org.apache.hugegraph.backend.store.raft.rpc"; option java_outer_classname = "RaftRequests"; enum StoreType { diff --git a/hugegraph-core/src/protobuf/java/com/baidu/hugegraph/backend/store/raft/rpc/RaftRequests.java b/hugegraph-core/src/protobuf/java/org/apache/hugegraph/backend/store/raft/rpc/RaftRequests.java similarity index 62% rename from hugegraph-core/src/protobuf/java/com/baidu/hugegraph/backend/store/raft/rpc/RaftRequests.java rename to hugegraph-core/src/protobuf/java/org/apache/hugegraph/backend/store/raft/rpc/RaftRequests.java index 2b1da29ff..9eb160dd3 100644 --- a/hugegraph-core/src/protobuf/java/com/baidu/hugegraph/backend/store/raft/rpc/RaftRequests.java +++ b/hugegraph-core/src/protobuf/java/org/apache/hugegraph/backend/store/raft/rpc/RaftRequests.java @@ -1,26 +1,7 @@ -/* - * Copyright 2017 HugeGraph Authors - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with this - * work for additional information regarding copyright ownership. The ASF - * licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ - // Generated by the protocol buffer compiler. DO NOT EDIT! // source: raft.proto -package com.baidu.hugegraph.backend.store.raft.rpc; +package org.apache.hugegraph.backend.store.raft.rpc; public final class RaftRequests { private RaftRequests() {} @@ -34,7 +15,7 @@ public final class RaftRequests { (com.google.protobuf.ExtensionRegistryLite) registry); } /** - * Protobuf enum {@code com.baidu.hugegraph.backend.store.raft.rpc.StoreType} + * Protobuf enum {@code org.apache.hugegraph.backend.store.raft.rpc.StoreType} */ public enum StoreType implements com.google.protobuf.ProtocolMessageEnum { @@ -124,7 +105,7 @@ public final class RaftRequests { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.getDescriptor().getEnumTypes().get(0); + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.getDescriptor().getEnumTypes().get(0); } private static final StoreType[] VALUES = values(); @@ -144,11 +125,11 @@ public final class RaftRequests { this.value = value; } - // @@protoc_insertion_point(enum_scope:com.baidu.hugegraph.backend.store.raft.rpc.StoreType) + // @@protoc_insertion_point(enum_scope:org.apache.hugegraph.backend.store.raft.rpc.StoreType) } /** - * Protobuf enum {@code com.baidu.hugegraph.backend.store.raft.rpc.StoreAction} + * Protobuf enum {@code org.apache.hugegraph.backend.store.raft.rpc.StoreAction} */ public enum StoreAction implements com.google.protobuf.ProtocolMessageEnum { @@ -301,7 +282,7 @@ public final class RaftRequests { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.getDescriptor().getEnumTypes().get(1); + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.getDescriptor().getEnumTypes().get(1); } private static final StoreAction[] VALUES = values(); @@ -321,34 +302,34 @@ public final class RaftRequests { this.value = value; } - // @@protoc_insertion_point(enum_scope:com.baidu.hugegraph.backend.store.raft.rpc.StoreAction) + // @@protoc_insertion_point(enum_scope:org.apache.hugegraph.backend.store.raft.rpc.StoreAction) } public interface StoreCommandRequestOrBuilder extends - // @@protoc_insertion_point(interface_extends:com.baidu.hugegraph.backend.store.raft.rpc.StoreCommandRequest) + // @@protoc_insertion_point(interface_extends:org.apache.hugegraph.backend.store.raft.rpc.StoreCommandRequest) com.google.protobuf.MessageOrBuilder { /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.StoreType type = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.StoreType type = 1; * @return Whether the type field is set. */ boolean hasType(); /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.StoreType type = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.StoreType type = 1; * @return The type. */ - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType getType(); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType getType(); /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.StoreAction action = 2; + * required .org.apache.hugegraph.backend.store.raft.rpc.StoreAction action = 2; * @return Whether the action field is set. */ boolean hasAction(); /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.StoreAction action = 2; + * required .org.apache.hugegraph.backend.store.raft.rpc.StoreAction action = 2; * @return The action. */ - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction getAction(); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction getAction(); /** * required bytes data = 3; @@ -362,11 +343,11 @@ public final class RaftRequests { com.google.protobuf.ByteString getData(); } /** - * Protobuf type {@code com.baidu.hugegraph.backend.store.raft.rpc.StoreCommandRequest} + * Protobuf type {@code org.apache.hugegraph.backend.store.raft.rpc.StoreCommandRequest} */ public static final class StoreCommandRequest extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:com.baidu.hugegraph.backend.store.raft.rpc.StoreCommandRequest) + // @@protoc_insertion_point(message_implements:org.apache.hugegraph.backend.store.raft.rpc.StoreCommandRequest) StoreCommandRequestOrBuilder { private static final long serialVersionUID = 0L; // Use StoreCommandRequest.newBuilder() to construct. @@ -391,125 +372,56 @@ public final class RaftRequests { getUnknownFields() { return this.unknownFields; } - private StoreCommandRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: { - int rawValue = input.readEnum(); - @SuppressWarnings("deprecation") - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType value = com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(1, rawValue); - } else { - bitField0_ |= 0x00000001; - type_ = rawValue; - } - break; - } - case 16: { - int rawValue = input.readEnum(); - @SuppressWarnings("deprecation") - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction value = com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(2, rawValue); - } else { - bitField0_ |= 0x00000002; - action_ = rawValue; - } - break; - } - case 26: { - bitField0_ |= 0x00000004; - data_ = input.readBytes(); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_StoreCommandRequest_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_StoreCommandRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_StoreCommandRequest_fieldAccessorTable + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_StoreCommandRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest.class, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest.Builder.class); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest.class, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest.Builder.class); } private int bitField0_; public static final int TYPE_FIELD_NUMBER = 1; private int type_; /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.StoreType type = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.StoreType type = 1; * @return Whether the type field is set. */ @java.lang.Override public boolean hasType() { return ((bitField0_ & 0x00000001) != 0); } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.StoreType type = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.StoreType type = 1; * @return The type. */ - @java.lang.Override public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType getType() { + @java.lang.Override public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType getType() { @SuppressWarnings("deprecation") - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType result = com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType.valueOf(type_); - return result == null ? com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType.SCHEMA : result; + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType result = org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType.valueOf(type_); + return result == null ? org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType.SCHEMA : result; } public static final int ACTION_FIELD_NUMBER = 2; private int action_; /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.StoreAction action = 2; + * required .org.apache.hugegraph.backend.store.raft.rpc.StoreAction action = 2; * @return Whether the action field is set. */ @java.lang.Override public boolean hasAction() { return ((bitField0_ & 0x00000002) != 0); } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.StoreAction action = 2; + * required .org.apache.hugegraph.backend.store.raft.rpc.StoreAction action = 2; * @return The action. */ - @java.lang.Override public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction getAction() { + @java.lang.Override public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction getAction() { @SuppressWarnings("deprecation") - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction result = com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction.valueOf(action_); - return result == null ? com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction.NONE : result; + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction result = org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction.valueOf(action_); + return result == null ? org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction.NONE : result; } public static final int DATA_FIELD_NUMBER = 3; @@ -566,7 +478,7 @@ public final class RaftRequests { if (((bitField0_ & 0x00000004) != 0)) { output.writeBytes(3, data_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -587,7 +499,7 @@ public final class RaftRequests { size += com.google.protobuf.CodedOutputStream .computeBytesSize(3, data_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -597,10 +509,10 @@ public final class RaftRequests { if (obj == this) { return true; } - if (!(obj instanceof com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest)) { + if (!(obj instanceof org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest)) { return super.equals(obj); } - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest other = (com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest) obj; + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest other = (org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest) obj; if (hasType() != other.hasType()) return false; if (hasType()) { @@ -615,7 +527,7 @@ public final class RaftRequests { if (!getData() .equals(other.getData())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -638,74 +550,74 @@ public final class RaftRequests { hash = (37 * hash) + DATA_FIELD_NUMBER; hash = (53 * hash) + getData().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseFrom(byte[] data) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseFrom(java.io.InputStream input) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseDelimitedFrom(java.io.InputStream input) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseDelimitedFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -718,7 +630,7 @@ public final class RaftRequests { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest prototype) { + public static Builder newBuilder(org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -734,39 +646,34 @@ public final class RaftRequests { return builder; } /** - * Protobuf type {@code com.baidu.hugegraph.backend.store.raft.rpc.StoreCommandRequest} + * Protobuf type {@code org.apache.hugegraph.backend.store.raft.rpc.StoreCommandRequest} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:com.baidu.hugegraph.backend.store.raft.rpc.StoreCommandRequest) - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequestOrBuilder { + // @@protoc_insertion_point(builder_implements:org.apache.hugegraph.backend.store.raft.rpc.StoreCommandRequest) + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_StoreCommandRequest_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_StoreCommandRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_StoreCommandRequest_fieldAccessorTable + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_StoreCommandRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest.class, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest.Builder.class); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest.class, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest.Builder.class); } - // Construct using com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest.newBuilder() + // Construct using org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { @@ -783,17 +690,17 @@ public final class RaftRequests { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_StoreCommandRequest_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_StoreCommandRequest_descriptor; } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest getDefaultInstanceForType() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest.getDefaultInstance(); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest getDefaultInstanceForType() { + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest.getDefaultInstance(); } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest build() { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest result = buildPartial(); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest build() { + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -801,8 +708,8 @@ public final class RaftRequests { } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest buildPartial() { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest result = new com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest(this); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest buildPartial() { + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest result = new org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -856,16 +763,16 @@ public final class RaftRequests { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest) { - return mergeFrom((com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest)other); + if (other instanceof org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest) { + return mergeFrom((org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest other) { - if (other == com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest.getDefaultInstance()) return this; + public Builder mergeFrom(org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest other) { + if (other == org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -875,7 +782,7 @@ public final class RaftRequests { if (other.hasData()) { setData(other.getData()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -899,45 +806,87 @@ public final class RaftRequests { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + int tmpRaw = input.readEnum(); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType tmpValue = + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType.forNumber(tmpRaw); + if (tmpValue == null) { + mergeUnknownVarintField(1, tmpRaw); + } else { + type_ = tmpRaw; + bitField0_ |= 0x00000001; + } + break; + } // case 8 + case 16: { + int tmpRaw = input.readEnum(); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction tmpValue = + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction.forNumber(tmpRaw); + if (tmpValue == null) { + mergeUnknownVarintField(2, tmpRaw); + } else { + action_ = tmpRaw; + bitField0_ |= 0x00000002; + } + break; + } // case 16 + case 26: { + data_ = input.readBytes(); + bitField0_ |= 0x00000004; + break; + } // case 26 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; private int type_ = 0; /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.StoreType type = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.StoreType type = 1; * @return Whether the type field is set. */ @java.lang.Override public boolean hasType() { return ((bitField0_ & 0x00000001) != 0); } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.StoreType type = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.StoreType type = 1; * @return The type. */ @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType getType() { + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType getType() { @SuppressWarnings("deprecation") - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType result = com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType.valueOf(type_); - return result == null ? com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType.SCHEMA : result; + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType result = org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType.valueOf(type_); + return result == null ? org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType.SCHEMA : result; } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.StoreType type = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.StoreType type = 1; * @param value The type to set. * @return This builder for chaining. */ - public Builder setType(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType value) { + public Builder setType(org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType value) { if (value == null) { throw new NullPointerException(); } @@ -947,7 +896,7 @@ public final class RaftRequests { return this; } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.StoreType type = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.StoreType type = 1; * @return This builder for chaining. */ public Builder clearType() { @@ -959,28 +908,28 @@ public final class RaftRequests { private int action_ = 0; /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.StoreAction action = 2; + * required .org.apache.hugegraph.backend.store.raft.rpc.StoreAction action = 2; * @return Whether the action field is set. */ @java.lang.Override public boolean hasAction() { return ((bitField0_ & 0x00000002) != 0); } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.StoreAction action = 2; + * required .org.apache.hugegraph.backend.store.raft.rpc.StoreAction action = 2; * @return The action. */ @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction getAction() { + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction getAction() { @SuppressWarnings("deprecation") - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction result = com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction.valueOf(action_); - return result == null ? com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction.NONE : result; + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction result = org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction.valueOf(action_); + return result == null ? org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction.NONE : result; } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.StoreAction action = 2; + * required .org.apache.hugegraph.backend.store.raft.rpc.StoreAction action = 2; * @param value The action to set. * @return This builder for chaining. */ - public Builder setAction(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction value) { + public Builder setAction(org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction value) { if (value == null) { throw new NullPointerException(); } @@ -990,7 +939,7 @@ public final class RaftRequests { return this; } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.StoreAction action = 2; + * required .org.apache.hugegraph.backend.store.raft.rpc.StoreAction action = 2; * @return This builder for chaining. */ public Builder clearAction() { @@ -1054,16 +1003,16 @@ public final class RaftRequests { } - // @@protoc_insertion_point(builder_scope:com.baidu.hugegraph.backend.store.raft.rpc.StoreCommandRequest) + // @@protoc_insertion_point(builder_scope:org.apache.hugegraph.backend.store.raft.rpc.StoreCommandRequest) } - // @@protoc_insertion_point(class_scope:com.baidu.hugegraph.backend.store.raft.rpc.StoreCommandRequest) - private static final com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:org.apache.hugegraph.backend.store.raft.rpc.StoreCommandRequest) + private static final org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest(); + DEFAULT_INSTANCE = new org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest(); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest getDefaultInstance() { + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -1074,7 +1023,18 @@ public final class RaftRequests { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new StoreCommandRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -1088,14 +1048,14 @@ public final class RaftRequests { } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest getDefaultInstanceForType() { + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface StoreCommandResponseOrBuilder extends - // @@protoc_insertion_point(interface_extends:com.baidu.hugegraph.backend.store.raft.rpc.StoreCommandResponse) + // @@protoc_insertion_point(interface_extends:org.apache.hugegraph.backend.store.raft.rpc.StoreCommandResponse) com.google.protobuf.MessageOrBuilder { /** @@ -1127,11 +1087,11 @@ public final class RaftRequests { getMessageBytes(); } /** - * Protobuf type {@code com.baidu.hugegraph.backend.store.raft.rpc.StoreCommandResponse} + * Protobuf type {@code org.apache.hugegraph.backend.store.raft.rpc.StoreCommandResponse} */ public static final class StoreCommandResponse extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:com.baidu.hugegraph.backend.store.raft.rpc.StoreCommandResponse) + // @@protoc_insertion_point(message_implements:org.apache.hugegraph.backend.store.raft.rpc.StoreCommandResponse) StoreCommandResponseOrBuilder { private static final long serialVersionUID = 0L; // Use StoreCommandResponse.newBuilder() to construct. @@ -1154,68 +1114,17 @@ public final class RaftRequests { getUnknownFields() { return this.unknownFields; } - private StoreCommandResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: { - bitField0_ |= 0x00000001; - status_ = input.readBool(); - break; - } - case 18: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000002; - message_ = bs; - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_StoreCommandResponse_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_StoreCommandResponse_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_StoreCommandResponse_fieldAccessorTable + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_StoreCommandResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse.class, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse.Builder.class); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse.class, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse.Builder.class); } private int bitField0_; @@ -1310,7 +1219,7 @@ public final class RaftRequests { if (((bitField0_ & 0x00000002) != 0)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, message_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1326,7 +1235,7 @@ public final class RaftRequests { if (((bitField0_ & 0x00000002) != 0)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, message_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1336,10 +1245,10 @@ public final class RaftRequests { if (obj == this) { return true; } - if (!(obj instanceof com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse)) { + if (!(obj instanceof org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse)) { return super.equals(obj); } - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse other = (com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse) obj; + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse other = (org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse) obj; if (hasStatus() != other.hasStatus()) return false; if (hasStatus()) { @@ -1351,7 +1260,7 @@ public final class RaftRequests { if (!getMessage() .equals(other.getMessage())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1371,74 +1280,74 @@ public final class RaftRequests { hash = (37 * hash) + MESSAGE_FIELD_NUMBER; hash = (53 * hash) + getMessage().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseFrom(byte[] data) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseFrom(java.io.InputStream input) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseDelimitedFrom(java.io.InputStream input) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseDelimitedFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1451,7 +1360,7 @@ public final class RaftRequests { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse prototype) { + public static Builder newBuilder(org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -1467,39 +1376,34 @@ public final class RaftRequests { return builder; } /** - * Protobuf type {@code com.baidu.hugegraph.backend.store.raft.rpc.StoreCommandResponse} + * Protobuf type {@code org.apache.hugegraph.backend.store.raft.rpc.StoreCommandResponse} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:com.baidu.hugegraph.backend.store.raft.rpc.StoreCommandResponse) - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponseOrBuilder { + // @@protoc_insertion_point(builder_implements:org.apache.hugegraph.backend.store.raft.rpc.StoreCommandResponse) + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_StoreCommandResponse_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_StoreCommandResponse_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_StoreCommandResponse_fieldAccessorTable + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_StoreCommandResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse.class, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse.Builder.class); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse.class, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse.Builder.class); } - // Construct using com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse.newBuilder() + // Construct using org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { @@ -1514,17 +1418,17 @@ public final class RaftRequests { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_StoreCommandResponse_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_StoreCommandResponse_descriptor; } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse getDefaultInstanceForType() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse.getDefaultInstance(); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse getDefaultInstanceForType() { + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse.getDefaultInstance(); } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse build() { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse result = buildPartial(); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse build() { + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -1532,8 +1436,8 @@ public final class RaftRequests { } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse buildPartial() { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse result = new com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse(this); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse buildPartial() { + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse result = new org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -1583,16 +1487,16 @@ public final class RaftRequests { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse) { - return mergeFrom((com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse)other); + if (other instanceof org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse) { + return mergeFrom((org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse other) { - if (other == com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse.getDefaultInstance()) return this; + public Builder mergeFrom(org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse other) { + if (other == org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse.getDefaultInstance()) return this; if (other.hasStatus()) { setStatus(other.getStatus()); } @@ -1601,7 +1505,7 @@ public final class RaftRequests { message_ = other.message_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1619,17 +1523,40 @@ public final class RaftRequests { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + status_ = input.readBool(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 18: { + message_ = input.readBytes(); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -1769,16 +1696,16 @@ public final class RaftRequests { } - // @@protoc_insertion_point(builder_scope:com.baidu.hugegraph.backend.store.raft.rpc.StoreCommandResponse) + // @@protoc_insertion_point(builder_scope:org.apache.hugegraph.backend.store.raft.rpc.StoreCommandResponse) } - // @@protoc_insertion_point(class_scope:com.baidu.hugegraph.backend.store.raft.rpc.StoreCommandResponse) - private static final com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:org.apache.hugegraph.backend.store.raft.rpc.StoreCommandResponse) + private static final org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse(); + DEFAULT_INSTANCE = new org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse(); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse getDefaultInstance() { + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -1789,7 +1716,18 @@ public final class RaftRequests { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new StoreCommandResponse(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -1803,14 +1741,14 @@ public final class RaftRequests { } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse getDefaultInstanceForType() { + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreCommandResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface CommonResponseOrBuilder extends - // @@protoc_insertion_point(interface_extends:com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse) + // @@protoc_insertion_point(interface_extends:org.apache.hugegraph.backend.store.raft.rpc.CommonResponse) com.google.protobuf.MessageOrBuilder { /** @@ -1842,11 +1780,11 @@ public final class RaftRequests { getMessageBytes(); } /** - * Protobuf type {@code com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse} + * Protobuf type {@code org.apache.hugegraph.backend.store.raft.rpc.CommonResponse} */ public static final class CommonResponse extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse) + // @@protoc_insertion_point(message_implements:org.apache.hugegraph.backend.store.raft.rpc.CommonResponse) CommonResponseOrBuilder { private static final long serialVersionUID = 0L; // Use CommonResponse.newBuilder() to construct. @@ -1869,68 +1807,17 @@ public final class RaftRequests { getUnknownFields() { return this.unknownFields; } - private CommonResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: { - bitField0_ |= 0x00000001; - status_ = input.readBool(); - break; - } - case 18: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000002; - message_ = bs; - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_CommonResponse_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_CommonResponse_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_CommonResponse_fieldAccessorTable + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_CommonResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.class, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder.class); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.class, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder.class); } private int bitField0_; @@ -2025,7 +1912,7 @@ public final class RaftRequests { if (((bitField0_ & 0x00000002) != 0)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, message_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -2041,7 +1928,7 @@ public final class RaftRequests { if (((bitField0_ & 0x00000002) != 0)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, message_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -2051,10 +1938,10 @@ public final class RaftRequests { if (obj == this) { return true; } - if (!(obj instanceof com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse)) { + if (!(obj instanceof org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse)) { return super.equals(obj); } - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse other = (com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse) obj; + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse other = (org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse) obj; if (hasStatus() != other.hasStatus()) return false; if (hasStatus()) { @@ -2066,7 +1953,7 @@ public final class RaftRequests { if (!getMessage() .equals(other.getMessage())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -2086,74 +1973,74 @@ public final class RaftRequests { hash = (37 * hash) + MESSAGE_FIELD_NUMBER; hash = (53 * hash) + getMessage().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseFrom(byte[] data) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseFrom(java.io.InputStream input) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseDelimitedFrom(java.io.InputStream input) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseDelimitedFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2166,7 +2053,7 @@ public final class RaftRequests { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse prototype) { + public static Builder newBuilder(org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -2182,39 +2069,34 @@ public final class RaftRequests { return builder; } /** - * Protobuf type {@code com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse} + * Protobuf type {@code org.apache.hugegraph.backend.store.raft.rpc.CommonResponse} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse) - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder { + // @@protoc_insertion_point(builder_implements:org.apache.hugegraph.backend.store.raft.rpc.CommonResponse) + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_CommonResponse_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_CommonResponse_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_CommonResponse_fieldAccessorTable + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_CommonResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.class, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder.class); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.class, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder.class); } - // Construct using com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.newBuilder() + // Construct using org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { @@ -2229,17 +2111,17 @@ public final class RaftRequests { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_CommonResponse_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_CommonResponse_descriptor; } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse getDefaultInstanceForType() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance(); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse getDefaultInstanceForType() { + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance(); } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse build() { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse result = buildPartial(); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse build() { + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -2247,8 +2129,8 @@ public final class RaftRequests { } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse buildPartial() { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse result = new com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse(this); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse buildPartial() { + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse result = new org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -2298,16 +2180,16 @@ public final class RaftRequests { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse) { - return mergeFrom((com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse)other); + if (other instanceof org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse) { + return mergeFrom((org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse other) { - if (other == com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance()) return this; + public Builder mergeFrom(org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse other) { + if (other == org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance()) return this; if (other.hasStatus()) { setStatus(other.getStatus()); } @@ -2316,7 +2198,7 @@ public final class RaftRequests { message_ = other.message_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2334,17 +2216,40 @@ public final class RaftRequests { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + status_ = input.readBool(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 18: { + message_ = input.readBytes(); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -2484,16 +2389,16 @@ public final class RaftRequests { } - // @@protoc_insertion_point(builder_scope:com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse) + // @@protoc_insertion_point(builder_scope:org.apache.hugegraph.backend.store.raft.rpc.CommonResponse) } - // @@protoc_insertion_point(class_scope:com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse) - private static final com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:org.apache.hugegraph.backend.store.raft.rpc.CommonResponse) + private static final org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse(); + DEFAULT_INSTANCE = new org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse(); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse getDefaultInstance() { + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -2504,7 +2409,18 @@ public final class RaftRequests { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CommonResponse(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -2518,22 +2434,22 @@ public final class RaftRequests { } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse getDefaultInstanceForType() { + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface ListPeersRequestOrBuilder extends - // @@protoc_insertion_point(interface_extends:com.baidu.hugegraph.backend.store.raft.rpc.ListPeersRequest) + // @@protoc_insertion_point(interface_extends:org.apache.hugegraph.backend.store.raft.rpc.ListPeersRequest) com.google.protobuf.MessageOrBuilder { } /** - * Protobuf type {@code com.baidu.hugegraph.backend.store.raft.rpc.ListPeersRequest} + * Protobuf type {@code org.apache.hugegraph.backend.store.raft.rpc.ListPeersRequest} */ public static final class ListPeersRequest extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:com.baidu.hugegraph.backend.store.raft.rpc.ListPeersRequest) + // @@protoc_insertion_point(message_implements:org.apache.hugegraph.backend.store.raft.rpc.ListPeersRequest) ListPeersRequestOrBuilder { private static final long serialVersionUID = 0L; // Use ListPeersRequest.newBuilder() to construct. @@ -2555,56 +2471,17 @@ public final class RaftRequests { getUnknownFields() { return this.unknownFields; } - private ListPeersRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_ListPeersRequest_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_ListPeersRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_ListPeersRequest_fieldAccessorTable + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_ListPeersRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest.class, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest.Builder.class); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest.class, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest.Builder.class); } private byte memoizedIsInitialized = -1; @@ -2621,7 +2498,7 @@ public final class RaftRequests { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -2630,7 +2507,7 @@ public final class RaftRequests { if (size != -1) return size; size = 0; - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -2640,12 +2517,12 @@ public final class RaftRequests { if (obj == this) { return true; } - if (!(obj instanceof com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest)) { + if (!(obj instanceof org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest)) { return super.equals(obj); } - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest other = (com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest) obj; + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest other = (org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest) obj; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -2656,74 +2533,74 @@ public final class RaftRequests { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseFrom(byte[] data) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseFrom(java.io.InputStream input) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseDelimitedFrom(java.io.InputStream input) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseDelimitedFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2736,7 +2613,7 @@ public final class RaftRequests { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest prototype) { + public static Builder newBuilder(org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -2752,39 +2629,34 @@ public final class RaftRequests { return builder; } /** - * Protobuf type {@code com.baidu.hugegraph.backend.store.raft.rpc.ListPeersRequest} + * Protobuf type {@code org.apache.hugegraph.backend.store.raft.rpc.ListPeersRequest} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:com.baidu.hugegraph.backend.store.raft.rpc.ListPeersRequest) - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequestOrBuilder { + // @@protoc_insertion_point(builder_implements:org.apache.hugegraph.backend.store.raft.rpc.ListPeersRequest) + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_ListPeersRequest_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_ListPeersRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_ListPeersRequest_fieldAccessorTable + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_ListPeersRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest.class, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest.Builder.class); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest.class, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest.Builder.class); } - // Construct using com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest.newBuilder() + // Construct using org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { @@ -2795,17 +2667,17 @@ public final class RaftRequests { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_ListPeersRequest_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_ListPeersRequest_descriptor; } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest getDefaultInstanceForType() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest.getDefaultInstance(); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest getDefaultInstanceForType() { + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest.getDefaultInstance(); } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest build() { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest result = buildPartial(); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest build() { + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -2813,8 +2685,8 @@ public final class RaftRequests { } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest buildPartial() { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest result = new com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest(this); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest buildPartial() { + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest result = new org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest(this); onBuilt(); return result; } @@ -2853,17 +2725,17 @@ public final class RaftRequests { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest) { - return mergeFrom((com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest)other); + if (other instanceof org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest) { + return mergeFrom((org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest other) { - if (other == com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest.getDefaultInstance()) return this; - this.mergeUnknownFields(other.unknownFields); + public Builder mergeFrom(org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest other) { + if (other == org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest.getDefaultInstance()) return this; + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2878,17 +2750,30 @@ public final class RaftRequests { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @java.lang.Override @@ -2904,16 +2789,16 @@ public final class RaftRequests { } - // @@protoc_insertion_point(builder_scope:com.baidu.hugegraph.backend.store.raft.rpc.ListPeersRequest) + // @@protoc_insertion_point(builder_scope:org.apache.hugegraph.backend.store.raft.rpc.ListPeersRequest) } - // @@protoc_insertion_point(class_scope:com.baidu.hugegraph.backend.store.raft.rpc.ListPeersRequest) - private static final com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:org.apache.hugegraph.backend.store.raft.rpc.ListPeersRequest) + private static final org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest(); + DEFAULT_INSTANCE = new org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest(); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest getDefaultInstance() { + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -2924,7 +2809,18 @@ public final class RaftRequests { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ListPeersRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -2938,30 +2834,30 @@ public final class RaftRequests { } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest getDefaultInstanceForType() { + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface ListPeersResponseOrBuilder extends - // @@protoc_insertion_point(interface_extends:com.baidu.hugegraph.backend.store.raft.rpc.ListPeersResponse) + // @@protoc_insertion_point(interface_extends:org.apache.hugegraph.backend.store.raft.rpc.ListPeersResponse) com.google.protobuf.MessageOrBuilder { /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; * @return Whether the common field is set. */ boolean hasCommon(); /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; * @return The common. */ - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse getCommon(); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse getCommon(); /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; */ - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder getCommonOrBuilder(); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder getCommonOrBuilder(); /** * repeated string endpoints = 2; @@ -2989,11 +2885,11 @@ public final class RaftRequests { getEndpointsBytes(int index); } /** - * Protobuf type {@code com.baidu.hugegraph.backend.store.raft.rpc.ListPeersResponse} + * Protobuf type {@code org.apache.hugegraph.backend.store.raft.rpc.ListPeersResponse} */ public static final class ListPeersResponse extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:com.baidu.hugegraph.backend.store.raft.rpc.ListPeersResponse) + // @@protoc_insertion_point(message_implements:org.apache.hugegraph.backend.store.raft.rpc.ListPeersResponse) ListPeersResponseOrBuilder { private static final long serialVersionUID = 0L; // Use ListPeersResponse.newBuilder() to construct. @@ -3016,89 +2912,24 @@ public final class RaftRequests { getUnknownFields() { return this.unknownFields; } - private ListPeersResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) != 0)) { - subBuilder = common_.toBuilder(); - } - common_ = input.readMessage(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(common_); - common_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - case 18: { - com.google.protobuf.ByteString bs = input.readBytes(); - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - endpoints_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000002; - } - endpoints_.add(bs); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000002) != 0)) { - endpoints_ = endpoints_.getUnmodifiableView(); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_ListPeersResponse_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_ListPeersResponse_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_ListPeersResponse_fieldAccessorTable + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_ListPeersResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse.class, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse.Builder.class); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse.class, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse.Builder.class); } private int bitField0_; public static final int COMMON_FIELD_NUMBER = 1; - private com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse common_; + private org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse common_; /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; * @return Whether the common field is set. */ @java.lang.Override @@ -3106,19 +2937,19 @@ public final class RaftRequests { return ((bitField0_ & 0x00000001) != 0); } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; * @return The common. */ @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse getCommon() { - return common_ == null ? com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance() : common_; + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse getCommon() { + return common_ == null ? org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance() : common_; } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; */ @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder getCommonOrBuilder() { - return common_ == null ? com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance() : common_; + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder getCommonOrBuilder() { + return common_ == null ? org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance() : common_; } public static final int ENDPOINTS_FIELD_NUMBER = 2; @@ -3184,7 +3015,7 @@ public final class RaftRequests { for (int i = 0; i < endpoints_.size(); i++) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, endpoints_.getRaw(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -3205,7 +3036,7 @@ public final class RaftRequests { size += dataSize; size += 1 * getEndpointsList().size(); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -3215,10 +3046,10 @@ public final class RaftRequests { if (obj == this) { return true; } - if (!(obj instanceof com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse)) { + if (!(obj instanceof org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse)) { return super.equals(obj); } - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse other = (com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse) obj; + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse other = (org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse) obj; if (hasCommon() != other.hasCommon()) return false; if (hasCommon()) { @@ -3227,7 +3058,7 @@ public final class RaftRequests { } if (!getEndpointsList() .equals(other.getEndpointsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -3246,74 +3077,74 @@ public final class RaftRequests { hash = (37 * hash) + ENDPOINTS_FIELD_NUMBER; hash = (53 * hash) + getEndpointsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseFrom(byte[] data) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseFrom(java.io.InputStream input) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseDelimitedFrom(java.io.InputStream input) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseDelimitedFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3326,7 +3157,7 @@ public final class RaftRequests { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse prototype) { + public static Builder newBuilder(org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -3342,26 +3173,26 @@ public final class RaftRequests { return builder; } /** - * Protobuf type {@code com.baidu.hugegraph.backend.store.raft.rpc.ListPeersResponse} + * Protobuf type {@code org.apache.hugegraph.backend.store.raft.rpc.ListPeersResponse} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:com.baidu.hugegraph.backend.store.raft.rpc.ListPeersResponse) - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponseOrBuilder { + // @@protoc_insertion_point(builder_implements:org.apache.hugegraph.backend.store.raft.rpc.ListPeersResponse) + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_ListPeersResponse_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_ListPeersResponse_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_ListPeersResponse_fieldAccessorTable + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_ListPeersResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse.class, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse.Builder.class); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse.class, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse.Builder.class); } - // Construct using com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse.newBuilder() + // Construct using org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -3394,17 +3225,17 @@ public final class RaftRequests { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_ListPeersResponse_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_ListPeersResponse_descriptor; } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse getDefaultInstanceForType() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse.getDefaultInstance(); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse getDefaultInstanceForType() { + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse.getDefaultInstance(); } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse build() { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse result = buildPartial(); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse build() { + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -3412,8 +3243,8 @@ public final class RaftRequests { } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse buildPartial() { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse result = new com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse(this); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse buildPartial() { + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse result = new org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -3468,16 +3299,16 @@ public final class RaftRequests { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse) { - return mergeFrom((com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse)other); + if (other instanceof org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse) { + return mergeFrom((org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse other) { - if (other == com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse.getDefaultInstance()) return this; + public Builder mergeFrom(org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse other) { + if (other == org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse.getDefaultInstance()) return this; if (other.hasCommon()) { mergeCommon(other.getCommon()); } @@ -3491,7 +3322,7 @@ public final class RaftRequests { } onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -3512,46 +3343,72 @@ public final class RaftRequests { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + input.readMessage( + getCommonFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + com.google.protobuf.ByteString bs = input.readBytes(); + ensureEndpointsIsMutable(); + endpoints_.add(bs); + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; - private com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse common_; + private org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse common_; private com.google.protobuf.SingleFieldBuilderV3< - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder> commonBuilder_; + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder> commonBuilder_; /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; * @return Whether the common field is set. */ public boolean hasCommon() { return ((bitField0_ & 0x00000001) != 0); } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; * @return The common. */ - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse getCommon() { + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse getCommon() { if (commonBuilder_ == null) { - return common_ == null ? com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance() : common_; + return common_ == null ? org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance() : common_; } else { return commonBuilder_.getMessage(); } } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; */ - public Builder setCommon(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse value) { + public Builder setCommon(org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse value) { if (commonBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -3565,10 +3422,10 @@ public final class RaftRequests { return this; } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; */ public Builder setCommon( - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder builderForValue) { + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder builderForValue) { if (commonBuilder_ == null) { common_ = builderForValue.build(); onChanged(); @@ -3579,15 +3436,15 @@ public final class RaftRequests { return this; } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; */ - public Builder mergeCommon(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse value) { + public Builder mergeCommon(org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse value) { if (commonBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0) && common_ != null && - common_ != com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance()) { + common_ != org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance()) { common_ = - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.newBuilder(common_).mergeFrom(value).buildPartial(); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.newBuilder(common_).mergeFrom(value).buildPartial(); } else { common_ = value; } @@ -3599,7 +3456,7 @@ public final class RaftRequests { return this; } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; */ public Builder clearCommon() { if (commonBuilder_ == null) { @@ -3612,33 +3469,33 @@ public final class RaftRequests { return this; } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; */ - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder getCommonBuilder() { + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder getCommonBuilder() { bitField0_ |= 0x00000001; onChanged(); return getCommonFieldBuilder().getBuilder(); } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; */ - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder getCommonOrBuilder() { + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder getCommonOrBuilder() { if (commonBuilder_ != null) { return commonBuilder_.getMessageOrBuilder(); } else { return common_ == null ? - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance() : common_; + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance() : common_; } } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder> + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder> getCommonFieldBuilder() { if (commonBuilder_ == null) { commonBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder>( + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder>( getCommon(), getParentForChildren(), isClean()); @@ -3768,16 +3625,16 @@ public final class RaftRequests { } - // @@protoc_insertion_point(builder_scope:com.baidu.hugegraph.backend.store.raft.rpc.ListPeersResponse) + // @@protoc_insertion_point(builder_scope:org.apache.hugegraph.backend.store.raft.rpc.ListPeersResponse) } - // @@protoc_insertion_point(class_scope:com.baidu.hugegraph.backend.store.raft.rpc.ListPeersResponse) - private static final com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:org.apache.hugegraph.backend.store.raft.rpc.ListPeersResponse) + private static final org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse(); + DEFAULT_INSTANCE = new org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse(); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse getDefaultInstance() { + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -3788,7 +3645,18 @@ public final class RaftRequests { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ListPeersResponse(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -3802,14 +3670,14 @@ public final class RaftRequests { } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse getDefaultInstanceForType() { + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.ListPeersResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface SetLeaderRequestOrBuilder extends - // @@protoc_insertion_point(interface_extends:com.baidu.hugegraph.backend.store.raft.rpc.SetLeaderRequest) + // @@protoc_insertion_point(interface_extends:org.apache.hugegraph.backend.store.raft.rpc.SetLeaderRequest) com.google.protobuf.MessageOrBuilder { /** @@ -3830,11 +3698,11 @@ public final class RaftRequests { getEndpointBytes(); } /** - * Protobuf type {@code com.baidu.hugegraph.backend.store.raft.rpc.SetLeaderRequest} + * Protobuf type {@code org.apache.hugegraph.backend.store.raft.rpc.SetLeaderRequest} */ public static final class SetLeaderRequest extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:com.baidu.hugegraph.backend.store.raft.rpc.SetLeaderRequest) + // @@protoc_insertion_point(message_implements:org.apache.hugegraph.backend.store.raft.rpc.SetLeaderRequest) SetLeaderRequestOrBuilder { private static final long serialVersionUID = 0L; // Use SetLeaderRequest.newBuilder() to construct. @@ -3857,63 +3725,17 @@ public final class RaftRequests { getUnknownFields() { return this.unknownFields; } - private SetLeaderRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000001; - endpoint_ = bs; - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_SetLeaderRequest_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_SetLeaderRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_SetLeaderRequest_fieldAccessorTable + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_SetLeaderRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest.class, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest.Builder.class); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest.class, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest.Builder.class); } private int bitField0_; @@ -3986,7 +3808,7 @@ public final class RaftRequests { if (((bitField0_ & 0x00000001) != 0)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, endpoint_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -3998,7 +3820,7 @@ public final class RaftRequests { if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, endpoint_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -4008,17 +3830,17 @@ public final class RaftRequests { if (obj == this) { return true; } - if (!(obj instanceof com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest)) { + if (!(obj instanceof org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest)) { return super.equals(obj); } - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest other = (com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest) obj; + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest other = (org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest) obj; if (hasEndpoint() != other.hasEndpoint()) return false; if (hasEndpoint()) { if (!getEndpoint() .equals(other.getEndpoint())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -4033,74 +3855,74 @@ public final class RaftRequests { hash = (37 * hash) + ENDPOINT_FIELD_NUMBER; hash = (53 * hash) + getEndpoint().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseFrom(byte[] data) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseFrom(java.io.InputStream input) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseDelimitedFrom(java.io.InputStream input) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseDelimitedFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4113,7 +3935,7 @@ public final class RaftRequests { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest prototype) { + public static Builder newBuilder(org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -4129,39 +3951,34 @@ public final class RaftRequests { return builder; } /** - * Protobuf type {@code com.baidu.hugegraph.backend.store.raft.rpc.SetLeaderRequest} + * Protobuf type {@code org.apache.hugegraph.backend.store.raft.rpc.SetLeaderRequest} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:com.baidu.hugegraph.backend.store.raft.rpc.SetLeaderRequest) - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequestOrBuilder { + // @@protoc_insertion_point(builder_implements:org.apache.hugegraph.backend.store.raft.rpc.SetLeaderRequest) + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_SetLeaderRequest_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_SetLeaderRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_SetLeaderRequest_fieldAccessorTable + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_SetLeaderRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest.class, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest.Builder.class); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest.class, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest.Builder.class); } - // Construct using com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest.newBuilder() + // Construct using org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { @@ -4174,17 +3991,17 @@ public final class RaftRequests { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_SetLeaderRequest_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_SetLeaderRequest_descriptor; } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest getDefaultInstanceForType() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest.getDefaultInstance(); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest getDefaultInstanceForType() { + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest.getDefaultInstance(); } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest build() { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest result = buildPartial(); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest build() { + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -4192,8 +4009,8 @@ public final class RaftRequests { } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest buildPartial() { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest result = new com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest(this); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest buildPartial() { + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest result = new org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -4239,22 +4056,22 @@ public final class RaftRequests { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest) { - return mergeFrom((com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest)other); + if (other instanceof org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest) { + return mergeFrom((org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest other) { - if (other == com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest.getDefaultInstance()) return this; + public Builder mergeFrom(org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest other) { + if (other == org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest.getDefaultInstance()) return this; if (other.hasEndpoint()) { bitField0_ |= 0x00000001; endpoint_ = other.endpoint_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -4272,17 +4089,35 @@ public final class RaftRequests { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + endpoint_ = input.readBytes(); + bitField0_ |= 0x00000001; + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -4383,16 +4218,16 @@ public final class RaftRequests { } - // @@protoc_insertion_point(builder_scope:com.baidu.hugegraph.backend.store.raft.rpc.SetLeaderRequest) + // @@protoc_insertion_point(builder_scope:org.apache.hugegraph.backend.store.raft.rpc.SetLeaderRequest) } - // @@protoc_insertion_point(class_scope:com.baidu.hugegraph.backend.store.raft.rpc.SetLeaderRequest) - private static final com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:org.apache.hugegraph.backend.store.raft.rpc.SetLeaderRequest) + private static final org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest(); + DEFAULT_INSTANCE = new org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest(); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest getDefaultInstance() { + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -4403,7 +4238,18 @@ public final class RaftRequests { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SetLeaderRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -4417,37 +4263,37 @@ public final class RaftRequests { } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest getDefaultInstanceForType() { + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface SetLeaderResponseOrBuilder extends - // @@protoc_insertion_point(interface_extends:com.baidu.hugegraph.backend.store.raft.rpc.SetLeaderResponse) + // @@protoc_insertion_point(interface_extends:org.apache.hugegraph.backend.store.raft.rpc.SetLeaderResponse) com.google.protobuf.MessageOrBuilder { /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; * @return Whether the common field is set. */ boolean hasCommon(); /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; * @return The common. */ - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse getCommon(); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse getCommon(); /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; */ - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder getCommonOrBuilder(); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder getCommonOrBuilder(); } /** - * Protobuf type {@code com.baidu.hugegraph.backend.store.raft.rpc.SetLeaderResponse} + * Protobuf type {@code org.apache.hugegraph.backend.store.raft.rpc.SetLeaderResponse} */ public static final class SetLeaderResponse extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:com.baidu.hugegraph.backend.store.raft.rpc.SetLeaderResponse) + // @@protoc_insertion_point(message_implements:org.apache.hugegraph.backend.store.raft.rpc.SetLeaderResponse) SetLeaderResponseOrBuilder { private static final long serialVersionUID = 0L; // Use SetLeaderResponse.newBuilder() to construct. @@ -4469,77 +4315,24 @@ public final class RaftRequests { getUnknownFields() { return this.unknownFields; } - private SetLeaderResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) != 0)) { - subBuilder = common_.toBuilder(); - } - common_ = input.readMessage(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(common_); - common_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_SetLeaderResponse_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_SetLeaderResponse_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_SetLeaderResponse_fieldAccessorTable + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_SetLeaderResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse.class, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse.Builder.class); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse.class, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse.Builder.class); } private int bitField0_; public static final int COMMON_FIELD_NUMBER = 1; - private com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse common_; + private org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse common_; /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; * @return Whether the common field is set. */ @java.lang.Override @@ -4547,19 +4340,19 @@ public final class RaftRequests { return ((bitField0_ & 0x00000001) != 0); } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; * @return The common. */ @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse getCommon() { - return common_ == null ? com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance() : common_; + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse getCommon() { + return common_ == null ? org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance() : common_; } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; */ @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder getCommonOrBuilder() { - return common_ == null ? com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance() : common_; + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder getCommonOrBuilder() { + return common_ == null ? org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance() : common_; } private byte memoizedIsInitialized = -1; @@ -4587,7 +4380,7 @@ public final class RaftRequests { if (((bitField0_ & 0x00000001) != 0)) { output.writeMessage(1, getCommon()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -4600,7 +4393,7 @@ public final class RaftRequests { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, getCommon()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -4610,17 +4403,17 @@ public final class RaftRequests { if (obj == this) { return true; } - if (!(obj instanceof com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse)) { + if (!(obj instanceof org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse)) { return super.equals(obj); } - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse other = (com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse) obj; + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse other = (org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse) obj; if (hasCommon() != other.hasCommon()) return false; if (hasCommon()) { if (!getCommon() .equals(other.getCommon())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -4635,74 +4428,74 @@ public final class RaftRequests { hash = (37 * hash) + COMMON_FIELD_NUMBER; hash = (53 * hash) + getCommon().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseFrom(byte[] data) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseFrom(java.io.InputStream input) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseDelimitedFrom(java.io.InputStream input) + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseDelimitedFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseFrom( + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4715,7 +4508,7 @@ public final class RaftRequests { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse prototype) { + public static Builder newBuilder(org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -4731,26 +4524,26 @@ public final class RaftRequests { return builder; } /** - * Protobuf type {@code com.baidu.hugegraph.backend.store.raft.rpc.SetLeaderResponse} + * Protobuf type {@code org.apache.hugegraph.backend.store.raft.rpc.SetLeaderResponse} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:com.baidu.hugegraph.backend.store.raft.rpc.SetLeaderResponse) - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponseOrBuilder { + // @@protoc_insertion_point(builder_implements:org.apache.hugegraph.backend.store.raft.rpc.SetLeaderResponse) + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_SetLeaderResponse_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_SetLeaderResponse_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_SetLeaderResponse_fieldAccessorTable + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_SetLeaderResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse.class, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse.Builder.class); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse.class, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse.Builder.class); } - // Construct using com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse.newBuilder() + // Construct using org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -4781,17 +4574,17 @@ public final class RaftRequests { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_com_baidu_hugegraph_backend_store_raft_rpc_SetLeaderResponse_descriptor; + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.internal_static_org_apache_hugegraph_backend_store_raft_rpc_SetLeaderResponse_descriptor; } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse getDefaultInstanceForType() { - return com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse.getDefaultInstance(); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse getDefaultInstanceForType() { + return org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse.getDefaultInstance(); } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse build() { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse result = buildPartial(); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse build() { + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -4799,8 +4592,8 @@ public final class RaftRequests { } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse buildPartial() { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse result = new com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse(this); + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse buildPartial() { + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse result = new org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -4850,20 +4643,20 @@ public final class RaftRequests { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse) { - return mergeFrom((com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse)other); + if (other instanceof org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse) { + return mergeFrom((org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse other) { - if (other == com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse.getDefaultInstance()) return this; + public Builder mergeFrom(org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse other) { + if (other == org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse.getDefaultInstance()) return this; if (other.hasCommon()) { mergeCommon(other.getCommon()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -4884,46 +4677,66 @@ public final class RaftRequests { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + input.readMessage( + getCommonFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; - private com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse common_; + private org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse common_; private com.google.protobuf.SingleFieldBuilderV3< - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder> commonBuilder_; + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder> commonBuilder_; /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; * @return Whether the common field is set. */ public boolean hasCommon() { return ((bitField0_ & 0x00000001) != 0); } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; * @return The common. */ - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse getCommon() { + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse getCommon() { if (commonBuilder_ == null) { - return common_ == null ? com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance() : common_; + return common_ == null ? org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance() : common_; } else { return commonBuilder_.getMessage(); } } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; */ - public Builder setCommon(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse value) { + public Builder setCommon(org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse value) { if (commonBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -4937,10 +4750,10 @@ public final class RaftRequests { return this; } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; */ public Builder setCommon( - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder builderForValue) { + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder builderForValue) { if (commonBuilder_ == null) { common_ = builderForValue.build(); onChanged(); @@ -4951,15 +4764,15 @@ public final class RaftRequests { return this; } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; */ - public Builder mergeCommon(com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse value) { + public Builder mergeCommon(org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse value) { if (commonBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0) && common_ != null && - common_ != com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance()) { + common_ != org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance()) { common_ = - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.newBuilder(common_).mergeFrom(value).buildPartial(); + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.newBuilder(common_).mergeFrom(value).buildPartial(); } else { common_ = value; } @@ -4971,7 +4784,7 @@ public final class RaftRequests { return this; } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; */ public Builder clearCommon() { if (commonBuilder_ == null) { @@ -4984,33 +4797,33 @@ public final class RaftRequests { return this; } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; */ - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder getCommonBuilder() { + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder getCommonBuilder() { bitField0_ |= 0x00000001; onChanged(); return getCommonFieldBuilder().getBuilder(); } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; */ - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder getCommonOrBuilder() { + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder getCommonOrBuilder() { if (commonBuilder_ != null) { return commonBuilder_.getMessageOrBuilder(); } else { return common_ == null ? - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance() : common_; + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.getDefaultInstance() : common_; } } /** - * required .com.baidu.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; + * required .org.apache.hugegraph.backend.store.raft.rpc.CommonResponse common = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder> + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder> getCommonFieldBuilder() { if (commonBuilder_ == null) { commonBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder, com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder>( + org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponse.Builder, org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.CommonResponseOrBuilder>( getCommon(), getParentForChildren(), isClean()); @@ -5031,16 +4844,16 @@ public final class RaftRequests { } - // @@protoc_insertion_point(builder_scope:com.baidu.hugegraph.backend.store.raft.rpc.SetLeaderResponse) + // @@protoc_insertion_point(builder_scope:org.apache.hugegraph.backend.store.raft.rpc.SetLeaderResponse) } - // @@protoc_insertion_point(class_scope:com.baidu.hugegraph.backend.store.raft.rpc.SetLeaderResponse) - private static final com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:org.apache.hugegraph.backend.store.raft.rpc.SetLeaderResponse) + private static final org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse(); + DEFAULT_INSTANCE = new org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse(); } - public static com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse getDefaultInstance() { + public static org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -5051,7 +4864,18 @@ public final class RaftRequests { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SetLeaderResponse(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -5065,47 +4889,47 @@ public final class RaftRequests { } @java.lang.Override - public com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse getDefaultInstanceForType() { + public org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.SetLeaderResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } private static final com.google.protobuf.Descriptors.Descriptor - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_StoreCommandRequest_descriptor; + internal_static_org_apache_hugegraph_backend_store_raft_rpc_StoreCommandRequest_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_StoreCommandRequest_fieldAccessorTable; + internal_static_org_apache_hugegraph_backend_store_raft_rpc_StoreCommandRequest_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_StoreCommandResponse_descriptor; + internal_static_org_apache_hugegraph_backend_store_raft_rpc_StoreCommandResponse_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_StoreCommandResponse_fieldAccessorTable; + internal_static_org_apache_hugegraph_backend_store_raft_rpc_StoreCommandResponse_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_CommonResponse_descriptor; + internal_static_org_apache_hugegraph_backend_store_raft_rpc_CommonResponse_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_CommonResponse_fieldAccessorTable; + internal_static_org_apache_hugegraph_backend_store_raft_rpc_CommonResponse_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_ListPeersRequest_descriptor; + internal_static_org_apache_hugegraph_backend_store_raft_rpc_ListPeersRequest_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_ListPeersRequest_fieldAccessorTable; + internal_static_org_apache_hugegraph_backend_store_raft_rpc_ListPeersRequest_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_ListPeersResponse_descriptor; + internal_static_org_apache_hugegraph_backend_store_raft_rpc_ListPeersResponse_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_ListPeersResponse_fieldAccessorTable; + internal_static_org_apache_hugegraph_backend_store_raft_rpc_ListPeersResponse_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_SetLeaderRequest_descriptor; + internal_static_org_apache_hugegraph_backend_store_raft_rpc_SetLeaderRequest_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_SetLeaderRequest_fieldAccessorTable; + internal_static_org_apache_hugegraph_backend_store_raft_rpc_SetLeaderRequest_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_SetLeaderResponse_descriptor; + internal_static_org_apache_hugegraph_backend_store_raft_rpc_SetLeaderResponse_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_SetLeaderResponse_fieldAccessorTable; + internal_static_org_apache_hugegraph_backend_store_raft_rpc_SetLeaderResponse_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -5115,75 +4939,75 @@ public final class RaftRequests { descriptor; static { java.lang.String[] descriptorData = { - "\n\nraft.proto\022*com.baidu.hugegraph.backen" + - "d.store.raft.rpc\"\261\001\n\023StoreCommandRequest" + - "\022C\n\004type\030\001 \002(\01625.com.baidu.hugegraph.bac" + - "kend.store.raft.rpc.StoreType\022G\n\006action\030" + - "\002 \002(\01627.com.baidu.hugegraph.backend.stor" + - "e.raft.rpc.StoreAction\022\014\n\004data\030\003 \002(\014\"7\n\024" + - "StoreCommandResponse\022\016\n\006status\030\001 \002(\010\022\017\n\007" + - "message\030\002 \001(\t\"1\n\016CommonResponse\022\016\n\006statu" + - "s\030\001 \002(\010\022\017\n\007message\030\002 \001(\t\"\022\n\020ListPeersReq" + - "uest\"r\n\021ListPeersResponse\022J\n\006common\030\001 \002(" + - "\0132:.com.baidu.hugegraph.backend.store.ra" + - "ft.rpc.CommonResponse\022\021\n\tendpoints\030\002 \003(\t" + - "\"$\n\020SetLeaderRequest\022\020\n\010endpoint\030\001 \002(\t\"_" + - "\n\021SetLeaderResponse\022J\n\006common\030\001 \002(\0132:.co" + - "m.baidu.hugegraph.backend.store.raft.rpc" + - ".CommonResponse*7\n\tStoreType\022\n\n\006SCHEMA\020\000" + - "\022\t\n\005GRAPH\020\001\022\n\n\006SYSTEM\020\002\022\007\n\003ALL\020\003*\237\001\n\013Sto" + - "reAction\022\010\n\004NONE\020\000\022\010\n\004INIT\020\001\022\t\n\005CLEAR\020\002\022" + - "\014\n\010TRUNCATE\020\003\022\014\n\010SNAPSHOT\020\004\022\014\n\010BEGIN_TX\020" + - "\n\022\r\n\tCOMMIT_TX\020\013\022\017\n\013ROLLBACK_TX\020\014\022\n\n\006MUT" + - "ATE\020\024\022\020\n\014INCR_COUNTER\020\025\022\t\n\005QUERY\020\036B:\n*co" + - "m.baidu.hugegraph.backend.store.raft.rpc" + - "B\014RaftRequests" + "\n\nraft.proto\022+org.apache.hugegraph.backe" + + "nd.store.raft.rpc\"\263\001\n\023StoreCommandReques" + + "t\022D\n\004type\030\001 \002(\01626.org.apache.hugegraph.b" + + "ackend.store.raft.rpc.StoreType\022H\n\006actio" + + "n\030\002 \002(\01628.org.apache.hugegraph.backend.s" + + "tore.raft.rpc.StoreAction\022\014\n\004data\030\003 \002(\014\"" + + "7\n\024StoreCommandResponse\022\016\n\006status\030\001 \002(\010\022" + + "\017\n\007message\030\002 \001(\t\"1\n\016CommonResponse\022\016\n\006st" + + "atus\030\001 \002(\010\022\017\n\007message\030\002 \001(\t\"\022\n\020ListPeers" + + "Request\"s\n\021ListPeersResponse\022K\n\006common\030\001" + + " \002(\0132;.org.apache.hugegraph.backend.stor" + + "e.raft.rpc.CommonResponse\022\021\n\tendpoints\030\002" + + " \003(\t\"$\n\020SetLeaderRequest\022\020\n\010endpoint\030\001 \002" + + "(\t\"`\n\021SetLeaderResponse\022K\n\006common\030\001 \002(\0132" + + ";.org.apache.hugegraph.backend.store.raf" + + "t.rpc.CommonResponse*7\n\tStoreType\022\n\n\006SCH" + + "EMA\020\000\022\t\n\005GRAPH\020\001\022\n\n\006SYSTEM\020\002\022\007\n\003ALL\020\003*\237\001" + + "\n\013StoreAction\022\010\n\004NONE\020\000\022\010\n\004INIT\020\001\022\t\n\005CLE" + + "AR\020\002\022\014\n\010TRUNCATE\020\003\022\014\n\010SNAPSHOT\020\004\022\014\n\010BEGI" + + "N_TX\020\n\022\r\n\tCOMMIT_TX\020\013\022\017\n\013ROLLBACK_TX\020\014\022\n" + + "\n\006MUTATE\020\024\022\020\n\014INCR_COUNTER\020\025\022\t\n\005QUERY\020\036B" + + ";\n+org.apache.hugegraph.backend.store.ra" + + "ft.rpcB\014RaftRequests" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { }); - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_StoreCommandRequest_descriptor = + internal_static_org_apache_hugegraph_backend_store_raft_rpc_StoreCommandRequest_descriptor = getDescriptor().getMessageTypes().get(0); - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_StoreCommandRequest_fieldAccessorTable = new + internal_static_org_apache_hugegraph_backend_store_raft_rpc_StoreCommandRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_StoreCommandRequest_descriptor, + internal_static_org_apache_hugegraph_backend_store_raft_rpc_StoreCommandRequest_descriptor, new java.lang.String[] { "Type", "Action", "Data", }); - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_StoreCommandResponse_descriptor = + internal_static_org_apache_hugegraph_backend_store_raft_rpc_StoreCommandResponse_descriptor = getDescriptor().getMessageTypes().get(1); - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_StoreCommandResponse_fieldAccessorTable = new + internal_static_org_apache_hugegraph_backend_store_raft_rpc_StoreCommandResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_StoreCommandResponse_descriptor, + internal_static_org_apache_hugegraph_backend_store_raft_rpc_StoreCommandResponse_descriptor, new java.lang.String[] { "Status", "Message", }); - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_CommonResponse_descriptor = + internal_static_org_apache_hugegraph_backend_store_raft_rpc_CommonResponse_descriptor = getDescriptor().getMessageTypes().get(2); - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_CommonResponse_fieldAccessorTable = new + internal_static_org_apache_hugegraph_backend_store_raft_rpc_CommonResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_CommonResponse_descriptor, + internal_static_org_apache_hugegraph_backend_store_raft_rpc_CommonResponse_descriptor, new java.lang.String[] { "Status", "Message", }); - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_ListPeersRequest_descriptor = + internal_static_org_apache_hugegraph_backend_store_raft_rpc_ListPeersRequest_descriptor = getDescriptor().getMessageTypes().get(3); - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_ListPeersRequest_fieldAccessorTable = new + internal_static_org_apache_hugegraph_backend_store_raft_rpc_ListPeersRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_ListPeersRequest_descriptor, + internal_static_org_apache_hugegraph_backend_store_raft_rpc_ListPeersRequest_descriptor, new java.lang.String[] { }); - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_ListPeersResponse_descriptor = + internal_static_org_apache_hugegraph_backend_store_raft_rpc_ListPeersResponse_descriptor = getDescriptor().getMessageTypes().get(4); - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_ListPeersResponse_fieldAccessorTable = new + internal_static_org_apache_hugegraph_backend_store_raft_rpc_ListPeersResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_ListPeersResponse_descriptor, + internal_static_org_apache_hugegraph_backend_store_raft_rpc_ListPeersResponse_descriptor, new java.lang.String[] { "Common", "Endpoints", }); - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_SetLeaderRequest_descriptor = + internal_static_org_apache_hugegraph_backend_store_raft_rpc_SetLeaderRequest_descriptor = getDescriptor().getMessageTypes().get(5); - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_SetLeaderRequest_fieldAccessorTable = new + internal_static_org_apache_hugegraph_backend_store_raft_rpc_SetLeaderRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_SetLeaderRequest_descriptor, + internal_static_org_apache_hugegraph_backend_store_raft_rpc_SetLeaderRequest_descriptor, new java.lang.String[] { "Endpoint", }); - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_SetLeaderResponse_descriptor = + internal_static_org_apache_hugegraph_backend_store_raft_rpc_SetLeaderResponse_descriptor = getDescriptor().getMessageTypes().get(6); - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_SetLeaderResponse_fieldAccessorTable = new + internal_static_org_apache_hugegraph_backend_store_raft_rpc_SetLeaderResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_com_baidu_hugegraph_backend_store_raft_rpc_SetLeaderResponse_descriptor, + internal_static_org_apache_hugegraph_backend_store_raft_rpc_SetLeaderResponse_descriptor, new java.lang.String[] { "Common", }); } diff --git a/hugegraph-dist/pom.xml b/hugegraph-dist/pom.xml index 2e66e4ebd..1670f9834 100644 --- a/hugegraph-dist/pom.xml +++ b/hugegraph-dist/pom.xml @@ -20,8 +20,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hugegraph - com.baidu.hugegraph - 0.13.0 + org.apache.hugegraph + ${revision} + ../pom.xml 4.0.0 hugegraph-dist @@ -36,9 +37,9 @@ - com.baidu.hugegraph + org.apache.hugegraph hugegraph-core - ${project.version} + ${revision} metrics-core @@ -47,9 +48,9 @@ - com.baidu.hugegraph + org.apache.hugegraph hugegraph-api - ${project.version} + ${revision} metrics-core @@ -58,9 +59,9 @@ - com.baidu.hugegraph + org.apache.hugegraph hugegraph-cassandra - ${project.version} + ${revision} metrics-core @@ -69,34 +70,34 @@ - com.baidu.hugegraph + org.apache.hugegraph hugegraph-scylladb - ${project.version} + ${revision} - com.baidu.hugegraph + org.apache.hugegraph hugegraph-rocksdb - ${project.version} + ${revision} - com.baidu.hugegraph + org.apache.hugegraph hugegraph-mysql - ${project.version} + ${revision} - com.baidu.hugegraph + org.apache.hugegraph hugegraph-palo - ${project.version} + ${revision} - com.baidu.hugegraph + org.apache.hugegraph hugegraph-hbase - ${project.version} + ${revision} - com.baidu.hugegraph + org.apache.hugegraph hugegraph-postgresql - ${project.version} + ${revision} diff --git a/hugegraph-dist/scripts/dependency/known-dependencies.txt b/hugegraph-dist/scripts/dependency/known-dependencies.txt index 8ea4079b2..60274afe6 100644 --- a/hugegraph-dist/scripts/dependency/known-dependencies.txt +++ b/hugegraph-dist/scripts/dependency/known-dependencies.txt @@ -28,12 +28,13 @@ classgraph-4.8.95.jar commons-beanutils-1.9.4.jar commons-cli-1.1.jar commons-codec-1.11.jar +commons-codec-1.13.jar commons-codec-1.15.jar commons-codec-1.9.jar commons-collections-3.2.2.jar commons-compress-1.21.jar commons-configuration-1.10.jar -commons-configuration2-2.3.jar +commons-configuration2-2.8.0.jar commons-io-2.7.jar commons-lang-2.6.jar commons-lang3-3.1.jar @@ -99,20 +100,21 @@ httpcore-4.4.13.jar ikanalyzer-2012_u6.jar ivy-2.4.0.jar j2objc-annotations-1.1.jar -jackson-annotations-2.12.1.jar jackson-annotations-2.12.5.jar -jackson-core-2.12.1.jar +jackson-annotations-2.14.0-rc1.jar jackson-core-2.12.5.jar +jackson-core-2.14.0-rc1.jar jackson-databind-2.12.1.jar jackson-databind-2.12.5.jar +jackson-databind-2.14.0-rc1.jar jackson-dataformat-yaml-2.9.3.jar jackson-datatype-jsr310-2.12.1.jar -jackson-jaxrs-base-2.12.1.jar +jackson-jaxrs-base-2.14.0-rc1.jar jackson-jaxrs-json-provider-2.12.1-jakarta.jar -jackson-jaxrs-json-provider-2.12.1.jar -jackson-module-jaxb-annotations-2.12.1.jar +jackson-jaxrs-json-provider-2.14.0-rc1.jar +jackson-module-jaxb-annotations-2.14.0-rc1.jar jakarta.activation-2.0.1.jar -jakarta.activation-api-1.2.1.jar +jakarta.activation-api-1.2.2.jar jakarta.annotation-api-2.0.0.jar jakarta.inject-api-2.0.0.jar jakarta.servlet-api-5.0.0.jar diff --git a/hugegraph-dist/src/assembly/static/bin/checksocket.sh b/hugegraph-dist/src/assembly/static/bin/checksocket.sh index 437d13f6c..f92e73f1d 100755 --- a/hugegraph-dist/src/assembly/static/bin/checksocket.sh +++ b/hugegraph-dist/src/assembly/static/bin/checksocket.sh @@ -34,4 +34,4 @@ else JAVA=java fi -"$JAVA" -cp lib/hugegraph-common-*.jar com.baidu.hugegraph.util.CheckSocket $1 $2 +"$JAVA" -cp lib/hugegraph-common-*.jar org.apache.hugegraph.util.CheckSocket $1 $2 diff --git a/hugegraph-dist/src/assembly/static/bin/dump-conf.sh b/hugegraph-dist/src/assembly/static/bin/dump-conf.sh index 4f27825c9..9f39a16f2 100755 --- a/hugegraph-dist/src/assembly/static/bin/dump-conf.sh +++ b/hugegraph-dist/src/assembly/static/bin/dump-conf.sh @@ -46,4 +46,4 @@ cd $TOP echo "Dumping HugeGraph Config($conf)..." exec $JAVA -cp $LIB/hugegraph-dist-*.jar -Djava.ext.dirs=$LIB/ \ -com.baidu.hugegraph.cmd.ConfDumper $conf +org.apache.hugegraph.cmd.ConfDumper $conf diff --git a/hugegraph-dist/src/assembly/static/bin/dump-store.sh b/hugegraph-dist/src/assembly/static/bin/dump-store.sh index 0ddb7c1d7..428b02025 100755 --- a/hugegraph-dist/src/assembly/static/bin/dump-store.sh +++ b/hugegraph-dist/src/assembly/static/bin/dump-store.sh @@ -46,4 +46,4 @@ cd $TOP echo "Dumping HugeGraph Store($conf)..." exec $JAVA -cp $LIB/hugegraph-dist-*.jar -Djava.ext.dirs=$LIB/ \ -com.baidu.hugegraph.cmd.StoreDumper $conf $2 $3 $4 +org.apache.hugegraph.cmd.StoreDumper $conf $2 $3 $4 diff --git a/hugegraph-dist/src/assembly/static/bin/gremlin-console.sh b/hugegraph-dist/src/assembly/static/bin/gremlin-console.sh index f403cda15..dfdd42b4c 100755 --- a/hugegraph-dist/src/assembly/static/bin/gremlin-console.sh +++ b/hugegraph-dist/src/assembly/static/bin/gremlin-console.sh @@ -101,7 +101,7 @@ while getopts "elpv" opt; do ;; p) PROFILING_ENABLED=true ;; - v) MAIN_CLASS=com.baidu.hugegraph.core.hugegraph + v) MAIN_CLASS=org.apache.hugegraph.core.hugegraph esac done diff --git a/hugegraph-dist/src/assembly/static/bin/hugegraph-server.sh b/hugegraph-dist/src/assembly/static/bin/hugegraph-server.sh index 464617b55..e0ef7bf13 100644 --- a/hugegraph-dist/src/assembly/static/bin/hugegraph-server.sh +++ b/hugegraph-dist/src/assembly/static/bin/hugegraph-server.sh @@ -136,10 +136,10 @@ esac JVM_OPTIONS="-Dlog4j.configurationFile=${CONF}/log4j2.xml" if [[ ${OPEN_SECURITY_CHECK} == "true" ]]; then - JVM_OPTIONS="${JVM_OPTIONS} -Djava.security.manager=com.baidu.hugegraph.security.HugeSecurityManager" + JVM_OPTIONS="${JVM_OPTIONS} -Djava.security.manager=org.apache.hugegraph.security.HugeSecurityManager" fi # Turn on security check exec ${JAVA} -Dname="HugeGraphServer" ${JVM_OPTIONS} ${JAVA_OPTIONS} \ - -cp ${CLASSPATH}: com.baidu.hugegraph.dist.HugeGraphServer ${GREMLIN_SERVER_CONF} ${REST_SERVER_CONF} \ + -cp ${CLASSPATH}: org.apache.hugegraph.dist.HugeGraphServer ${GREMLIN_SERVER_CONF} ${REST_SERVER_CONF} \ >> ${OUTPUT} 2>&1 diff --git a/hugegraph-dist/src/assembly/static/bin/init-store.sh b/hugegraph-dist/src/assembly/static/bin/init-store.sh index bbe5e2cf1..ccdcb80a4 100755 --- a/hugegraph-dist/src/assembly/static/bin/init-store.sh +++ b/hugegraph-dist/src/assembly/static/bin/init-store.sh @@ -56,6 +56,6 @@ echo "Initializing HugeGraph Store..." CP=$(find "${LIB}" "${PLUGINS}" -name "*.jar" | tr "\n" ":") $JAVA -cp $CP ${DEFAULT_JAVA_OPTIONS} \ -com.baidu.hugegraph.cmd.InitStore "${CONF}"/rest-server.properties +org.apache.hugegraph.cmd.InitStore "${CONF}"/rest-server.properties echo "Initialization finished." diff --git a/hugegraph-dist/src/assembly/static/conf/graphs/hugegraph.properties b/hugegraph-dist/src/assembly/static/conf/graphs/hugegraph.properties index 94af26145..b9c6c4a07 100644 --- a/hugegraph-dist/src/assembly/static/conf/graphs/hugegraph.properties +++ b/hugegraph-dist/src/assembly/static/conf/graphs/hugegraph.properties @@ -1,6 +1,6 @@ # gremlin entrance to create graph -# auth config: com.baidu.hugegraph.auth.HugeFactoryAuthProxy -gremlin.graph=com.baidu.hugegraph.HugeFactory +# auth config: org.apache.hugegraph.auth.HugeFactoryAuthProxy +gremlin.graph=org.apache.hugegraph.HugeFactory # cache config #schema.cache_capacity=100000 diff --git a/hugegraph-dist/src/assembly/static/conf/gremlin-driver-settings.yaml b/hugegraph-dist/src/assembly/static/conf/gremlin-driver-settings.yaml index 7e118f3ab..55f38ab97 100644 --- a/hugegraph-dist/src/assembly/static/conf/gremlin-driver-settings.yaml +++ b/hugegraph-dist/src/assembly/static/conf/gremlin-driver-settings.yaml @@ -20,6 +20,6 @@ serializer: { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { serializeResultToString: false, - ioRegistries: [com.baidu.hugegraph.io.HugeGraphIoRegistry] + ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry] } } diff --git a/hugegraph-dist/src/assembly/static/conf/gremlin-server.yaml b/hugegraph-dist/src/assembly/static/conf/gremlin-server.yaml index 480ddf479..61c3517e3 100644 --- a/hugegraph-dist/src/assembly/static/conf/gremlin-server.yaml +++ b/hugegraph-dist/src/assembly/static/conf/gremlin-server.yaml @@ -28,39 +28,39 @@ graphs: { scriptEngines: { gremlin-groovy: { plugins: { - com.baidu.hugegraph.plugin.HugeGraphGremlinPlugin: {}, + org.apache.hugegraph.plugin.HugeGraphGremlinPlugin: {}, org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {}, org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: { classImports: [ java.lang.Math, - com.baidu.hugegraph.backend.id.IdGenerator, - com.baidu.hugegraph.type.define.Directions, - com.baidu.hugegraph.type.define.NodeRole, - com.baidu.hugegraph.traversal.algorithm.CollectionPathsTraverser, - com.baidu.hugegraph.traversal.algorithm.CountTraverser, - com.baidu.hugegraph.traversal.algorithm.CustomizedCrosspointsTraverser, - com.baidu.hugegraph.traversal.algorithm.CustomizePathsTraverser, - com.baidu.hugegraph.traversal.algorithm.FusiformSimilarityTraverser, - com.baidu.hugegraph.traversal.algorithm.HugeTraverser, - com.baidu.hugegraph.traversal.algorithm.JaccardSimilarTraverser, - com.baidu.hugegraph.traversal.algorithm.KneighborTraverser, - com.baidu.hugegraph.traversal.algorithm.KoutTraverser, - com.baidu.hugegraph.traversal.algorithm.MultiNodeShortestPathTraverser, - com.baidu.hugegraph.traversal.algorithm.NeighborRankTraverser, - com.baidu.hugegraph.traversal.algorithm.PathsTraverser, - com.baidu.hugegraph.traversal.algorithm.PersonalRankTraverser, - com.baidu.hugegraph.traversal.algorithm.SameNeighborTraverser, - com.baidu.hugegraph.traversal.algorithm.ShortestPathTraverser, - com.baidu.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser, - com.baidu.hugegraph.traversal.algorithm.SubGraphTraverser, - com.baidu.hugegraph.traversal.algorithm.TemplatePathsTraverser, - com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep, - com.baidu.hugegraph.traversal.algorithm.steps.RepeatEdgeStep, - com.baidu.hugegraph.traversal.algorithm.steps.WeightedEdgeStep, - com.baidu.hugegraph.traversal.optimize.ConditionP, - com.baidu.hugegraph.traversal.optimize.Text, - com.baidu.hugegraph.traversal.optimize.TraversalUtil, - com.baidu.hugegraph.util.DateUtil + org.apache.hugegraph.backend.id.IdGenerator, + org.apache.hugegraph.type.define.Directions, + org.apache.hugegraph.type.define.NodeRole, + org.apache.hugegraph.traversal.algorithm.CollectionPathsTraverser, + org.apache.hugegraph.traversal.algorithm.CountTraverser, + org.apache.hugegraph.traversal.algorithm.CustomizedCrosspointsTraverser, + org.apache.hugegraph.traversal.algorithm.CustomizePathsTraverser, + org.apache.hugegraph.traversal.algorithm.FusiformSimilarityTraverser, + org.apache.hugegraph.traversal.algorithm.HugeTraverser, + org.apache.hugegraph.traversal.algorithm.JaccardSimilarTraverser, + org.apache.hugegraph.traversal.algorithm.KneighborTraverser, + org.apache.hugegraph.traversal.algorithm.KoutTraverser, + org.apache.hugegraph.traversal.algorithm.MultiNodeShortestPathTraverser, + org.apache.hugegraph.traversal.algorithm.NeighborRankTraverser, + org.apache.hugegraph.traversal.algorithm.PathsTraverser, + org.apache.hugegraph.traversal.algorithm.PersonalRankTraverser, + org.apache.hugegraph.traversal.algorithm.SameNeighborTraverser, + org.apache.hugegraph.traversal.algorithm.ShortestPathTraverser, + org.apache.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser, + org.apache.hugegraph.traversal.algorithm.SubGraphTraverser, + org.apache.hugegraph.traversal.algorithm.TemplatePathsTraverser, + org.apache.hugegraph.traversal.algorithm.steps.EdgeStep, + org.apache.hugegraph.traversal.algorithm.steps.RepeatEdgeStep, + org.apache.hugegraph.traversal.algorithm.steps.WeightedEdgeStep, + org.apache.hugegraph.traversal.optimize.ConditionP, + org.apache.hugegraph.traversal.optimize.Text, + org.apache.hugegraph.traversal.optimize.TraversalUtil, + org.apache.hugegraph.util.DateUtil ], methodImports: [java.lang.Math#*] }, @@ -74,25 +74,25 @@ serializers: - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: false, - ioRegistries: [com.baidu.hugegraph.io.HugeGraphIoRegistry] + ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry] } } - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { serializeResultToString: false, - ioRegistries: [com.baidu.hugegraph.io.HugeGraphIoRegistry] + ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry] } } - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { serializeResultToString: false, - ioRegistries: [com.baidu.hugegraph.io.HugeGraphIoRegistry] + ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry] } } - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { serializeResultToString: false, - ioRegistries: [com.baidu.hugegraph.io.HugeGraphIoRegistry] + ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry] } } metrics: { diff --git a/hugegraph-dist/src/assembly/static/conf/log4j2.xml b/hugegraph-dist/src/assembly/static/conf/log4j2.xml index 4d05b9435..d4227536d 100644 --- a/hugegraph-dist/src/assembly/static/conf/log4j2.xml +++ b/hugegraph-dist/src/assembly/static/conf/log4j2.xml @@ -104,13 +104,13 @@ - + - + - + diff --git a/hugegraph-dist/src/assembly/static/conf/remote-objects.yaml b/hugegraph-dist/src/assembly/static/conf/remote-objects.yaml index 7e118f3ab..55f38ab97 100644 --- a/hugegraph-dist/src/assembly/static/conf/remote-objects.yaml +++ b/hugegraph-dist/src/assembly/static/conf/remote-objects.yaml @@ -20,6 +20,6 @@ serializer: { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { serializeResultToString: false, - ioRegistries: [com.baidu.hugegraph.io.HugeGraphIoRegistry] + ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry] } } diff --git a/hugegraph-dist/src/assembly/static/conf/remote.yaml b/hugegraph-dist/src/assembly/static/conf/remote.yaml index 7e118f3ab..55f38ab97 100644 --- a/hugegraph-dist/src/assembly/static/conf/remote.yaml +++ b/hugegraph-dist/src/assembly/static/conf/remote.yaml @@ -20,6 +20,6 @@ serializer: { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { serializeResultToString: false, - ioRegistries: [com.baidu.hugegraph.io.HugeGraphIoRegistry] + ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry] } } diff --git a/hugegraph-dist/src/assembly/static/conf/rest-server.properties b/hugegraph-dist/src/assembly/static/conf/rest-server.properties index 9e54fcf45..794caec84 100644 --- a/hugegraph-dist/src/assembly/static/conf/rest-server.properties +++ b/hugegraph-dist/src/assembly/static/conf/rest-server.properties @@ -10,8 +10,8 @@ batch.max_write_ratio=80 batch.max_write_threads=0 # authentication configs -# choose 'com.baidu.hugegraph.auth.StandardAuthenticator' or -# 'com.baidu.hugegraph.auth.ConfigAuthenticator' +# choose 'org.apache.hugegraph.auth.StandardAuthenticator' or +# 'org.apache.hugegraph.auth.ConfigAuthenticator' #auth.authenticator= # for StandardAuthenticator mode diff --git a/hugegraph-dist/src/assembly/static/ext/plugins.txt b/hugegraph-dist/src/assembly/static/ext/plugins.txt index b3c06a6e3..e50f53b1a 100644 --- a/hugegraph-dist/src/assembly/static/ext/plugins.txt +++ b/hugegraph-dist/src/assembly/static/ext/plugins.txt @@ -1,4 +1,4 @@ -com.baidu.hugegraph.plugin.HugeGraphGremlinPlugin +org.apache.hugegraph.plugin.HugeGraphGremlinPlugin org.apache.tinkerpop.gremlin.console.jsr223.DriverGremlinPlugin org.apache.tinkerpop.gremlin.console.jsr223.UtilitiesGremlinPlugin org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin diff --git a/hugegraph-dist/src/assembly/static/scripts/example.groovy b/hugegraph-dist/src/assembly/static/scripts/example.groovy index 804238d2b..9af8a67ca 100644 --- a/hugegraph-dist/src/assembly/static/scripts/example.groovy +++ b/hugegraph-dist/src/assembly/static/scripts/example.groovy @@ -16,8 +16,8 @@ * License for the specific language governing permissions and limitations * under the License. */ -import com.baidu.hugegraph.HugeFactory -import com.baidu.hugegraph.dist.RegisterUtil +import org.apache.hugegraph.HugeFactory +import org.apache.hugegraph.dist.RegisterUtil import org.apache.tinkerpop.gremlin.structure.T RegisterUtil.registerCassandra(); diff --git a/hugegraph-dist/src/assembly/travis/build-report.sh b/hugegraph-dist/src/assembly/travis/build-report.sh index 015311808..d849a9662 100755 --- a/hugegraph-dist/src/assembly/travis/build-report.sh +++ b/hugegraph-dist/src/assembly/travis/build-report.sh @@ -21,7 +21,7 @@ BACKEND=$1 JACOCO_PORT=$2 JACOCO_REPORT_FILE=$3 -OPTION_CLASS_FILES_BACKEND="--classfiles hugegraph-$BACKEND/target/classes/com/baidu/hugegraph" +OPTION_CLASS_FILES_BACKEND="--classfiles hugegraph-$BACKEND/target/classes/org/apache/hugegraph" if [ "$BACKEND" == "memory" ]; then # hugegraph-memory is the same as hugegraph-core OPTION_CLASS_FILES_BACKEND="" @@ -31,7 +31,7 @@ cd hugegraph-test mvn jacoco:dump@pull-test-data -Dapp.host=localhost -Dapp.port=$JACOCO_PORT -Dskip.dump=false cd ../ java -jar $TRAVIS_DIR/jacococli.jar report hugegraph-test/target/jacoco-it.exec \ - --classfiles hugegraph-dist/target/classes/com/baidu/hugegraph \ - --classfiles hugegraph-api/target/classes/com/baidu/hugegraph \ - --classfiles hugegraph-core/target/classes/com/baidu/hugegraph \ + --classfiles hugegraph-dist/target/classes/org/apache/hugegraph \ + --classfiles hugegraph-api/target/classes/org/apache/hugegraph \ + --classfiles hugegraph-core/target/classes/org/apache/hugegraph \ ${OPTION_CLASS_FILES_BACKEND} --xml "${JACOCO_REPORT_FILE}" diff --git a/hugegraph-dist/src/assembly/travis/conf-raft1/graphs/hugegraph.properties b/hugegraph-dist/src/assembly/travis/conf-raft1/graphs/hugegraph.properties index 33150b467..8fcd03206 100644 --- a/hugegraph-dist/src/assembly/travis/conf-raft1/graphs/hugegraph.properties +++ b/hugegraph-dist/src/assembly/travis/conf-raft1/graphs/hugegraph.properties @@ -1,5 +1,5 @@ -gremlin.graph=com.baidu.hugegraph.auth.HugeFactoryAuthProxy -#gremlin.graph=com.baidu.hugegraph.HugeFactory +gremlin.graph=org.apache.hugegraph.auth.HugeFactoryAuthProxy +#gremlin.graph=org.apache.hugegraph.HugeFactory store=hugegraph diff --git a/hugegraph-dist/src/assembly/travis/conf-raft1/gremlin-server.yaml b/hugegraph-dist/src/assembly/travis/conf-raft1/gremlin-server.yaml index 88d750547..517c0a5fc 100644 --- a/hugegraph-dist/src/assembly/travis/conf-raft1/gremlin-server.yaml +++ b/hugegraph-dist/src/assembly/travis/conf-raft1/gremlin-server.yaml @@ -28,38 +28,38 @@ graphs: { scriptEngines: { gremlin-groovy: { plugins: { - com.baidu.hugegraph.plugin.HugeGraphGremlinPlugin: {}, + org.apache.hugegraph.plugin.HugeGraphGremlinPlugin: {}, org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {}, org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: { classImports: [ java.lang.Math, - com.baidu.hugegraph.backend.id.IdGenerator, - com.baidu.hugegraph.type.define.Directions, - com.baidu.hugegraph.type.define.NodeRole, - com.baidu.hugegraph.traversal.algorithm.CollectionPathsTraverser, - com.baidu.hugegraph.traversal.algorithm.CountTraverser, - com.baidu.hugegraph.traversal.algorithm.CustomizedCrosspointsTraverser, - com.baidu.hugegraph.traversal.algorithm.CustomizePathsTraverser, - com.baidu.hugegraph.traversal.algorithm.FusiformSimilarityTraverser, - com.baidu.hugegraph.traversal.algorithm.HugeTraverser, - com.baidu.hugegraph.traversal.algorithm.JaccardSimilarTraverser, - com.baidu.hugegraph.traversal.algorithm.KneighborTraverser, - com.baidu.hugegraph.traversal.algorithm.KoutTraverser, - com.baidu.hugegraph.traversal.algorithm.MultiNodeShortestPathTraverser, - com.baidu.hugegraph.traversal.algorithm.NeighborRankTraverser, - com.baidu.hugegraph.traversal.algorithm.PathsTraverser, - com.baidu.hugegraph.traversal.algorithm.PersonalRankTraverser, - com.baidu.hugegraph.traversal.algorithm.SameNeighborTraverser, - com.baidu.hugegraph.traversal.algorithm.ShortestPathTraverser, - com.baidu.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser, - com.baidu.hugegraph.traversal.algorithm.SubGraphTraverser, - com.baidu.hugegraph.traversal.algorithm.TemplatePathsTraverser, - com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep, - com.baidu.hugegraph.traversal.algorithm.steps.RepeatEdgeStep, - com.baidu.hugegraph.traversal.algorithm.steps.WeightedEdgeStep, - com.baidu.hugegraph.traversal.optimize.Text, - com.baidu.hugegraph.traversal.optimize.TraversalUtil, - com.baidu.hugegraph.util.DateUtil + org.apache.hugegraph.backend.id.IdGenerator, + org.apache.hugegraph.type.define.Directions, + org.apache.hugegraph.type.define.NodeRole, + org.apache.hugegraph.traversal.algorithm.CollectionPathsTraverser, + org.apache.hugegraph.traversal.algorithm.CountTraverser, + org.apache.hugegraph.traversal.algorithm.CustomizedCrosspointsTraverser, + org.apache.hugegraph.traversal.algorithm.CustomizePathsTraverser, + org.apache.hugegraph.traversal.algorithm.FusiformSimilarityTraverser, + org.apache.hugegraph.traversal.algorithm.HugeTraverser, + org.apache.hugegraph.traversal.algorithm.JaccardSimilarTraverser, + org.apache.hugegraph.traversal.algorithm.KneighborTraverser, + org.apache.hugegraph.traversal.algorithm.KoutTraverser, + org.apache.hugegraph.traversal.algorithm.MultiNodeShortestPathTraverser, + org.apache.hugegraph.traversal.algorithm.NeighborRankTraverser, + org.apache.hugegraph.traversal.algorithm.PathsTraverser, + org.apache.hugegraph.traversal.algorithm.PersonalRankTraverser, + org.apache.hugegraph.traversal.algorithm.SameNeighborTraverser, + org.apache.hugegraph.traversal.algorithm.ShortestPathTraverser, + org.apache.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser, + org.apache.hugegraph.traversal.algorithm.SubGraphTraverser, + org.apache.hugegraph.traversal.algorithm.TemplatePathsTraverser, + org.apache.hugegraph.traversal.algorithm.steps.EdgeStep, + org.apache.hugegraph.traversal.algorithm.steps.RepeatEdgeStep, + org.apache.hugegraph.traversal.algorithm.steps.WeightedEdgeStep, + org.apache.hugegraph.traversal.optimize.Text, + org.apache.hugegraph.traversal.optimize.TraversalUtil, + org.apache.hugegraph.util.DateUtil ], methodImports: [java.lang.Math#*] }, @@ -73,25 +73,25 @@ serializers: - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: false, - ioRegistries: [com.baidu.hugegraph.io.HugeGraphIoRegistry] + ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry] } } - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { serializeResultToString: false, - ioRegistries: [com.baidu.hugegraph.io.HugeGraphIoRegistry] + ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry] } } - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { serializeResultToString: false, - ioRegistries: [com.baidu.hugegraph.io.HugeGraphIoRegistry] + ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry] } } - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { serializeResultToString: false, - ioRegistries: [com.baidu.hugegraph.io.HugeGraphIoRegistry] + ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry] } } metrics: { @@ -114,8 +114,8 @@ ssl: { enabled: false } authentication: { - authenticator: com.baidu.hugegraph.auth.StandardAuthenticator, + authenticator: org.apache.hugegraph.auth.StandardAuthenticator, #authenticationHandler: org.apache.tinkerpop.gremlin.server.handler.SaslAndHttpBasicAuthenticationHandler, - authenticationHandler: com.baidu.hugegraph.auth.WsAndHttpBasicAuthHandler, + authenticationHandler: org.apache.hugegraph.auth.WsAndHttpBasicAuthHandler, config: {tokens: conf/rest-server.properties} } diff --git a/hugegraph-dist/src/assembly/travis/conf-raft1/rest-server.properties b/hugegraph-dist/src/assembly/travis/conf-raft1/rest-server.properties index a94463487..c085fcc8a 100644 --- a/hugegraph-dist/src/assembly/travis/conf-raft1/rest-server.properties +++ b/hugegraph-dist/src/assembly/travis/conf-raft1/rest-server.properties @@ -1,7 +1,7 @@ restserver.url=http://127.0.0.1:8080 gremlinserver.url=http://127.0.0.1:8181 graphs=conf/graphs -auth.authenticator=com.baidu.hugegraph.auth.StandardAuthenticator +auth.authenticator=org.apache.hugegraph.auth.StandardAuthenticator rpc.server_host=127.0.0.1 rpc.server_port=8091 diff --git a/hugegraph-dist/src/assembly/travis/conf-raft2/graphs/hugegraph.properties b/hugegraph-dist/src/assembly/travis/conf-raft2/graphs/hugegraph.properties index 13deeae4f..4663a0c2f 100644 --- a/hugegraph-dist/src/assembly/travis/conf-raft2/graphs/hugegraph.properties +++ b/hugegraph-dist/src/assembly/travis/conf-raft2/graphs/hugegraph.properties @@ -1,5 +1,5 @@ -gremlin.graph=com.baidu.hugegraph.auth.HugeFactoryAuthProxy -#gremlin.graph=com.baidu.hugegraph.HugeFactory +gremlin.graph=org.apache.hugegraph.auth.HugeFactoryAuthProxy +#gremlin.graph=org.apache.hugegraph.HugeFactory store=hugegraph diff --git a/hugegraph-dist/src/assembly/travis/conf-raft2/gremlin-server.yaml b/hugegraph-dist/src/assembly/travis/conf-raft2/gremlin-server.yaml index f7a567c0e..bd37369c8 100644 --- a/hugegraph-dist/src/assembly/travis/conf-raft2/gremlin-server.yaml +++ b/hugegraph-dist/src/assembly/travis/conf-raft2/gremlin-server.yaml @@ -28,38 +28,38 @@ graphs: { scriptEngines: { gremlin-groovy: { plugins: { - com.baidu.hugegraph.plugin.HugeGraphGremlinPlugin: {}, + org.apache.hugegraph.plugin.HugeGraphGremlinPlugin: {}, org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {}, org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: { classImports: [ java.lang.Math, - com.baidu.hugegraph.backend.id.IdGenerator, - com.baidu.hugegraph.type.define.Directions, - com.baidu.hugegraph.type.define.NodeRole, - com.baidu.hugegraph.traversal.algorithm.CollectionPathsTraverser, - com.baidu.hugegraph.traversal.algorithm.CountTraverser, - com.baidu.hugegraph.traversal.algorithm.CustomizedCrosspointsTraverser, - com.baidu.hugegraph.traversal.algorithm.CustomizePathsTraverser, - com.baidu.hugegraph.traversal.algorithm.FusiformSimilarityTraverser, - com.baidu.hugegraph.traversal.algorithm.HugeTraverser, - com.baidu.hugegraph.traversal.algorithm.JaccardSimilarTraverser, - com.baidu.hugegraph.traversal.algorithm.KneighborTraverser, - com.baidu.hugegraph.traversal.algorithm.KoutTraverser, - com.baidu.hugegraph.traversal.algorithm.MultiNodeShortestPathTraverser, - com.baidu.hugegraph.traversal.algorithm.NeighborRankTraverser, - com.baidu.hugegraph.traversal.algorithm.PathsTraverser, - com.baidu.hugegraph.traversal.algorithm.PersonalRankTraverser, - com.baidu.hugegraph.traversal.algorithm.SameNeighborTraverser, - com.baidu.hugegraph.traversal.algorithm.ShortestPathTraverser, - com.baidu.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser, - com.baidu.hugegraph.traversal.algorithm.SubGraphTraverser, - com.baidu.hugegraph.traversal.algorithm.TemplatePathsTraverser, - com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep, - com.baidu.hugegraph.traversal.algorithm.steps.RepeatEdgeStep, - com.baidu.hugegraph.traversal.algorithm.steps.WeightedEdgeStep, - com.baidu.hugegraph.traversal.optimize.Text, - com.baidu.hugegraph.traversal.optimize.TraversalUtil, - com.baidu.hugegraph.util.DateUtil + org.apache.hugegraph.backend.id.IdGenerator, + org.apache.hugegraph.type.define.Directions, + org.apache.hugegraph.type.define.NodeRole, + org.apache.hugegraph.traversal.algorithm.CollectionPathsTraverser, + org.apache.hugegraph.traversal.algorithm.CountTraverser, + org.apache.hugegraph.traversal.algorithm.CustomizedCrosspointsTraverser, + org.apache.hugegraph.traversal.algorithm.CustomizePathsTraverser, + org.apache.hugegraph.traversal.algorithm.FusiformSimilarityTraverser, + org.apache.hugegraph.traversal.algorithm.HugeTraverser, + org.apache.hugegraph.traversal.algorithm.JaccardSimilarTraverser, + org.apache.hugegraph.traversal.algorithm.KneighborTraverser, + org.apache.hugegraph.traversal.algorithm.KoutTraverser, + org.apache.hugegraph.traversal.algorithm.MultiNodeShortestPathTraverser, + org.apache.hugegraph.traversal.algorithm.NeighborRankTraverser, + org.apache.hugegraph.traversal.algorithm.PathsTraverser, + org.apache.hugegraph.traversal.algorithm.PersonalRankTraverser, + org.apache.hugegraph.traversal.algorithm.SameNeighborTraverser, + org.apache.hugegraph.traversal.algorithm.ShortestPathTraverser, + org.apache.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser, + org.apache.hugegraph.traversal.algorithm.SubGraphTraverser, + org.apache.hugegraph.traversal.algorithm.TemplatePathsTraverser, + org.apache.hugegraph.traversal.algorithm.steps.EdgeStep, + org.apache.hugegraph.traversal.algorithm.steps.RepeatEdgeStep, + org.apache.hugegraph.traversal.algorithm.steps.WeightedEdgeStep, + org.apache.hugegraph.traversal.optimize.Text, + org.apache.hugegraph.traversal.optimize.TraversalUtil, + org.apache.hugegraph.util.DateUtil ], methodImports: [java.lang.Math#*] }, @@ -73,25 +73,25 @@ serializers: - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: false, - ioRegistries: [com.baidu.hugegraph.io.HugeGraphIoRegistry] + ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry] } } - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { serializeResultToString: false, - ioRegistries: [com.baidu.hugegraph.io.HugeGraphIoRegistry] + ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry] } } - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { serializeResultToString: false, - ioRegistries: [com.baidu.hugegraph.io.HugeGraphIoRegistry] + ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry] } } - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { serializeResultToString: false, - ioRegistries: [com.baidu.hugegraph.io.HugeGraphIoRegistry] + ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry] } } metrics: { @@ -114,8 +114,8 @@ ssl: { enabled: false } authentication: { - authenticator: com.baidu.hugegraph.auth.StandardAuthenticator, + authenticator: org.apache.hugegraph.auth.StandardAuthenticator, #authenticationHandler: org.apache.tinkerpop.gremlin.server.handler.SaslAndHttpBasicAuthenticationHandler, - authenticationHandler: com.baidu.hugegraph.auth.WsAndHttpBasicAuthHandler, + authenticationHandler: org.apache.hugegraph.auth.WsAndHttpBasicAuthHandler, config: {tokens: conf/rest-server.properties} } diff --git a/hugegraph-dist/src/assembly/travis/conf-raft2/rest-server.properties b/hugegraph-dist/src/assembly/travis/conf-raft2/rest-server.properties index 2a02d20b1..7ce0a5f19 100644 --- a/hugegraph-dist/src/assembly/travis/conf-raft2/rest-server.properties +++ b/hugegraph-dist/src/assembly/travis/conf-raft2/rest-server.properties @@ -1,7 +1,7 @@ restserver.url=http://127.0.0.1:8082 gremlinserver.url=http://127.0.0.1:8182 graphs=conf/graphs -auth.authenticator=com.baidu.hugegraph.auth.StandardAuthenticator +auth.authenticator=org.apache.hugegraph.auth.StandardAuthenticator rpc.server_host=127.0.0.1 rpc.server_port=8092 diff --git a/hugegraph-dist/src/assembly/travis/conf-raft3/graphs/hugegraph.properties b/hugegraph-dist/src/assembly/travis/conf-raft3/graphs/hugegraph.properties index 38f859c0a..719d9c981 100644 --- a/hugegraph-dist/src/assembly/travis/conf-raft3/graphs/hugegraph.properties +++ b/hugegraph-dist/src/assembly/travis/conf-raft3/graphs/hugegraph.properties @@ -1,5 +1,5 @@ -gremlin.graph=com.baidu.hugegraph.auth.HugeFactoryAuthProxy -#gremlin.graph=com.baidu.hugegraph.HugeFactory +gremlin.graph=org.apache.hugegraph.auth.HugeFactoryAuthProxy +#gremlin.graph=org.apache.hugegraph.HugeFactory store=hugegraph diff --git a/hugegraph-dist/src/assembly/travis/conf-raft3/gremlin-server.yaml b/hugegraph-dist/src/assembly/travis/conf-raft3/gremlin-server.yaml index 702777693..a034d6352 100644 --- a/hugegraph-dist/src/assembly/travis/conf-raft3/gremlin-server.yaml +++ b/hugegraph-dist/src/assembly/travis/conf-raft3/gremlin-server.yaml @@ -28,38 +28,38 @@ graphs: { scriptEngines: { gremlin-groovy: { plugins: { - com.baidu.hugegraph.plugin.HugeGraphGremlinPlugin: {}, + org.apache.hugegraph.plugin.HugeGraphGremlinPlugin: {}, org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {}, org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: { classImports: [ java.lang.Math, - com.baidu.hugegraph.backend.id.IdGenerator, - com.baidu.hugegraph.type.define.Directions, - com.baidu.hugegraph.type.define.NodeRole, - com.baidu.hugegraph.traversal.algorithm.CollectionPathsTraverser, - com.baidu.hugegraph.traversal.algorithm.CountTraverser, - com.baidu.hugegraph.traversal.algorithm.CustomizedCrosspointsTraverser, - com.baidu.hugegraph.traversal.algorithm.CustomizePathsTraverser, - com.baidu.hugegraph.traversal.algorithm.FusiformSimilarityTraverser, - com.baidu.hugegraph.traversal.algorithm.HugeTraverser, - com.baidu.hugegraph.traversal.algorithm.JaccardSimilarTraverser, - com.baidu.hugegraph.traversal.algorithm.KneighborTraverser, - com.baidu.hugegraph.traversal.algorithm.KoutTraverser, - com.baidu.hugegraph.traversal.algorithm.MultiNodeShortestPathTraverser, - com.baidu.hugegraph.traversal.algorithm.NeighborRankTraverser, - com.baidu.hugegraph.traversal.algorithm.PathsTraverser, - com.baidu.hugegraph.traversal.algorithm.PersonalRankTraverser, - com.baidu.hugegraph.traversal.algorithm.SameNeighborTraverser, - com.baidu.hugegraph.traversal.algorithm.ShortestPathTraverser, - com.baidu.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser, - com.baidu.hugegraph.traversal.algorithm.SubGraphTraverser, - com.baidu.hugegraph.traversal.algorithm.TemplatePathsTraverser, - com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep, - com.baidu.hugegraph.traversal.algorithm.steps.RepeatEdgeStep, - com.baidu.hugegraph.traversal.algorithm.steps.WeightedEdgeStep, - com.baidu.hugegraph.traversal.optimize.Text, - com.baidu.hugegraph.traversal.optimize.TraversalUtil, - com.baidu.hugegraph.util.DateUtil + org.apache.hugegraph.backend.id.IdGenerator, + org.apache.hugegraph.type.define.Directions, + org.apache.hugegraph.type.define.NodeRole, + org.apache.hugegraph.traversal.algorithm.CollectionPathsTraverser, + org.apache.hugegraph.traversal.algorithm.CountTraverser, + org.apache.hugegraph.traversal.algorithm.CustomizedCrosspointsTraverser, + org.apache.hugegraph.traversal.algorithm.CustomizePathsTraverser, + org.apache.hugegraph.traversal.algorithm.FusiformSimilarityTraverser, + org.apache.hugegraph.traversal.algorithm.HugeTraverser, + org.apache.hugegraph.traversal.algorithm.JaccardSimilarTraverser, + org.apache.hugegraph.traversal.algorithm.KneighborTraverser, + org.apache.hugegraph.traversal.algorithm.KoutTraverser, + org.apache.hugegraph.traversal.algorithm.MultiNodeShortestPathTraverser, + org.apache.hugegraph.traversal.algorithm.NeighborRankTraverser, + org.apache.hugegraph.traversal.algorithm.PathsTraverser, + org.apache.hugegraph.traversal.algorithm.PersonalRankTraverser, + org.apache.hugegraph.traversal.algorithm.SameNeighborTraverser, + org.apache.hugegraph.traversal.algorithm.ShortestPathTraverser, + org.apache.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser, + org.apache.hugegraph.traversal.algorithm.SubGraphTraverser, + org.apache.hugegraph.traversal.algorithm.TemplatePathsTraverser, + org.apache.hugegraph.traversal.algorithm.steps.EdgeStep, + org.apache.hugegraph.traversal.algorithm.steps.RepeatEdgeStep, + org.apache.hugegraph.traversal.algorithm.steps.WeightedEdgeStep, + org.apache.hugegraph.traversal.optimize.Text, + org.apache.hugegraph.traversal.optimize.TraversalUtil, + org.apache.hugegraph.util.DateUtil ], methodImports: [java.lang.Math#*] }, @@ -73,25 +73,25 @@ serializers: - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: false, - ioRegistries: [com.baidu.hugegraph.io.HugeGraphIoRegistry] + ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry] } } - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { serializeResultToString: false, - ioRegistries: [com.baidu.hugegraph.io.HugeGraphIoRegistry] + ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry] } } - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { serializeResultToString: false, - ioRegistries: [com.baidu.hugegraph.io.HugeGraphIoRegistry] + ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry] } } - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { serializeResultToString: false, - ioRegistries: [com.baidu.hugegraph.io.HugeGraphIoRegistry] + ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry] } } metrics: { @@ -114,8 +114,8 @@ ssl: { enabled: false } authentication: { - authenticator: com.baidu.hugegraph.auth.StandardAuthenticator, + authenticator: org.apache.hugegraph.auth.StandardAuthenticator, #authenticationHandler: org.apache.tinkerpop.gremlin.server.handler.SaslAndHttpBasicAuthenticationHandler, - authenticationHandler: com.baidu.hugegraph.auth.WsAndHttpBasicAuthHandler, + authenticationHandler: org.apache.hugegraph.auth.WsAndHttpBasicAuthHandler, config: {tokens: conf/rest-server.properties} } diff --git a/hugegraph-dist/src/assembly/travis/conf-raft3/rest-server.properties b/hugegraph-dist/src/assembly/travis/conf-raft3/rest-server.properties index 1fa980f4e..4f4ee16fc 100644 --- a/hugegraph-dist/src/assembly/travis/conf-raft3/rest-server.properties +++ b/hugegraph-dist/src/assembly/travis/conf-raft3/rest-server.properties @@ -1,7 +1,7 @@ restserver.url=http://127.0.0.1:8083 gremlinserver.url=http://127.0.0.1:8183 graphs=conf/graphs -auth.authenticator=com.baidu.hugegraph.auth.StandardAuthenticator +auth.authenticator=org.apache.hugegraph.auth.StandardAuthenticator rpc.server_host=127.0.0.1 rpc.server_port=8093 diff --git a/hugegraph-dist/src/assembly/travis/run-api-test.sh b/hugegraph-dist/src/assembly/travis/run-api-test.sh index 3a0f8ad3e..c8ff1ed20 100755 --- a/hugegraph-dist/src/assembly/travis/run-api-test.sh +++ b/hugegraph-dist/src/assembly/travis/run-api-test.sh @@ -32,17 +32,17 @@ JACOCO_PORT=36320 mvn package -DskipTests # config rest-server -sed -i 's/#auth.authenticator=/auth.authenticator=com.baidu.hugegraph.auth.StandardAuthenticator/' $REST_SERVER_CONF +sed -i 's/#auth.authenticator=/auth.authenticator=org.apache.hugegraph.auth.StandardAuthenticator/' $REST_SERVER_CONF sed -i 's/#auth.admin_token=/auth.admin_token=pa/' $REST_SERVER_CONF # config hugegraph.properties -sed -i 's/gremlin.graph=.*/gremlin.graph=com.baidu.hugegraph.auth.HugeFactoryAuthProxy/' $CONF +sed -i 's/gremlin.graph=.*/gremlin.graph=org.apache.hugegraph.auth.HugeFactoryAuthProxy/' $CONF # config gremlin-server echo " authentication: { - authenticator: com.baidu.hugegraph.auth.StandardAuthenticator, - authenticationHandler: com.baidu.hugegraph.auth.WsAndHttpBasicAuthHandler, + authenticator: org.apache.hugegraph.auth.StandardAuthenticator, + authenticationHandler: org.apache.hugegraph.auth.WsAndHttpBasicAuthHandler, config: {tokens: conf/rest-server.properties} }" >> $GREMLIN_SERVER_CONF diff --git a/hugegraph-dist/src/main/java/com/baidu/hugegraph/cmd/ConfDumper.java b/hugegraph-dist/src/main/java/org/apache/hugegraph/cmd/ConfDumper.java similarity index 88% rename from hugegraph-dist/src/main/java/com/baidu/hugegraph/cmd/ConfDumper.java rename to hugegraph-dist/src/main/java/org/apache/hugegraph/cmd/ConfDumper.java index f36bd67f0..56cc97ad2 100644 --- a/hugegraph-dist/src/main/java/com/baidu/hugegraph/cmd/ConfDumper.java +++ b/hugegraph-dist/src/main/java/org/apache/hugegraph/cmd/ConfDumper.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.cmd; +package org.apache.hugegraph.cmd; import java.io.File; import java.io.IOException; @@ -25,14 +25,14 @@ import java.util.TreeSet; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.io.FileUtils; +import org.apache.hugegraph.dist.RegisterUtil; import org.slf4j.Logger; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.config.OptionSpace; -import com.baidu.hugegraph.config.TypedOption; -import com.baidu.hugegraph.dist.RegisterUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.OptionSpace; +import org.apache.hugegraph.config.TypedOption; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; public class ConfDumper { diff --git a/hugegraph-dist/src/main/java/com/baidu/hugegraph/cmd/InitStore.java b/hugegraph-dist/src/main/java/org/apache/hugegraph/cmd/InitStore.java similarity index 90% rename from hugegraph-dist/src/main/java/com/baidu/hugegraph/cmd/InitStore.java rename to hugegraph-dist/src/main/java/org/apache/hugegraph/cmd/InitStore.java index 30ba9a0dd..beef26ed6 100644 --- a/hugegraph-dist/src/main/java/com/baidu/hugegraph/cmd/InitStore.java +++ b/hugegraph-dist/src/main/java/org/apache/hugegraph/cmd/InitStore.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.cmd; +package org.apache.hugegraph.cmd; import java.util.ArrayList; import java.util.Collection; @@ -26,19 +26,19 @@ import java.util.Map; import org.apache.commons.collections.map.MultiValueMap; import org.apache.tinkerpop.gremlin.structure.util.GraphFactory; +import org.apache.hugegraph.dist.RegisterUtil; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.auth.StandardAuthenticator; -import com.baidu.hugegraph.backend.store.BackendStoreInfo; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.config.ServerOptions; -import com.baidu.hugegraph.dist.RegisterUtil; -import com.baidu.hugegraph.util.ConfigUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.auth.StandardAuthenticator; +import org.apache.hugegraph.backend.store.BackendStoreInfo; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.ServerOptions; +import org.apache.hugegraph.util.ConfigUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; public class InitStore { diff --git a/hugegraph-dist/src/main/java/com/baidu/hugegraph/cmd/StoreDumper.java b/hugegraph-dist/src/main/java/org/apache/hugegraph/cmd/StoreDumper.java similarity index 85% rename from hugegraph-dist/src/main/java/com/baidu/hugegraph/cmd/StoreDumper.java rename to hugegraph-dist/src/main/java/org/apache/hugegraph/cmd/StoreDumper.java index c362bb8bb..7d19ae485 100644 --- a/hugegraph-dist/src/main/java/com/baidu/hugegraph/cmd/StoreDumper.java +++ b/hugegraph-dist/src/main/java/org/apache/hugegraph/cmd/StoreDumper.java @@ -17,23 +17,23 @@ * under the License. */ -package com.baidu.hugegraph.cmd; +package org.apache.hugegraph.cmd; import java.util.Iterator; import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator; +import org.apache.hugegraph.dist.RegisterUtil; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.dist.RegisterUtil; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; public class StoreDumper { diff --git a/hugegraph-dist/src/main/java/com/baidu/hugegraph/dist/DistOptions.java b/hugegraph-dist/src/main/java/org/apache/hugegraph/dist/DistOptions.java similarity index 87% rename from hugegraph-dist/src/main/java/com/baidu/hugegraph/dist/DistOptions.java rename to hugegraph-dist/src/main/java/org/apache/hugegraph/dist/DistOptions.java index 8aa2a34ac..5e714d07c 100644 --- a/hugegraph-dist/src/main/java/com/baidu/hugegraph/dist/DistOptions.java +++ b/hugegraph-dist/src/main/java/org/apache/hugegraph/dist/DistOptions.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.dist; +package org.apache.hugegraph.dist; -import static com.baidu.hugegraph.config.OptionChecker.disallowEmpty; +import static org.apache.hugegraph.config.OptionChecker.disallowEmpty; -import com.baidu.hugegraph.config.ConfigListOption; -import com.baidu.hugegraph.config.OptionHolder; +import org.apache.hugegraph.config.ConfigListOption; +import org.apache.hugegraph.config.OptionHolder; public class DistOptions extends OptionHolder { diff --git a/hugegraph-dist/src/main/java/com/baidu/hugegraph/dist/HugeGraphServer.java b/hugegraph-dist/src/main/java/org/apache/hugegraph/dist/HugeGraphServer.java similarity index 92% rename from hugegraph-dist/src/main/java/com/baidu/hugegraph/dist/HugeGraphServer.java rename to hugegraph-dist/src/main/java/org/apache/hugegraph/dist/HugeGraphServer.java index 3341afec7..58244ed74 100644 --- a/hugegraph-dist/src/main/java/com/baidu/hugegraph/dist/HugeGraphServer.java +++ b/hugegraph-dist/src/main/java/org/apache/hugegraph/dist/HugeGraphServer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.dist; +package org.apache.hugegraph.dist; import java.util.concurrent.CompletableFuture; @@ -25,14 +25,14 @@ import org.apache.logging.log4j.LogManager; import org.apache.tinkerpop.gremlin.server.GremlinServer; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.config.ServerOptions; -import com.baidu.hugegraph.event.EventHub; -import com.baidu.hugegraph.server.RestServer; -import com.baidu.hugegraph.util.ConfigUtil; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.ServerOptions; +import org.apache.hugegraph.event.EventHub; +import org.apache.hugegraph.server.RestServer; +import org.apache.hugegraph.util.ConfigUtil; +import org.apache.hugegraph.util.Log; public class HugeGraphServer { diff --git a/hugegraph-dist/src/main/java/com/baidu/hugegraph/dist/HugeGremlinServer.java b/hugegraph-dist/src/main/java/org/apache/hugegraph/dist/HugeGremlinServer.java similarity index 89% rename from hugegraph-dist/src/main/java/com/baidu/hugegraph/dist/HugeGremlinServer.java rename to hugegraph-dist/src/main/java/org/apache/hugegraph/dist/HugeGremlinServer.java index 10a36663e..186bf3be5 100644 --- a/hugegraph-dist/src/main/java/com/baidu/hugegraph/dist/HugeGremlinServer.java +++ b/hugegraph-dist/src/main/java/org/apache/hugegraph/dist/HugeGremlinServer.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.dist; +package org.apache.hugegraph.dist; import org.apache.tinkerpop.gremlin.server.GremlinServer; import org.apache.tinkerpop.gremlin.server.Settings; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.auth.ContextGremlinServer; -import com.baidu.hugegraph.event.EventHub; -import com.baidu.hugegraph.util.ConfigUtil; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.auth.ContextGremlinServer; +import org.apache.hugegraph.event.EventHub; +import org.apache.hugegraph.util.ConfigUtil; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; public class HugeGremlinServer { diff --git a/hugegraph-dist/src/main/java/com/baidu/hugegraph/dist/HugeRestServer.java b/hugegraph-dist/src/main/java/org/apache/hugegraph/dist/HugeRestServer.java similarity index 87% rename from hugegraph-dist/src/main/java/com/baidu/hugegraph/dist/HugeRestServer.java rename to hugegraph-dist/src/main/java/org/apache/hugegraph/dist/HugeRestServer.java index f82d45c6c..32549a8d4 100644 --- a/hugegraph-dist/src/main/java/com/baidu/hugegraph/dist/HugeRestServer.java +++ b/hugegraph-dist/src/main/java/org/apache/hugegraph/dist/HugeRestServer.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.dist; +package org.apache.hugegraph.dist; import org.slf4j.Logger; -import com.baidu.hugegraph.event.EventHub; -import com.baidu.hugegraph.server.RestServer; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.event.EventHub; +import org.apache.hugegraph.server.RestServer; +import org.apache.hugegraph.util.Log; public class HugeRestServer { diff --git a/hugegraph-dist/src/main/java/com/baidu/hugegraph/dist/RegisterUtil.java b/hugegraph-dist/src/main/java/org/apache/hugegraph/dist/RegisterUtil.java similarity index 71% rename from hugegraph-dist/src/main/java/com/baidu/hugegraph/dist/RegisterUtil.java rename to hugegraph-dist/src/main/java/org/apache/hugegraph/dist/RegisterUtil.java index 8fa971181..abe4dfcfe 100644 --- a/hugegraph-dist/src/main/java/com/baidu/hugegraph/dist/RegisterUtil.java +++ b/hugegraph-dist/src/main/java/org/apache/hugegraph/dist/RegisterUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.dist; +package org.apache.hugegraph.dist; import java.net.URL; import java.util.List; @@ -28,17 +28,17 @@ import org.apache.commons.configuration2.builder.fluent.Configurations; import org.apache.commons.configuration2.ex.ConfigurationException; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.backend.serializer.SerializerFactory; -import com.baidu.hugegraph.backend.store.BackendProviderFactory; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.config.OptionSpace; -import com.baidu.hugegraph.plugin.HugeGraphPlugin; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; -import com.baidu.hugegraph.util.VersionUtil; -import com.baidu.hugegraph.version.CoreVersion; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.backend.serializer.SerializerFactory; +import org.apache.hugegraph.backend.store.BackendProviderFactory; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.OptionSpace; +import org.apache.hugegraph.plugin.HugeGraphPlugin; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; +import org.apache.hugegraph.util.VersionUtil; +import org.apache.hugegraph.version.CoreVersion; public class RegisterUtil { @@ -101,93 +101,93 @@ public class RegisterUtil { public static void registerCassandra() { // Register config OptionSpace.register("cassandra", - "com.baidu.hugegraph.backend.store.cassandra.CassandraOptions"); + "org.apache.hugegraph.backend.store.cassandra.CassandraOptions"); // Register serializer SerializerFactory.register("cassandra", - "com.baidu.hugegraph.backend.store.cassandra.CassandraSerializer"); + "org.apache.hugegraph.backend.store.cassandra.CassandraSerializer"); // Register backend BackendProviderFactory.register("cassandra", - "com.baidu.hugegraph.backend.store.cassandra.CassandraStoreProvider"); + "org.apache.hugegraph.backend.store.cassandra.CassandraStoreProvider"); } public static void registerScyllaDB() { // Register config OptionSpace.register("scylladb", - "com.baidu.hugegraph.backend.store.cassandra.CassandraOptions"); + "org.apache.hugegraph.backend.store.cassandra.CassandraOptions"); // Register serializer SerializerFactory.register("scylladb", - "com.baidu.hugegraph.backend.store.cassandra.CassandraSerializer"); + "org.apache.hugegraph.backend.store.cassandra.CassandraSerializer"); // Register backend BackendProviderFactory.register("scylladb", - "com.baidu.hugegraph.backend.store.scylladb.ScyllaDBStoreProvider"); + "org.apache.hugegraph.backend.store.scylladb.ScyllaDBStoreProvider"); } public static void registerHBase() { // Register config OptionSpace.register("hbase", - "com.baidu.hugegraph.backend.store.hbase.HbaseOptions"); + "org.apache.hugegraph.backend.store.hbase.HbaseOptions"); // Register serializer SerializerFactory.register("hbase", - "com.baidu.hugegraph.backend.store.hbase.HbaseSerializer"); + "org.apache.hugegraph.backend.store.hbase.HbaseSerializer"); // Register backend BackendProviderFactory.register("hbase", - "com.baidu.hugegraph.backend.store.hbase.HbaseStoreProvider"); + "org.apache.hugegraph.backend.store.hbase.HbaseStoreProvider"); } public static void registerRocksDB() { // Register config OptionSpace.register("rocksdb", - "com.baidu.hugegraph.backend.store.rocksdb.RocksDBOptions"); + "org.apache.hugegraph.backend.store.rocksdb.RocksDBOptions"); // Register backend BackendProviderFactory.register("rocksdb", - "com.baidu.hugegraph.backend.store.rocksdb.RocksDBStoreProvider"); + "org.apache.hugegraph.backend.store.rocksdb.RocksDBStoreProvider"); BackendProviderFactory.register("rocksdbsst", - "com.baidu.hugegraph.backend.store.rocksdbsst.RocksDBSstStoreProvider"); + "org.apache.hugegraph.backend.store.rocksdbsst.RocksDBSstStoreProvider"); } public static void registerMysql() { // Register config OptionSpace.register("mysql", - "com.baidu.hugegraph.backend.store.mysql.MysqlOptions"); + "org.apache.hugegraph.backend.store.mysql.MysqlOptions"); // Register serializer SerializerFactory.register("mysql", - "com.baidu.hugegraph.backend.store.mysql.MysqlSerializer"); + "org.apache.hugegraph.backend.store.mysql.MysqlSerializer"); // Register backend BackendProviderFactory.register("mysql", - "com.baidu.hugegraph.backend.store.mysql.MysqlStoreProvider"); + "org.apache.hugegraph.backend.store.mysql.MysqlStoreProvider"); } public static void registerPalo() { // Register config OptionSpace.register("palo", - "com.baidu.hugegraph.backend.store.palo.PaloOptions"); + "org.apache.hugegraph.backend.store.palo.PaloOptions"); // Register serializer SerializerFactory.register("palo", - "com.baidu.hugegraph.backend.store.palo.PaloSerializer"); + "org.apache.hugegraph.backend.store.palo.PaloSerializer"); // Register backend BackendProviderFactory.register("palo", - "com.baidu.hugegraph.backend.store.palo.PaloStoreProvider"); + "org.apache.hugegraph.backend.store.palo.PaloStoreProvider"); } public static void registerPostgresql() { // Register config OptionSpace.register("postgresql", - "com.baidu.hugegraph.backend.store.postgresql.PostgresqlOptions"); + "org.apache.hugegraph.backend.store.postgresql.PostgresqlOptions"); // Register serializer SerializerFactory.register("postgresql", - "com.baidu.hugegraph.backend.store.postgresql.PostgresqlSerializer"); + "org.apache.hugegraph.backend.store.postgresql.PostgresqlSerializer"); // Register backend BackendProviderFactory.register("postgresql", - "com.baidu.hugegraph.backend.store.postgresql.PostgresqlStoreProvider"); + "org.apache.hugegraph.backend.store.postgresql.PostgresqlStoreProvider"); } public static void registerServer() { // Register ServerOptions (rest-server) - OptionSpace.register("server", "com.baidu.hugegraph.config.ServerOptions"); + OptionSpace.register("server", "org.apache.hugegraph.config.ServerOptions"); // Register RpcOptions (rpc-server) - OptionSpace.register("rpc", "com.baidu.hugegraph.config.RpcOptions"); + OptionSpace.register("rpc", "org.apache.hugegraph.config.RpcOptions"); // Register AuthOptions (auth-server) - OptionSpace.register("auth", "com.baidu.hugegraph.config.AuthOptions"); + OptionSpace.register("auth", "org.apache.hugegraph.config.AuthOptions"); } /** diff --git a/hugegraph-dist/src/main/resources/log4j2.xml b/hugegraph-dist/src/main/resources/log4j2.xml index c64b8d8f5..1dcc44d39 100644 --- a/hugegraph-dist/src/main/resources/log4j2.xml +++ b/hugegraph-dist/src/main/resources/log4j2.xml @@ -112,15 +112,15 @@ - + - + - + diff --git a/hugegraph-example/pom.xml b/hugegraph-example/pom.xml index ac8bb5aca..48a42c633 100644 --- a/hugegraph-example/pom.xml +++ b/hugegraph-example/pom.xml @@ -20,18 +20,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hugegraph - com.baidu.hugegraph - 0.13.0 + org.apache.hugegraph + ${revision} + ../pom.xml 4.0.0 hugegraph-example + + 1.0.0 + + - com.baidu.hugegraph + org.apache.hugegraph hugegraph-dist - ${project.version} + ${hugegraph-dist-version} diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java b/hugegraph-example/src/main/java/org/apache/hugegraph/example/Example1.java similarity index 96% rename from hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java rename to hugegraph-example/src/main/java/org/apache/hugegraph/example/Example1.java index 3d7944699..87c8f7cd4 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java +++ b/hugegraph-example/src/main/java/org/apache/hugegraph/example/Example1.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.example; +package org.apache.hugegraph.example; import java.util.Arrays; import java.util.Iterator; @@ -31,22 +31,22 @@ import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.traversal.optimize.Text; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.traversal.optimize.Text; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.Log; public class Example1 { diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example2.java b/hugegraph-example/src/main/java/org/apache/hugegraph/example/Example2.java similarity index 97% rename from hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example2.java rename to hugegraph-example/src/main/java/org/apache/hugegraph/example/Example2.java index dfcafb967..7d7ff99c1 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example2.java +++ b/hugegraph-example/src/main/java/org/apache/hugegraph/example/Example2.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.example; +package org.apache.hugegraph.example; import java.util.List; @@ -31,10 +31,10 @@ import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.util.Log; public class Example2 { diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example3.java b/hugegraph-example/src/main/java/org/apache/hugegraph/example/Example3.java similarity index 96% rename from hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example3.java rename to hugegraph-example/src/main/java/org/apache/hugegraph/example/Example3.java index 6f1bd6dba..cb450b3d4 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example3.java +++ b/hugegraph-example/src/main/java/org/apache/hugegraph/example/Example3.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.example; +package org.apache.hugegraph.example; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.util.Log; public class Example3 { diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/ExampleUtil.java b/hugegraph-example/src/main/java/org/apache/hugegraph/example/ExampleUtil.java similarity index 84% rename from hugegraph-example/src/main/java/com/baidu/hugegraph/example/ExampleUtil.java rename to hugegraph-example/src/main/java/org/apache/hugegraph/example/ExampleUtil.java index 18be21c3b..6cee06144 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/ExampleUtil.java +++ b/hugegraph-example/src/main/java/org/apache/hugegraph/example/ExampleUtil.java @@ -17,23 +17,23 @@ * under the License. */ -package com.baidu.hugegraph.example; +package org.apache.hugegraph.example; import java.io.File; import java.util.Iterator; import java.util.concurrent.TimeoutException; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.dist.RegisterUtil; -import com.baidu.hugegraph.perf.PerfUtil; -import com.baidu.hugegraph.task.HugeTask; -import com.baidu.hugegraph.task.TaskScheduler; -import com.baidu.hugegraph.type.define.NodeRole; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.dist.RegisterUtil; +import org.apache.hugegraph.perf.PerfUtil; +import org.apache.hugegraph.task.HugeTask; +import org.apache.hugegraph.task.TaskScheduler; +import org.apache.hugegraph.type.define.NodeRole; +import org.apache.hugegraph.util.Log; public class ExampleUtil { private static final Logger LOG = Log.logger(ExampleUtil.class); @@ -90,7 +90,7 @@ public class ExampleUtil { public static void profile() { try { - PerfUtil.instance().profilePackage("com.baidu.hugegraph"); + PerfUtil.instance().profilePackage("org.apache.hugegraph"); } catch (Throwable e) { throw new RuntimeException(e); } diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/GraphOfTheMoviesExample.java b/hugegraph-example/src/main/java/org/apache/hugegraph/example/GraphOfTheMoviesExample.java similarity index 99% rename from hugegraph-example/src/main/java/com/baidu/hugegraph/example/GraphOfTheMoviesExample.java rename to hugegraph-example/src/main/java/org/apache/hugegraph/example/GraphOfTheMoviesExample.java index 7ccc023a5..618051d55 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/GraphOfTheMoviesExample.java +++ b/hugegraph-example/src/main/java/org/apache/hugegraph/example/GraphOfTheMoviesExample.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.example; +package org.apache.hugegraph.example; import java.util.List; @@ -27,10 +27,10 @@ import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.perf.PerfUtil; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.perf.PerfUtil; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.util.Log; public class GraphOfTheMoviesExample { diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExample1.java b/hugegraph-example/src/main/java/org/apache/hugegraph/example/PerfExample1.java similarity index 96% rename from hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExample1.java rename to hugegraph-example/src/main/java/org/apache/hugegraph/example/PerfExample1.java index 83a385d31..2bd6e2b9c 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExample1.java +++ b/hugegraph-example/src/main/java/org/apache/hugegraph/example/PerfExample1.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.example; +package org.apache.hugegraph.example; import java.util.ArrayList; import java.util.List; @@ -26,9 +26,9 @@ import java.util.Random; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.schema.SchemaManager; import com.datastax.driver.core.exceptions.NoHostAvailableException; /** diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExample2.java b/hugegraph-example/src/main/java/org/apache/hugegraph/example/PerfExample2.java similarity index 95% rename from hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExample2.java rename to hugegraph-example/src/main/java/org/apache/hugegraph/example/PerfExample2.java index fb17ba85b..bcd171447 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExample2.java +++ b/hugegraph-example/src/main/java/org/apache/hugegraph/example/PerfExample2.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.example; +package org.apache.hugegraph.example; import java.util.ArrayList; import java.util.List; @@ -26,9 +26,9 @@ import java.util.Random; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.schema.SchemaManager; import com.datastax.driver.core.exceptions.NoHostAvailableException; /** diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExample3.java b/hugegraph-example/src/main/java/org/apache/hugegraph/example/PerfExample3.java similarity index 95% rename from hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExample3.java rename to hugegraph-example/src/main/java/org/apache/hugegraph/example/PerfExample3.java index 4f519ff7f..84bd35281 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExample3.java +++ b/hugegraph-example/src/main/java/org/apache/hugegraph/example/PerfExample3.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.example; +package org.apache.hugegraph.example; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.util.Log; /** * Perf test for: insert vertices with indexes in order diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExample4.java b/hugegraph-example/src/main/java/org/apache/hugegraph/example/PerfExample4.java similarity index 96% rename from hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExample4.java rename to hugegraph-example/src/main/java/org/apache/hugegraph/example/PerfExample4.java index 22285d63a..e3264b9a8 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExample4.java +++ b/hugegraph-example/src/main/java/org/apache/hugegraph/example/PerfExample4.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.example; +package org.apache.hugegraph.example; import java.util.List; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.util.Log; /** * Perf test for: query vertices with indexes and limit @@ -86,4 +86,4 @@ public class PerfExample4 extends PerfExample3 { long current = System.currentTimeMillis(); return current - start; } -} \ No newline at end of file +} diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExampleBase.java b/hugegraph-example/src/main/java/org/apache/hugegraph/example/PerfExampleBase.java similarity index 94% rename from hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExampleBase.java rename to hugegraph-example/src/main/java/org/apache/hugegraph/example/PerfExampleBase.java index 5a1d52318..27a311d56 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExampleBase.java +++ b/hugegraph-example/src/main/java/org/apache/hugegraph/example/PerfExampleBase.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.example; +package org.apache.hugegraph.example; import java.util.ArrayList; import java.util.Collections; @@ -34,19 +34,19 @@ import org.apache.tinkerpop.gremlin.structure.Transaction; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.cache.Cache; -import com.baidu.hugegraph.backend.cache.CacheManager; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.perf.PerfUtil; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.cache.Cache; +import org.apache.hugegraph.backend.cache.CacheManager; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.perf.PerfUtil; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.Log; public abstract class PerfExampleBase { diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/TaskExample.java b/hugegraph-example/src/main/java/org/apache/hugegraph/example/TaskExample.java similarity index 85% rename from hugegraph-example/src/main/java/com/baidu/hugegraph/example/TaskExample.java rename to hugegraph-example/src/main/java/org/apache/hugegraph/example/TaskExample.java index 7b69871de..af35efdd4 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/TaskExample.java +++ b/hugegraph-example/src/main/java/org/apache/hugegraph/example/TaskExample.java @@ -17,23 +17,23 @@ * under the License. */ -package com.baidu.hugegraph.example; +package org.apache.hugegraph.example; import java.util.Iterator; import org.apache.commons.collections.IteratorUtils; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.task.HugeTask; -import com.baidu.hugegraph.task.TaskCallable; -import com.baidu.hugegraph.task.TaskScheduler; -import com.baidu.hugegraph.task.TaskStatus; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.task.HugeTask; +import org.apache.hugegraph.task.TaskCallable; +import org.apache.hugegraph.task.TaskScheduler; +import org.apache.hugegraph.task.TaskStatus; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.util.Log; public class TaskExample { @@ -52,7 +52,7 @@ public class TaskExample { public static void testTask(HugeGraph graph) throws InterruptedException { Id id = IdGenerator.of(8); - String callable = "com.baidu.hugegraph.example.TaskExample$TestTask"; + String callable = "org.apache.hugegraph.example.TaskExample$TestTask"; HugeTask task = new HugeTask<>(id, null, callable, "test-parameter"); task.type("type-1"); task.name("test-task"); diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/ThreadRangePerfTest.java b/hugegraph-example/src/main/java/org/apache/hugegraph/example/ThreadRangePerfTest.java similarity index 94% rename from hugegraph-example/src/main/java/com/baidu/hugegraph/example/ThreadRangePerfTest.java rename to hugegraph-example/src/main/java/org/apache/hugegraph/example/ThreadRangePerfTest.java index 271e291cc..dd7af07f0 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/ThreadRangePerfTest.java +++ b/hugegraph-example/src/main/java/org/apache/hugegraph/example/ThreadRangePerfTest.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.example; +package org.apache.hugegraph.example; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.util.Log; public class ThreadRangePerfTest { diff --git a/hugegraph-example/src/main/resources/hugegraph.properties b/hugegraph-example/src/main/resources/hugegraph.properties index 7a51f9b97..dae1a292a 100644 --- a/hugegraph-example/src/main/resources/hugegraph.properties +++ b/hugegraph-example/src/main/resources/hugegraph.properties @@ -1,4 +1,4 @@ -gremlin.graph=com.baidu.hugegraph.HugeFactory +gremlin.graph=org.apache.hugegraph.HugeFactory #backend=cassandra #serializer=cassandra diff --git a/hugegraph-example/src/main/resources/log4j2.xml b/hugegraph-example/src/main/resources/log4j2.xml index ec71cf916..fd614545e 100644 --- a/hugegraph-example/src/main/resources/log4j2.xml +++ b/hugegraph-example/src/main/resources/log4j2.xml @@ -112,15 +112,15 @@ - + - + - + diff --git a/hugegraph-hbase/pom.xml b/hugegraph-hbase/pom.xml index 51f77ac6b..37cdaecdc 100644 --- a/hugegraph-hbase/pom.xml +++ b/hugegraph-hbase/pom.xml @@ -20,18 +20,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hugegraph - com.baidu.hugegraph - 0.13.0 + org.apache.hugegraph + ${revision} + ../pom.xml 4.0.0 hugegraph-hbase + + 1.0.0 + + - com.baidu.hugegraph + org.apache.hugegraph hugegraph-core - ${project.version} + ${hugegraph-core-version} com.baidu.hugegraph diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseFeatures.java b/hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseFeatures.java similarity index 96% rename from hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseFeatures.java rename to hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseFeatures.java index b977f9206..cf64c2b96 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseFeatures.java +++ b/hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseFeatures.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.hbase; +package org.apache.hugegraph.backend.store.hbase; -import com.baidu.hugegraph.backend.store.BackendFeatures; +import org.apache.hugegraph.backend.store.BackendFeatures; public class HbaseFeatures implements BackendFeatures { diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseMetrics.java b/hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseMetrics.java similarity index 97% rename from hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseMetrics.java rename to hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseMetrics.java index beeca6fc4..637803c39 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseMetrics.java +++ b/hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseMetrics.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.hbase; +package org.apache.hugegraph.backend.store.hbase; import java.util.Collection; import java.util.Date; @@ -32,10 +32,10 @@ import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.Size; import org.apache.hadoop.hbase.client.Admin; -import com.baidu.hugegraph.backend.store.BackendMetrics; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.UnitUtil; +import org.apache.hugegraph.backend.store.BackendMetrics; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.UnitUtil; import com.google.common.collect.ImmutableMap; public class HbaseMetrics implements BackendMetrics { diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseOptions.java b/hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseOptions.java similarity index 92% rename from hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseOptions.java rename to hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseOptions.java index 2fb3e39fb..a37b2b14f 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseOptions.java +++ b/hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseOptions.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.hbase; +package org.apache.hugegraph.backend.store.hbase; -import static com.baidu.hugegraph.config.OptionChecker.disallowEmpty; -import static com.baidu.hugegraph.config.OptionChecker.positiveInt; -import static com.baidu.hugegraph.config.OptionChecker.rangeInt; -import static com.baidu.hugegraph.config.OptionChecker.nonNegativeInt; +import static org.apache.hugegraph.config.OptionChecker.disallowEmpty; +import static org.apache.hugegraph.config.OptionChecker.positiveInt; +import static org.apache.hugegraph.config.OptionChecker.rangeInt; +import static org.apache.hugegraph.config.OptionChecker.nonNegativeInt; -import com.baidu.hugegraph.config.ConfigOption; -import com.baidu.hugegraph.config.OptionHolder; +import org.apache.hugegraph.config.ConfigOption; +import org.apache.hugegraph.config.OptionHolder; public class HbaseOptions extends OptionHolder { diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSerializer.java b/hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseSerializer.java similarity index 87% rename from hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSerializer.java rename to hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseSerializer.java index c7bf3de92..8355baf6e 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSerializer.java +++ b/hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseSerializer.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.hbase; +package org.apache.hugegraph.backend.store.hbase; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.serializer.BinarySerializer; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.serializer.BinarySerializer; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.Log; import org.slf4j.Logger; import java.util.Arrays; diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java b/hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseSessions.java similarity index 97% rename from hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java rename to hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseSessions.java index 12631a85c..f135a77b5 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java +++ b/hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseSessions.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.hbase; +package org.apache.hugegraph.backend.store.hbase; import java.io.IOException; import java.io.InterruptedIOException; @@ -31,7 +31,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.Future; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.util.Log; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; @@ -72,17 +72,17 @@ import org.apache.hadoop.hbase.util.VersionInfo; import org.apache.hadoop.security.UserGroupInformation; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumn; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendIterator; -import com.baidu.hugegraph.backend.store.BackendSession.AbstractBackendSession; -import com.baidu.hugegraph.backend.store.BackendSessionPool; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.StringEncoding; -import com.baidu.hugegraph.util.VersionUtil; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumn; +import org.apache.hugegraph.backend.store.BackendEntry.BackendIterator; +import org.apache.hugegraph.backend.store.BackendSession.AbstractBackendSession; +import org.apache.hugegraph.backend.store.BackendSessionPool; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.StringEncoding; +import org.apache.hugegraph.util.VersionUtil; import com.google.common.util.concurrent.Futures; public class HbaseSessions extends BackendSessionPool { diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseStore.java b/hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseStore.java similarity index 92% rename from hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseStore.java rename to hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseStore.java index 7256dd830..ee35ad319 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseStore.java +++ b/hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseStore.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.hbase; +package org.apache.hugegraph.backend.store.hbase; import java.io.IOException; import java.util.HashMap; @@ -34,23 +34,22 @@ import org.apache.hadoop.hbase.TableExistsException; import org.apache.hadoop.hbase.TableNotFoundException; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.AbstractBackendStore; -import com.baidu.hugegraph.backend.store.BackendAction; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendFeatures; -import com.baidu.hugegraph.backend.store.BackendMutation; -import com.baidu.hugegraph.backend.store.BackendStoreProvider; -import com.baidu.hugegraph.backend.store.hbase.HbaseSessions.Session; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.exception.ConnectionException; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.AbstractBackendStore; +import org.apache.hugegraph.backend.store.BackendAction; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendFeatures; +import org.apache.hugegraph.backend.store.BackendMutation; +import org.apache.hugegraph.backend.store.BackendStoreProvider; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.exception.ConnectionException; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; -public abstract class HbaseStore extends AbstractBackendStore { +public abstract class HbaseStore extends AbstractBackendStore { private static final Logger LOG = Log.logger(HbaseStore.class); @@ -107,7 +106,7 @@ public abstract class HbaseStore extends AbstractBackendStore { } @Override - protected Session session(HugeType type) { + protected HbaseSessions.Session session(HugeType type) { this.checkOpened(); return this.sessions.session(); } @@ -191,14 +190,14 @@ public abstract class HbaseStore extends AbstractBackendStore { } this.checkOpened(); - Session session = this.sessions.session(); + HbaseSessions.Session session = this.sessions.session(); for (Iterator it = mutation.mutation(); it.hasNext();) { this.mutate(session, it.next()); } } - private void mutate(Session session, BackendAction item) { + private void mutate(HbaseSessions.Session session, BackendAction item) { BackendEntry entry = item.entry(); HbaseTable table = this.table(entry.type()); @@ -231,7 +230,7 @@ public abstract class HbaseStore extends AbstractBackendStore { public Iterator query(Query query) { this.checkOpened(); - Session session = this.sessions.session(); + HbaseSessions.Session session = this.sessions.session(); HbaseTable table = this.table(HbaseTable.tableType(query)); return table.query(session, query); } @@ -240,7 +239,7 @@ public abstract class HbaseStore extends AbstractBackendStore { public Number queryNumber(Query query) { this.checkOpened(); - Session session = this.sessions.session(); + HbaseSessions.Session session = this.sessions.session(); HbaseTable table = this.table(HbaseTable.tableType(query)); return table.queryNumber(session, query); } @@ -427,7 +426,7 @@ public abstract class HbaseStore extends AbstractBackendStore { @Override public void commitTx() { this.checkOpened(); - Session session = this.sessions.session(); + HbaseSessions.Session session = this.sessions.session(); session.commit(); } @@ -435,7 +434,7 @@ public abstract class HbaseStore extends AbstractBackendStore { @Override public void rollbackTx() { this.checkOpened(); - Session session = this.sessions.session(); + HbaseSessions.Session session = this.sessions.session(); session.rollback(); } @@ -579,7 +578,7 @@ public abstract class HbaseStore extends AbstractBackendStore { @Override public void init() { super.init(); - Session session = super.session(null); + HbaseSessions.Session session = super.session(null); String driverVersion = this.provider().driverVersion(); this.meta.writeVersion(session, driverVersion); LOG.info("Write down the backend version: {}", driverVersion); @@ -587,7 +586,7 @@ public abstract class HbaseStore extends AbstractBackendStore { @Override public String storedVersion() { - Session session = super.session(null); + HbaseSessions.Session session = super.session(null); return this.meta.readVersion(session); } } diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseStoreProvider.java b/hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseStoreProvider.java similarity index 78% rename from hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseStoreProvider.java rename to hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseStoreProvider.java index dd4da243d..425571ce5 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseStoreProvider.java +++ b/hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseStoreProvider.java @@ -17,14 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.hbase; +package org.apache.hugegraph.backend.store.hbase; -import com.baidu.hugegraph.backend.store.AbstractBackendStoreProvider; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.store.hbase.HbaseStore.HbaseGraphStore; -import com.baidu.hugegraph.backend.store.hbase.HbaseStore.HbaseSchemaStore; -import com.baidu.hugegraph.backend.store.hbase.HbaseStore.HbaseSystemStore; -import com.baidu.hugegraph.config.HugeConfig; +import org.apache.hugegraph.backend.store.AbstractBackendStoreProvider; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.config.HugeConfig; public class HbaseStoreProvider extends AbstractBackendStoreProvider { @@ -34,17 +31,17 @@ public class HbaseStoreProvider extends AbstractBackendStoreProvider { @Override protected BackendStore newSchemaStore(HugeConfig config, String store) { - return new HbaseSchemaStore(config, this, this.namespace(), store); + return new HbaseStore.HbaseSchemaStore(config, this, this.namespace(), store); } @Override protected BackendStore newGraphStore(HugeConfig config, String store) { - return new HbaseGraphStore(config, this, this.namespace(), store); + return new HbaseStore.HbaseGraphStore(config, this, this.namespace(), store); } @Override protected BackendStore newSystemStore(HugeConfig config, String store) { - return new HbaseSystemStore(config, this, this.namespace(), store); + return new HbaseStore.HbaseSystemStore(config, this, this.namespace(), store); } @Override diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTable.java b/hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseTable.java similarity index 78% rename from hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTable.java rename to hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseTable.java index b4009dd9c..1afa19325 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTable.java +++ b/hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseTable.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.hbase; +package org.apache.hugegraph.backend.store.hbase; import java.io.IOException; import java.util.ArrayList; @@ -41,37 +41,33 @@ import org.apache.hadoop.hbase.client.RegionInfo; import org.apache.hadoop.hbase.client.Result; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.page.PageState; -import com.baidu.hugegraph.backend.query.Aggregate; -import com.baidu.hugegraph.backend.query.Aggregate.AggregateFunc; -import com.baidu.hugegraph.backend.query.Condition.Relation; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.IdPrefixQuery; -import com.baidu.hugegraph.backend.query.IdRangeQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.serializer.BinaryBackendEntry; -import com.baidu.hugegraph.backend.serializer.BinaryEntryIterator; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumn; -import com.baidu.hugegraph.backend.store.BackendEntryIterator; -import com.baidu.hugegraph.backend.store.BackendTable; -import com.baidu.hugegraph.backend.store.Shard; -import com.baidu.hugegraph.backend.store.hbase.HbaseSessions.CountSession; -import com.baidu.hugegraph.backend.store.hbase.HbaseSessions.HbaseSession; -import com.baidu.hugegraph.backend.store.hbase.HbaseSessions.RowIterator; -import com.baidu.hugegraph.backend.store.hbase.HbaseSessions.Session; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.Log; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.page.PageState; +import org.apache.hugegraph.backend.query.Aggregate; +import org.apache.hugegraph.backend.query.Aggregate.AggregateFunc; +import org.apache.hugegraph.backend.query.Condition.Relation; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.IdPrefixQuery; +import org.apache.hugegraph.backend.query.IdRangeQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.serializer.BinaryBackendEntry; +import org.apache.hugegraph.backend.serializer.BinaryEntryIterator; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumn; +import org.apache.hugegraph.backend.store.BackendEntryIterator; +import org.apache.hugegraph.backend.store.BackendTable; +import org.apache.hugegraph.backend.store.Shard; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.Log; +import org.apache.hugegraph.util.StringEncoding; import com.google.common.collect.ImmutableList; -public class HbaseTable extends BackendTable { +public class HbaseTable extends BackendTable { private static final Logger LOG = Log.logger(HbaseStore.class); @@ -106,23 +102,23 @@ public class HbaseTable extends BackendTable { } @Override - public void init(Session session) { + public void init(HbaseSessions.Session session) { // pass } @Override - public void clear(Session session) { + public void clear(HbaseSessions.Session session) { // pass } @Override - public void insert(Session session, BackendEntry entry) { + public void insert(HbaseSessions.Session session, BackendEntry entry) { assert !entry.columns().isEmpty(); session.put(this.table(), CF, entry.id().asBytes(), entry.columns()); } @Override - public void delete(Session session, BackendEntry entry) { + public void delete(HbaseSessions.Session session, BackendEntry entry) { if (entry.columns().isEmpty()) { session.delete(this.table(), CF, entry.id().asBytes()); } else { @@ -133,34 +129,34 @@ public class HbaseTable extends BackendTable { } @Override - public void append(Session session, BackendEntry entry) { + public void append(HbaseSessions.Session session, BackendEntry entry) { assert entry.columns().size() == 1; this.insert(session, entry); } @Override - public void eliminate(Session session, BackendEntry entry) { + public void eliminate(HbaseSessions.Session session, BackendEntry entry) { assert entry.columns().size() == 1; this.delete(session, entry); } @Override - public boolean queryExist(Session session, BackendEntry entry) { + public boolean queryExist(HbaseSessions.Session session, BackendEntry entry) { Id id = entry.id(); - try (RowIterator iter = this.queryById(session, id)) { + try (HbaseSessions.RowIterator iter = this.queryById(session, id)) { return iter.hasNext(); } } @Override - public Number queryNumber(Session session, Query query) { + public Number queryNumber(HbaseSessions.Session session, Query query) { Aggregate aggregate = query.aggregateNotNull(); if (aggregate.func() != AggregateFunc.COUNT) { throw new NotSupportException(aggregate.toString()); } assert aggregate.func() == AggregateFunc.COUNT; - try (CountSession countSession = session.countSession()) { + try (HbaseSessions.CountSession countSession = session.countSession()) { return this.query(countSession, query); } catch (IOException e) { throw new BackendException(e); @@ -168,17 +164,17 @@ public class HbaseTable extends BackendTable { } @Override - public Iterator query(Session session, Query query) { + public Iterator query(HbaseSessions.Session session, Query query) { if (query.limit() == 0L && !query.noLimit()) { LOG.debug("Return empty result(limit=0) for query {}", query); return Collections.emptyIterator(); } - HbaseSession hbaseSession = session; + HbaseSessions.HbaseSession hbaseSession = session; return this.newEntryIterator(query, this.query(hbaseSession, query)); } - protected R query(HbaseSession session, Query query) { + protected R query(HbaseSessions.HbaseSession session, Query query) { // Query all if (query.empty()) { return this.queryAll(session, query); @@ -212,7 +208,7 @@ public class HbaseTable extends BackendTable { return this.queryByCond(session, cq); } - protected R queryAll(HbaseSession session, Query query) { + protected R queryAll(HbaseSessions.HbaseSession session, Query query) { if (query.paging()) { PageState page = PageState.fromString(query.page()); byte[] begin = page.position(); @@ -222,11 +218,11 @@ public class HbaseTable extends BackendTable { } } - protected R queryById(HbaseSession session, Id id) { + protected R queryById(HbaseSessions.HbaseSession session, Id id) { return session.get(this.table(), null, id.asBytes()); } - protected R queryByIds(HbaseSession session, Collection ids) { + protected R queryByIds(HbaseSessions.HbaseSession session, Collection ids) { Set rowkeys = InsertionOrderUtil.newSet(); for (Id id : ids) { rowkeys.add(id.asBytes()); @@ -234,20 +230,20 @@ public class HbaseTable extends BackendTable { return session.get(this.table(), null, rowkeys); } - protected R queryByPrefix(HbaseSession session, + protected R queryByPrefix(HbaseSessions.HbaseSession session, IdPrefixQuery query) { return session.scan(this.table(), query.start().asBytes(), query.inclusiveStart(), query.prefix().asBytes()); } - protected R queryByRange(HbaseSession session, IdRangeQuery query) { + protected R queryByRange(HbaseSessions.HbaseSession session, IdRangeQuery query) { byte[] start = query.start().asBytes(); byte[] end = query.end() == null ? null : query.end().asBytes(); return session.scan(this.table(), start, query.inclusiveStart(), end, query.inclusiveEnd()); } - protected R queryByCond(HbaseSession session, ConditionQuery query) { + protected R queryByCond(HbaseSessions.HbaseSession session, ConditionQuery query) { if (query.containsScanRelation()) { E.checkArgument(query.relations().size() == 1, "Invalid scan with multi conditions: %s", query); @@ -258,7 +254,7 @@ public class HbaseTable extends BackendTable { throw new NotSupportException("query: %s", query); } - protected R queryByRange(HbaseSession session, + protected R queryByRange(HbaseSessions.HbaseSession session, Shard shard, String page) { byte[] start = this.shardSplitter.position(shard.start()); byte[] end = this.shardSplitter.position(shard.end()); @@ -273,7 +269,7 @@ public class HbaseTable extends BackendTable { } protected BackendEntryIterator newEntryIterator(Query query, - RowIterator rows) { + HbaseSessions.RowIterator rows) { return new BinaryEntryIterator<>(rows, query, (entry, row) -> { E.checkState(!row.isEmpty(), "Can't parse empty HBase result"); byte[] id = row.getRow(); @@ -302,14 +298,14 @@ public class HbaseTable extends BackendTable { } } - private static class HbaseShardSplitter extends ShardSplitter { + private static class HbaseShardSplitter extends ShardSplitter { public HbaseShardSplitter(String table) { super(table); } @Override - public List getSplits(Session session, long splitSize) { + public List getSplits(HbaseSessions.Session session, long splitSize) { E.checkArgument(splitSize >= MIN_SHARD_SIZE, "The split-size must be >= %s bytes, but got %s", MIN_SHARD_SIZE, splitSize); @@ -334,7 +330,7 @@ public class HbaseTable extends BackendTable { return shards; } - private static Map regionSizes(Session session, + private static Map regionSizes(HbaseSessions.Session session, String namespace, String table) { Map regionSizes = new HashMap<>(); @@ -358,7 +354,7 @@ public class HbaseTable extends BackendTable { return regionSizes; } - private static Map regionRanges(Session session, + private static Map regionRanges(HbaseSessions.Session session, String namespace, String table) { Map regionRanges = InsertionOrderUtil.newMap(); @@ -391,7 +387,7 @@ public class HbaseTable extends BackendTable { } @Override - public long estimateDataSize(Session session) { + public long estimateDataSize(HbaseSessions.Session session) { try { return session.storeSize(this.table()); } catch (IOException ignored) { @@ -400,7 +396,7 @@ public class HbaseTable extends BackendTable { } @Override - public long estimateNumKeys(Session session) { + public long estimateNumKeys(HbaseSessions.Session session) { // TODO: improve return 100000L; } diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTables.java b/hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseTables.java similarity index 86% rename from hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTables.java rename to hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseTables.java index 885351817..760e8bf95 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTables.java +++ b/hugegraph-hbase/src/main/java/org/apache/hugegraph/backend/store/hbase/HbaseTables.java @@ -17,30 +17,28 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.hbase; +package org.apache.hugegraph.backend.store.hbase; import java.io.IOException; import java.util.Arrays; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.backend.serializer.BytesBuffer; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.util.Bytes; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.serializer.BinaryBackendEntry; -import com.baidu.hugegraph.backend.serializer.BinaryEntryIterator; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumn; -import com.baidu.hugegraph.backend.store.BackendEntryIterator; -import com.baidu.hugegraph.backend.store.hbase.HbaseSessions.RowIterator; -import com.baidu.hugegraph.backend.store.hbase.HbaseSessions.Session; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.NumericUtil; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.serializer.BinaryBackendEntry; +import org.apache.hugegraph.backend.serializer.BinaryEntryIterator; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumn; +import org.apache.hugegraph.backend.store.BackendEntryIterator; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.NumericUtil; +import org.apache.hugegraph.util.StringEncoding; public class HbaseTables { @@ -53,7 +51,7 @@ public class HbaseTables { super(TABLE); } - public void writeVersion(Session session, String version) { + public void writeVersion(HbaseSessions.Session session, String version) { byte[] key = new byte[]{HugeKeys.VERSION.code()}; byte[] value = StringEncoding.encode(version); session.put(this.table(), CF, key, COL, value); @@ -64,9 +62,9 @@ public class HbaseTables { } } - public String readVersion(Session session) { + public String readVersion(HbaseSessions.Session session) { byte[] key = new byte[]{HugeKeys.VERSION.code()}; - RowIterator results = session.get(this.table(), CF, key); + HbaseSessions.RowIterator results = session.get(this.table(), CF, key); if (!results.hasNext()) { return null; } @@ -84,9 +82,9 @@ public class HbaseTables { super(TABLE); } - public long getCounter(Session session, HugeType type) { + public long getCounter(HbaseSessions.Session session, HugeType type) { byte[] key = new byte[]{type.code()}; - RowIterator results = session.get(this.table(), CF, key); + HbaseSessions.RowIterator results = session.get(this.table(), CF, key); if (results.hasNext()) { Result row = results.next(); return NumericUtil.bytesToLong(row.getValue(CF, COL)); @@ -95,7 +93,7 @@ public class HbaseTables { } } - public void increaseCounter(Session session, HugeType type, + public void increaseCounter(HbaseSessions.Session session, HugeType type, long increment) { byte[] key = new byte[]{type.code()}; session.increase(this.table(), CF, key, COL, increment); @@ -147,7 +145,7 @@ public class HbaseTables { } @Override - public void insert(Session session, BackendEntry entry) { + public void insert(HbaseSessions.Session session, BackendEntry entry) { long ttl = entry.ttl(); if (ttl == 0L) { session.put(this.table(), CF, entry.id().asBytes(), @@ -181,7 +179,7 @@ public class HbaseTables { } @Override - public void insert(Session session, BackendEntry entry) { + public void insert(HbaseSessions.Session session, BackendEntry entry) { long ttl = entry.ttl(); if (ttl == 0L) { session.put(this.table(), CF, entry.id().asBytes(), @@ -231,7 +229,7 @@ public class HbaseTables { } @Override - public void insert(Session session, BackendEntry entry) { + public void insert(HbaseSessions.Session session, BackendEntry entry) { assert entry.columns().size() == 1; BackendColumn col = entry.columns().iterator().next(); long ttl = entry.ttl(); @@ -245,14 +243,14 @@ public class HbaseTables { } @Override - public void eliminate(Session session, BackendEntry entry) { + public void eliminate(HbaseSessions.Session session, BackendEntry entry) { assert entry.columns().size() == 1; BackendColumn col = entry.columns().iterator().next(); session.delete(this.table(), CF, col.name); } @Override - public void delete(Session session, BackendEntry entry) { + public void delete(HbaseSessions.Session session, BackendEntry entry) { /* * Only delete index by label will come here * Regular index delete will call eliminate() @@ -261,7 +259,7 @@ public class HbaseTables { for (BackendColumn column : entry.columns()) { session.commit(); // Prefix query index label related indexes - RowIterator iter = session.scan(this.table(), column.name); + HbaseSessions.RowIterator iter = session.scan(this.table(), column.name); while (iter.hasNext()) { session.delete(this.table(), CF, iter.next().getRow()); // Commit once reaching batch size @@ -278,7 +276,7 @@ public class HbaseTables { @Override protected BackendEntryIterator newEntryIterator(Query query, - RowIterator rows) { + HbaseSessions.RowIterator rows) { return new BinaryEntryIterator<>(rows, query, (entry, row) -> { assert row.size() == 1; BackendColumn col = BackendColumn.of(row.getRow(), row.value()); diff --git a/hugegraph-mysql/pom.xml b/hugegraph-mysql/pom.xml index ee82b57d3..fa9186ed7 100644 --- a/hugegraph-mysql/pom.xml +++ b/hugegraph-mysql/pom.xml @@ -20,18 +20,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hugegraph - com.baidu.hugegraph - 0.13.0 + org.apache.hugegraph + ${revision} + ../pom.xml 4.0.0 hugegraph-mysql + + 1.0.0 + + - com.baidu.hugegraph + org.apache.hugegraph hugegraph-core - ${project.version} + ${hugegraph-core-version} mysql diff --git a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlBackendEntry.java b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlBackendEntry.java similarity index 85% rename from hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlBackendEntry.java rename to hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlBackendEntry.java index 2449a4dcc..89bc4d825 100644 --- a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlBackendEntry.java +++ b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlBackendEntry.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.mysql; +package org.apache.hugegraph.backend.store.mysql; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.serializer.TableBackendEntry; -import com.baidu.hugegraph.type.HugeType; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.serializer.TableBackendEntry; +import org.apache.hugegraph.type.HugeType; public class MysqlBackendEntry extends TableBackendEntry { diff --git a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlEntryIterator.java b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlEntryIterator.java similarity index 92% rename from hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlEntryIterator.java rename to hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlEntryIterator.java index 5966865b5..20be82308 100644 --- a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlEntryIterator.java +++ b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlEntryIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.mysql; +package org.apache.hugegraph.backend.store.mysql; import java.sql.ResultSet; import java.sql.ResultSetMetaData; @@ -26,16 +26,16 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.function.BiFunction; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.page.PageState; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntryIterator; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.page.PageState; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendEntryIterator; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.StringEncoding; public class MysqlEntryIterator extends BackendEntryIterator { diff --git a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlFeatures.java b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlFeatures.java similarity index 96% rename from hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlFeatures.java rename to hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlFeatures.java index e70111546..1f2e9df1b 100644 --- a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlFeatures.java +++ b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlFeatures.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.mysql; +package org.apache.hugegraph.backend.store.mysql; -import com.baidu.hugegraph.backend.store.BackendFeatures; +import org.apache.hugegraph.backend.store.BackendFeatures; public class MysqlFeatures implements BackendFeatures { diff --git a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlMetrics.java b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlMetrics.java similarity index 90% rename from hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlMetrics.java rename to hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlMetrics.java index 65d6b0429..6f9471fdf 100644 --- a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlMetrics.java +++ b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlMetrics.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.mysql; +package org.apache.hugegraph.backend.store.mysql; import java.util.Map; -import com.baidu.hugegraph.backend.store.BackendMetrics; +import org.apache.hugegraph.backend.store.BackendMetrics; import com.google.common.collect.ImmutableMap; public class MysqlMetrics implements BackendMetrics { diff --git a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlOptions.java b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlOptions.java similarity index 93% rename from hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlOptions.java rename to hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlOptions.java index e1643f768..6ddf6e81e 100644 --- a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlOptions.java +++ b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlOptions.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.mysql; +package org.apache.hugegraph.backend.store.mysql; -import static com.baidu.hugegraph.config.OptionChecker.disallowEmpty; -import static com.baidu.hugegraph.config.OptionChecker.rangeInt; +import static org.apache.hugegraph.config.OptionChecker.disallowEmpty; +import static org.apache.hugegraph.config.OptionChecker.rangeInt; -import com.baidu.hugegraph.config.ConfigOption; -import com.baidu.hugegraph.config.OptionHolder; +import org.apache.hugegraph.config.ConfigOption; +import org.apache.hugegraph.config.OptionHolder; public class MysqlOptions extends OptionHolder { diff --git a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlSerializer.java b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlSerializer.java similarity index 87% rename from hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlSerializer.java rename to hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlSerializer.java index 8ab82eae0..e9ba6efd4 100644 --- a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlSerializer.java +++ b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlSerializer.java @@ -17,30 +17,30 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.mysql; +package org.apache.hugegraph.backend.store.mysql; import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Set; -import com.baidu.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.HugeConfig; import org.apache.commons.lang.NotImplementedException; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.serializer.TableBackendEntry; -import com.baidu.hugegraph.backend.serializer.TableSerializer; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.structure.HugeProperty; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.serializer.TableBackendEntry; +import org.apache.hugegraph.backend.serializer.TableSerializer; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.structure.HugeProperty; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.JsonUtil; public class MysqlSerializer extends TableSerializer { diff --git a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlSessions.java b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlSessions.java similarity index 97% rename from hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlSessions.java rename to hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlSessions.java index 83c689b14..840450b1f 100644 --- a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlSessions.java +++ b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlSessions.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.mysql; +package org.apache.hugegraph.backend.store.mysql; import java.net.SocketTimeoutException; import java.net.URISyntaxException; @@ -35,12 +35,12 @@ import org.apache.http.client.utils.URIBuilder; import org.apache.logging.log4j.util.Strings; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.store.BackendSession.AbstractBackendSession; -import com.baidu.hugegraph.backend.store.BackendSessionPool; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.store.BackendSession.AbstractBackendSession; +import org.apache.hugegraph.backend.store.BackendSessionPool; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; public class MysqlSessions extends BackendSessionPool { diff --git a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlStore.java b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlStore.java similarity index 94% rename from hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlStore.java rename to hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlStore.java index 90318c8db..72777a90c 100644 --- a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlStore.java +++ b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlStore.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.mysql; +package org.apache.hugegraph.backend.store.mysql; import java.sql.SQLException; import java.util.ArrayList; @@ -29,21 +29,21 @@ import java.util.concurrent.ConcurrentHashMap; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.AbstractBackendStore; -import com.baidu.hugegraph.backend.store.BackendAction; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendFeatures; -import com.baidu.hugegraph.backend.store.BackendMutation; -import com.baidu.hugegraph.backend.store.BackendStoreProvider; -import com.baidu.hugegraph.backend.store.mysql.MysqlSessions.Session; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.exception.ConnectionException; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.AbstractBackendStore; +import org.apache.hugegraph.backend.store.BackendAction; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendFeatures; +import org.apache.hugegraph.backend.store.BackendMutation; +import org.apache.hugegraph.backend.store.BackendStoreProvider; +import org.apache.hugegraph.backend.store.mysql.MysqlSessions.Session; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.exception.ConnectionException; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; public abstract class MysqlStore extends AbstractBackendStore { diff --git a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlStoreProvider.java b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlStoreProvider.java similarity index 85% rename from hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlStoreProvider.java rename to hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlStoreProvider.java index 511c3d10d..ee70047ce 100644 --- a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlStoreProvider.java +++ b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlStoreProvider.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.mysql; +package org.apache.hugegraph.backend.store.mysql; -import com.baidu.hugegraph.backend.store.AbstractBackendStoreProvider; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.store.mysql.MysqlStore.MysqlGraphStore; -import com.baidu.hugegraph.backend.store.mysql.MysqlStore.MysqlSchemaStore; -import com.baidu.hugegraph.backend.store.mysql.MysqlStore.MysqlSystemStore; -import com.baidu.hugegraph.config.HugeConfig; +import org.apache.hugegraph.backend.store.AbstractBackendStoreProvider; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.backend.store.mysql.MysqlStore.MysqlGraphStore; +import org.apache.hugegraph.backend.store.mysql.MysqlStore.MysqlSchemaStore; +import org.apache.hugegraph.backend.store.mysql.MysqlStore.MysqlSystemStore; +import org.apache.hugegraph.config.HugeConfig; public class MysqlStoreProvider extends AbstractBackendStoreProvider { diff --git a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlTable.java b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlTable.java similarity index 90% rename from hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlTable.java rename to hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlTable.java index 3417ee21a..98e0ddcc3 100644 --- a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlTable.java +++ b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlTable.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.mysql; +package org.apache.hugegraph.backend.store.mysql; import java.math.BigDecimal; import java.sql.PreparedStatement; @@ -33,31 +33,29 @@ import org.apache.logging.log4j.util.Strings; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.page.PageState; -import com.baidu.hugegraph.backend.query.Aggregate; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.IdQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendTable; -import com.baidu.hugegraph.backend.store.Shard; -import com.baidu.hugegraph.backend.store.TableDefine; -import com.baidu.hugegraph.backend.store.mysql.MysqlEntryIterator.PagePosition; -import com.baidu.hugegraph.backend.store.mysql.MysqlSessions.Session; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.iterator.ExtendableIterator; -import com.baidu.hugegraph.iterator.WrappedIterator; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.page.PageState; +import org.apache.hugegraph.backend.query.Aggregate; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.IdQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendTable; +import org.apache.hugegraph.backend.store.Shard; +import org.apache.hugegraph.backend.store.TableDefine; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.iterator.ExtendableIterator; +import org.apache.hugegraph.iterator.WrappedIterator; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.google.common.collect.ImmutableList; public abstract class MysqlTable - extends BackendTable { + extends BackendTable { private static final Logger LOG = Log.logger(MysqlTable.class); @@ -96,20 +94,20 @@ public abstract class MysqlTable public abstract TableDefine tableDefine(); @Override - public void init(Session session) { + public void init(MysqlSessions.Session session) { this.createTable(session, this.tableDefine()); } @Override - public void clear(Session session) { + public void clear(MysqlSessions.Session session) { this.dropTable(session); } - public void truncate(Session session) { + public void truncate(MysqlSessions.Session session) { this.truncateTable(session); } - protected void createTable(Session session, TableDefine tableDefine) { + protected void createTable(MysqlSessions.Session session, TableDefine tableDefine) { StringBuilder sql = new StringBuilder(); sql.append("CREATE TABLE IF NOT EXISTS "); sql.append(this.table()).append(" ("); @@ -144,12 +142,12 @@ public abstract class MysqlTable } } - protected String engine(Session session) { + protected String engine(MysqlSessions.Session session) { String engine = session.config().get(MysqlOptions.JDBC_STORAGE_ENGINE); return " ENGINE=" + engine; } - protected void dropTable(Session session) { + protected void dropTable(MysqlSessions.Session session) { LOG.debug("Drop table: {}", this.table()); String sql = this.buildDropTemplate(); try { @@ -160,7 +158,7 @@ public abstract class MysqlTable } } - protected void truncateTable(Session session) { + protected void truncateTable(MysqlSessions.Session session) { LOG.debug("Truncate table: {}", this.table()); String sql = this.buildTruncateTemplate(); try { @@ -183,7 +181,7 @@ public abstract class MysqlTable return ImmutableList.of(id.asObject()); } - protected void insertOrUpdate(Session session, String template, + protected void insertOrUpdate(MysqlSessions.Session session, String template, List params) { PreparedStatement insertStmt; try { @@ -349,14 +347,14 @@ public abstract class MysqlTable * Insert an entire row */ @Override - public void insert(Session session, MysqlBackendEntry.Row entry) { + public void insert(MysqlSessions.Session session, MysqlBackendEntry.Row entry) { String template = this.buildUpdateTemplate(entry); List params = this.buildUpdateForcedParams(entry); this.insertOrUpdate(session, template, params); } @Override - public void delete(Session session, MysqlBackendEntry.Row entry) { + public void delete(MysqlSessions.Session session, MysqlBackendEntry.Row entry) { List idNames = this.idColumnName(); String template = this.deleteTemplate; @@ -394,17 +392,17 @@ public abstract class MysqlTable } @Override - public void append(Session session, MysqlBackendEntry.Row entry) { + public void append(MysqlSessions.Session session, MysqlBackendEntry.Row entry) { this.insert(session, entry); } @Override - public void eliminate(Session session, MysqlBackendEntry.Row entry) { + public void eliminate(MysqlSessions.Session session, MysqlBackendEntry.Row entry) { this.delete(session, entry); } @Override - public void updateIfPresent(Session session, MysqlBackendEntry.Row entry) { + public void updateIfPresent(MysqlSessions.Session session, MysqlBackendEntry.Row entry) { String template = this.updateIfPresentTemplate; if (template == null) { template = this.buildUpdateIfPresentTemplate(entry); @@ -415,7 +413,7 @@ public abstract class MysqlTable } @Override - public void updateIfAbsent(Session session, MysqlBackendEntry.Row entry) { + public void updateIfAbsent(MysqlSessions.Session session, MysqlBackendEntry.Row entry) { String template = this.updateIfAbsentTemplate; if (template == null) { template = this.buildUpdateIfAbsentTemplate(entry); @@ -426,7 +424,7 @@ public abstract class MysqlTable } @Override - public boolean queryExist(Session session, MysqlBackendEntry.Row entry) { + public boolean queryExist(MysqlSessions.Session session, MysqlBackendEntry.Row entry) { Query query = new IdQuery.OneIdQuery(HugeType.UNKNOWN, entry.id()); Iterator iter = this.query(session, query); try { @@ -437,7 +435,7 @@ public abstract class MysqlTable } @Override - public Number queryNumber(Session session, Query query) { + public Number queryNumber(MysqlSessions.Session session, Query query) { Aggregate aggregate = query.aggregateNotNull(); Iterator results = this.query(session, query, (q, rs) -> { @@ -456,11 +454,11 @@ public abstract class MysqlTable } @Override - public Iterator query(Session session, Query query) { + public Iterator query(MysqlSessions.Session session, Query query) { return this.query(session, query, this::results2Entries); } - protected Iterator query(Session session, Query query, + protected Iterator query(MysqlSessions.Session session, Query query, BiFunction> parser) { ExtendableIterator rs = new ExtendableIterator<>(); @@ -739,7 +737,7 @@ public abstract class MysqlTable // It's the first time if page is empty if (!page.isEmpty()) { byte[] position = PageState.fromString(page).position(); - Map columns = PagePosition.fromBytes(position) + Map columns = MysqlEntryIterator.PagePosition.fromBytes(position) .columns(); List idColumnNames = this.idColumnName(); @@ -812,7 +810,7 @@ public abstract class MysqlTable return names; } - private static class MysqlShardSplitter extends ShardSplitter { + private static class MysqlShardSplitter extends ShardSplitter { private static final String BASE64 = "0123456789=?ABCDEFGHIJKLMNOPQRSTUVWXYZ" + @@ -824,7 +822,7 @@ public abstract class MysqlTable } @Override - public List getSplits(Session session, long splitSize) { + public List getSplits(MysqlSessions.Session session, long splitSize) { E.checkArgument(splitSize >= MIN_SHARD_SIZE, "The split-size must be >= %s bytes, but got %s", MIN_SHARD_SIZE, splitSize); @@ -839,12 +837,12 @@ public abstract class MysqlTable } @Override - protected long estimateDataSize(Session session) { + protected long estimateDataSize(MysqlSessions.Session session) { return 0L; } @Override - protected long estimateNumKeys(Session session) { + protected long estimateNumKeys(MysqlSessions.Session session) { return 0L; } } diff --git a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlTables.java b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlTables.java similarity index 95% rename from hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlTables.java rename to hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlTables.java index 03b14986b..97821b2b5 100644 --- a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlTables.java +++ b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlTables.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.mysql; +package org.apache.hugegraph.backend.store.mysql; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -27,20 +27,19 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.EdgeId; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.id.IdUtil; -import com.baidu.hugegraph.backend.id.SplicingIdGenerator; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntryIterator; -import com.baidu.hugegraph.backend.store.TableDefine; -import com.baidu.hugegraph.backend.store.mysql.MysqlSessions.Session; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.EdgeId; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.id.IdUtil; +import org.apache.hugegraph.backend.id.SplicingIdGenerator; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendEntryIterator; +import org.apache.hugegraph.backend.store.TableDefine; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableMap; public class MysqlTables { @@ -101,7 +100,7 @@ public class MysqlTables { this.define.keys(HugeKeys.NAME); } - public void writeVersion(Session session, String driverVersion) { + public void writeVersion(MysqlSessions.Session session, String driverVersion) { String versionColumn = formatKey(HugeKeys.VERSION); String insert = String.format("INSERT IGNORE INTO %s VALUES " + "('%s', '%s')", this.table(), @@ -114,7 +113,7 @@ public class MysqlTables { } } - public String readVersion(Session session) { + public String readVersion(MysqlSessions.Session session) { String select = String.format("SELECT %s FROM %s WHERE %s = '%s'", formatKey(HugeKeys.VALUE), this.table(), formatKey(HugeKeys.NAME), @@ -149,7 +148,7 @@ public class MysqlTables { this.define.keys(HugeKeys.SCHEMA_TYPE); } - public long getCounter(Session session, HugeType type) { + public long getCounter(MysqlSessions.Session session, HugeType type) { String schemaCol = formatKey(HugeKeys.SCHEMA_TYPE); String idCol = formatKey(HugeKeys.ID); @@ -169,7 +168,7 @@ public class MysqlTables { } } - public void increaseCounter(Session session, + public void increaseCounter(MysqlSessions.Session session, HugeType type, long increment) { String update = String.format( "INSERT INTO %s VALUES ('%s', %s) " + @@ -373,7 +372,7 @@ public class MysqlTables { } @Override - public void delete(Session session, MysqlBackendEntry.Row entry) { + public void delete(MysqlSessions.Session session, MysqlBackendEntry.Row entry) { // Let super class do delete if not deleting edge by label List idParts = this.idColumnValue(entry.id()); if (idParts.size() > 1 || entry.columns().size() > 0) { @@ -385,7 +384,7 @@ public class MysqlTables { this.deleteEdgesByLabel(session, entry.id()); } - private void deleteEdgesByLabel(Session session, Id label) { + private void deleteEdgesByLabel(MysqlSessions.Session session, Id label) { PreparedStatement deleteStmt; try { // Create or get delete prepare statement diff --git a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlUtil.java b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlUtil.java similarity index 98% rename from hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlUtil.java rename to hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlUtil.java index 4ef6c950f..e0f30f2bb 100644 --- a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlUtil.java +++ b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/MysqlUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.mysql; +package org.apache.hugegraph.backend.store.mysql; public class MysqlUtil { diff --git a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/ResultSetWrapper.java b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/ResultSetWrapper.java similarity index 94% rename from hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/ResultSetWrapper.java rename to hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/ResultSetWrapper.java index b472f2cad..fd888d467 100644 --- a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/ResultSetWrapper.java +++ b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/ResultSetWrapper.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.mysql; +package org.apache.hugegraph.backend.store.mysql; -import com.baidu.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.BackendException; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/WhereBuilder.java b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/WhereBuilder.java similarity index 97% rename from hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/WhereBuilder.java rename to hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/WhereBuilder.java index 24dd11b8b..4498db8db 100644 --- a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/WhereBuilder.java +++ b/hugegraph-mysql/src/main/java/org/apache/hugegraph/backend/store/mysql/WhereBuilder.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.mysql; +package org.apache.hugegraph.backend.store.mysql; import java.util.List; -import com.baidu.hugegraph.backend.query.Condition.RelationType; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.query.Condition.RelationType; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.util.E; public class WhereBuilder { diff --git a/hugegraph-palo/pom.xml b/hugegraph-palo/pom.xml index 09e36e1cc..57b973723 100644 --- a/hugegraph-palo/pom.xml +++ b/hugegraph-palo/pom.xml @@ -20,23 +20,29 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hugegraph - com.baidu.hugegraph - 0.13.0 + org.apache.hugegraph + ${revision} + ../pom.xml 4.0.0 hugegraph-palo + + 1.0.0 + 1.0.0 + + - com.baidu.hugegraph + org.apache.hugegraph hugegraph-core - ${project.version} + ${hugegraph-core-version} - com.baidu.hugegraph + org.apache.hugegraph hugegraph-mysql - ${project.version} + ${hugegraph-mysql-version} diff --git a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloFeatures.java b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloFeatures.java similarity index 96% rename from hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloFeatures.java rename to hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloFeatures.java index 01719bf87..97018dd7c 100644 --- a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloFeatures.java +++ b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloFeatures.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.palo; +package org.apache.hugegraph.backend.store.palo; -import com.baidu.hugegraph.backend.store.BackendFeatures; +import org.apache.hugegraph.backend.store.BackendFeatures; public class PaloFeatures implements BackendFeatures { diff --git a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloFile.java b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloFile.java similarity index 97% rename from hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloFile.java rename to hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloFile.java index 05edbc735..4060b43e4 100644 --- a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloFile.java +++ b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloFile.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.palo; +package org.apache.hugegraph.backend.store.palo; import java.io.File; import java.io.IOException; @@ -30,9 +30,9 @@ import java.util.Set; import org.apache.commons.io.FileUtils; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.util.E; import com.google.common.base.Charsets; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloHttpClient.java b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloHttpClient.java similarity index 93% rename from hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloHttpClient.java rename to hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloHttpClient.java index 38d696da3..54e7e11f3 100644 --- a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloHttpClient.java +++ b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloHttpClient.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.palo; +package org.apache.hugegraph.backend.store.palo; import java.util.Map; @@ -25,9 +25,9 @@ import jakarta.ws.rs.core.MultivaluedHashMap; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.rest.AbstractRestClient; -import com.baidu.hugegraph.rest.RestClient; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.rest.AbstractRestClient; +import org.apache.hugegraph.rest.RestClient; import com.google.common.collect.ImmutableMap; public class PaloHttpClient { diff --git a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloLoadInfo.java b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloLoadInfo.java similarity index 99% rename from hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloLoadInfo.java rename to hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloLoadInfo.java index a6701169c..98488b787 100644 --- a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloLoadInfo.java +++ b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloLoadInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.palo; +package org.apache.hugegraph.backend.store.palo; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloOptions.java b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloOptions.java similarity index 89% rename from hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloOptions.java rename to hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloOptions.java index 7fcd53daa..5eeac4c67 100644 --- a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloOptions.java +++ b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloOptions.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.palo; +package org.apache.hugegraph.backend.store.palo; -import static com.baidu.hugegraph.config.OptionChecker.disallowEmpty; -import static com.baidu.hugegraph.config.OptionChecker.nonNegativeInt; -import static com.baidu.hugegraph.config.OptionChecker.positiveInt; -import static com.baidu.hugegraph.config.OptionChecker.rangeInt; +import static org.apache.hugegraph.config.OptionChecker.disallowEmpty; +import static org.apache.hugegraph.config.OptionChecker.nonNegativeInt; +import static org.apache.hugegraph.config.OptionChecker.positiveInt; +import static org.apache.hugegraph.config.OptionChecker.rangeInt; -import com.baidu.hugegraph.config.ConfigOption; -import com.baidu.hugegraph.config.OptionHolder; +import org.apache.hugegraph.config.ConfigOption; +import org.apache.hugegraph.config.OptionHolder; public class PaloOptions extends OptionHolder { diff --git a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloSerializer.java b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloSerializer.java similarity index 82% rename from hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloSerializer.java rename to hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloSerializer.java index d97c95f99..5fe98f5ce 100644 --- a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloSerializer.java +++ b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloSerializer.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.palo; +package org.apache.hugegraph.backend.store.palo; -import com.baidu.hugegraph.backend.serializer.TableBackendEntry; -import com.baidu.hugegraph.backend.store.mysql.MysqlSerializer; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.schema.SchemaLabel; -import com.baidu.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.backend.serializer.TableBackendEntry; +import org.apache.hugegraph.backend.store.mysql.MysqlSerializer; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.schema.SchemaLabel; +import org.apache.hugegraph.type.define.HugeKeys; public class PaloSerializer extends MysqlSerializer { diff --git a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloSessions.java b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloSessions.java similarity index 96% rename from hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloSessions.java rename to hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloSessions.java index 5a021d95c..1ee79a7cb 100644 --- a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloSessions.java +++ b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloSessions.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.palo; +package org.apache.hugegraph.backend.store.palo; import java.nio.file.Paths; import java.sql.ResultSet; @@ -36,14 +36,14 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import com.baidu.hugegraph.backend.store.mysql.ResultSetWrapper; +import org.apache.hugegraph.backend.store.mysql.ResultSetWrapper; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.store.mysql.MysqlSessions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.date.SafeDateFormat; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.store.mysql.MysqlSessions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.date.SafeDateFormat; +import org.apache.hugegraph.util.Log; import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.Multimap; diff --git a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloStore.java b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloStore.java similarity index 83% rename from hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloStore.java rename to hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloStore.java index 04bde0acb..ef93d73ad 100644 --- a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloStore.java +++ b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloStore.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.palo; +package org.apache.hugegraph.backend.store.palo; import java.util.List; import java.util.stream.Collectors; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.store.BackendStoreProvider; -import com.baidu.hugegraph.backend.store.BackendTable; -import com.baidu.hugegraph.backend.store.mysql.MysqlStore; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.store.BackendStoreProvider; +import org.apache.hugegraph.backend.store.BackendTable; +import org.apache.hugegraph.backend.store.mysql.MysqlStore; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.util.Log; public abstract class PaloStore extends MysqlStore { diff --git a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloStoreProvider.java b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloStoreProvider.java similarity index 92% rename from hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloStoreProvider.java rename to hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloStoreProvider.java index fe08261c4..5ca5f5dfa 100644 --- a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloStoreProvider.java +++ b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloStoreProvider.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.palo; +package org.apache.hugegraph.backend.store.palo; -import com.baidu.hugegraph.backend.LocalCounter; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.store.BackendFeatures; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.store.BackendStoreProvider; -import com.baidu.hugegraph.backend.store.mysql.MysqlStoreProvider; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Directions; +import org.apache.hugegraph.backend.LocalCounter; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.store.BackendFeatures; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.backend.store.BackendStoreProvider; +import org.apache.hugegraph.backend.store.mysql.MysqlStoreProvider; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Directions; public class PaloStoreProvider extends MysqlStoreProvider { diff --git a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloTable.java b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloTable.java similarity index 89% rename from hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloTable.java rename to hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloTable.java index 16721a6f0..f8a73fba7 100644 --- a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloTable.java +++ b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloTable.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.palo; +package org.apache.hugegraph.backend.store.palo; import java.sql.SQLException; import java.util.ArrayList; @@ -28,13 +28,13 @@ import java.util.Set; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.store.TableDefine; -import com.baidu.hugegraph.backend.store.mysql.MysqlBackendEntry; -import com.baidu.hugegraph.backend.store.mysql.MysqlSessions; -import com.baidu.hugegraph.backend.store.mysql.MysqlTable; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.store.TableDefine; +import org.apache.hugegraph.backend.store.mysql.MysqlBackendEntry; +import org.apache.hugegraph.backend.store.mysql.MysqlSessions; +import org.apache.hugegraph.backend.store.mysql.MysqlTable; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.Log; public abstract class PaloTable extends MysqlTable { diff --git a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloTables.java b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloTables.java similarity index 95% rename from hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloTables.java rename to hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloTables.java index c79ed7100..66b8f26b4 100644 --- a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloTables.java +++ b/hugegraph-palo/src/main/java/org/apache/hugegraph/backend/store/palo/PaloTables.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.palo; +package org.apache.hugegraph.backend.store.palo; import java.sql.PreparedStatement; import java.sql.SQLException; @@ -25,22 +25,22 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.EdgeId; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.id.IdUtil; -import com.baidu.hugegraph.backend.id.SplicingIdGenerator; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntryIterator; -import com.baidu.hugegraph.backend.store.TableDefine; -import com.baidu.hugegraph.backend.store.mysql.MysqlBackendEntry; -import com.baidu.hugegraph.backend.store.mysql.MysqlSessions; -import com.baidu.hugegraph.backend.store.mysql.MysqlTables; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.EdgeId; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.id.IdUtil; +import org.apache.hugegraph.backend.id.SplicingIdGenerator; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendEntryIterator; +import org.apache.hugegraph.backend.store.TableDefine; +import org.apache.hugegraph.backend.store.mysql.MysqlBackendEntry; +import org.apache.hugegraph.backend.store.mysql.MysqlSessions; +import org.apache.hugegraph.backend.store.mysql.MysqlTables; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.E; public class PaloTables { diff --git a/hugegraph-postgresql/pom.xml b/hugegraph-postgresql/pom.xml index a0e22078b..185cf50e0 100644 --- a/hugegraph-postgresql/pom.xml +++ b/hugegraph-postgresql/pom.xml @@ -20,23 +20,29 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hugegraph - com.baidu.hugegraph - 0.13.0 + org.apache.hugegraph + ${revision} + ../pom.xml 4.0.0 hugegraph-postgresql + + 1.0.0 + 1.0.0 + + - com.baidu.hugegraph + org.apache.hugegraph hugegraph-core - ${project.version} + ${hugegraph-core-version} - com.baidu.hugegraph + org.apache.hugegraph hugegraph-mysql - ${project.version} + ${hugegraph-mysql-version} org.postgresql diff --git a/hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlOptions.java b/hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlOptions.java similarity index 87% rename from hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlOptions.java rename to hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlOptions.java index c2f004941..372284377 100644 --- a/hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlOptions.java +++ b/hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlOptions.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.postgresql; +package org.apache.hugegraph.backend.store.postgresql; -import static com.baidu.hugegraph.config.OptionChecker.disallowEmpty; +import static org.apache.hugegraph.config.OptionChecker.disallowEmpty; -import com.baidu.hugegraph.backend.store.mysql.MysqlOptions; -import com.baidu.hugegraph.config.ConfigOption; +import org.apache.hugegraph.backend.store.mysql.MysqlOptions; +import org.apache.hugegraph.config.ConfigOption; public class PostgresqlOptions extends MysqlOptions { diff --git a/hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlSerializer.java b/hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlSerializer.java similarity index 82% rename from hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlSerializer.java rename to hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlSerializer.java index e28b0936f..ace0631cb 100644 --- a/hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlSerializer.java +++ b/hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlSerializer.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.postgresql; +package org.apache.hugegraph.backend.store.postgresql; -import com.baidu.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.HugeConfig; import org.apache.logging.log4j.util.Strings; -import com.baidu.hugegraph.backend.id.IdUtil; -import com.baidu.hugegraph.backend.serializer.TableBackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.mysql.MysqlSerializer; -import com.baidu.hugegraph.structure.HugeIndex; -import com.baidu.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.backend.id.IdUtil; +import org.apache.hugegraph.backend.serializer.TableBackendEntry; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.mysql.MysqlSerializer; +import org.apache.hugegraph.structure.HugeIndex; +import org.apache.hugegraph.type.define.HugeKeys; public class PostgresqlSerializer extends MysqlSerializer { diff --git a/hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlSessions.java b/hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlSessions.java similarity index 94% rename from hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlSessions.java rename to hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlSessions.java index 4603b9dae..31804e05d 100644 --- a/hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlSessions.java +++ b/hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlSessions.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.postgresql; +package org.apache.hugegraph.backend.store.postgresql; import java.net.URISyntaxException; import java.sql.Connection; @@ -29,11 +29,11 @@ import org.postgresql.core.Utils; import org.postgresql.util.PSQLException; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.store.mysql.MysqlSessions; -import com.baidu.hugegraph.backend.store.mysql.MysqlUtil; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.store.mysql.MysqlSessions; +import org.apache.hugegraph.backend.store.mysql.MysqlUtil; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.util.Log; public class PostgresqlSessions extends MysqlSessions { diff --git a/hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlStore.java b/hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlStore.java similarity index 84% rename from hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlStore.java rename to hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlStore.java index 5bd11786a..114601d48 100644 --- a/hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlStore.java +++ b/hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlStore.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.postgresql; +package org.apache.hugegraph.backend.store.postgresql; -import com.baidu.hugegraph.backend.store.BackendStoreProvider; -import com.baidu.hugegraph.backend.store.mysql.MysqlStore; -import com.baidu.hugegraph.config.HugeConfig; +import org.apache.hugegraph.backend.store.BackendStoreProvider; +import org.apache.hugegraph.backend.store.mysql.MysqlStore; +import org.apache.hugegraph.config.HugeConfig; public abstract class PostgresqlStore extends MysqlStore { diff --git a/hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlStoreProvider.java b/hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlStoreProvider.java similarity index 93% rename from hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlStoreProvider.java rename to hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlStoreProvider.java index 13c40b817..ae8ec243e 100644 --- a/hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlStoreProvider.java +++ b/hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlStoreProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.postgresql; +package org.apache.hugegraph.backend.store.postgresql; import java.util.ArrayList; import java.util.Collection; @@ -25,16 +25,16 @@ import java.util.List; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.store.BackendStoreProvider; -import com.baidu.hugegraph.backend.store.mysql.MysqlSessions; -import com.baidu.hugegraph.backend.store.mysql.MysqlStoreProvider; -import com.baidu.hugegraph.backend.store.mysql.MysqlTable; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.backend.store.BackendStoreProvider; +import org.apache.hugegraph.backend.store.mysql.MysqlSessions; +import org.apache.hugegraph.backend.store.mysql.MysqlStoreProvider; +import org.apache.hugegraph.backend.store.mysql.MysqlTable; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.util.Log; public class PostgresqlStoreProvider extends MysqlStoreProvider { diff --git a/hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlTable.java b/hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlTable.java similarity index 92% rename from hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlTable.java rename to hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlTable.java index e3b0bea0b..3a1b5eb0f 100644 --- a/hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlTable.java +++ b/hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlTable.java @@ -17,19 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.postgresql; +package org.apache.hugegraph.backend.store.postgresql; import java.util.ArrayList; import java.util.List; import org.apache.logging.log4j.util.Strings; -import com.baidu.hugegraph.backend.serializer.TableBackendEntry.Row; -import com.baidu.hugegraph.backend.store.mysql.MysqlBackendEntry; -import com.baidu.hugegraph.backend.store.mysql.MysqlSessions.Session; -import com.baidu.hugegraph.backend.store.mysql.MysqlTable; -import com.baidu.hugegraph.backend.store.mysql.WhereBuilder; -import com.baidu.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.backend.serializer.TableBackendEntry.Row; +import org.apache.hugegraph.backend.store.mysql.MysqlBackendEntry; +import org.apache.hugegraph.backend.store.mysql.MysqlSessions.Session; +import org.apache.hugegraph.backend.store.mysql.MysqlTable; +import org.apache.hugegraph.backend.store.mysql.WhereBuilder; +import org.apache.hugegraph.type.define.HugeKeys; public abstract class PostgresqlTable extends MysqlTable { diff --git a/hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlTables.java b/hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlTables.java similarity index 87% rename from hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlTables.java rename to hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlTables.java index 6d9e83a04..33ce22bfb 100644 --- a/hugegraph-postgresql/src/main/java/com/baidu/hugegraph/backend/store/postgresql/PostgresqlTables.java +++ b/hugegraph-postgresql/src/main/java/org/apache/hugegraph/backend/store/postgresql/PostgresqlTables.java @@ -17,32 +17,32 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.postgresql; +package org.apache.hugegraph.backend.store.postgresql; -import static com.baidu.hugegraph.backend.store.mysql.MysqlTables.BOOLEAN; -import static com.baidu.hugegraph.backend.store.mysql.MysqlTables.HUGE_TEXT; -import static com.baidu.hugegraph.backend.store.mysql.MysqlTables.INT; -import static com.baidu.hugegraph.backend.store.mysql.MysqlTables.LARGE_TEXT; -import static com.baidu.hugegraph.backend.store.mysql.MysqlTables.MID_TEXT; -import static com.baidu.hugegraph.backend.store.mysql.MysqlTables.NUMERIC; -import static com.baidu.hugegraph.backend.store.mysql.MysqlTables.SMALL_TEXT; -import static com.baidu.hugegraph.backend.store.mysql.MysqlTables.TINYINT; +import static org.apache.hugegraph.backend.store.mysql.MysqlTables.BOOLEAN; +import static org.apache.hugegraph.backend.store.mysql.MysqlTables.HUGE_TEXT; +import static org.apache.hugegraph.backend.store.mysql.MysqlTables.INT; +import static org.apache.hugegraph.backend.store.mysql.MysqlTables.LARGE_TEXT; +import static org.apache.hugegraph.backend.store.mysql.MysqlTables.MID_TEXT; +import static org.apache.hugegraph.backend.store.mysql.MysqlTables.NUMERIC; +import static org.apache.hugegraph.backend.store.mysql.MysqlTables.SMALL_TEXT; +import static org.apache.hugegraph.backend.store.mysql.MysqlTables.TINYINT; import java.sql.SQLException; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.TableDefine; -import com.baidu.hugegraph.backend.store.mysql.MysqlBackendEntry; -import com.baidu.hugegraph.backend.store.mysql.MysqlSessions.Session; -import com.baidu.hugegraph.backend.store.mysql.MysqlTables; -import com.baidu.hugegraph.backend.store.mysql.MysqlTables.MysqlTableTemplate; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.TableDefine; +import org.apache.hugegraph.backend.store.mysql.MysqlBackendEntry; +import org.apache.hugegraph.backend.store.mysql.MysqlSessions.Session; +import org.apache.hugegraph.backend.store.mysql.MysqlTables; +import org.apache.hugegraph.backend.store.mysql.MysqlTables.MysqlTableTemplate; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.HugeKeys; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-rocksdb/pom.xml b/hugegraph-rocksdb/pom.xml index 70be091d4..2d330e061 100644 --- a/hugegraph-rocksdb/pom.xml +++ b/hugegraph-rocksdb/pom.xml @@ -20,18 +20,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hugegraph - com.baidu.hugegraph - 0.13.0 + org.apache.hugegraph + ${revision} + ../pom.xml 4.0.0 hugegraph-rocksdb + + 1.0.0 + + - com.baidu.hugegraph + org.apache.hugegraph hugegraph-core - ${project.version} + ${hugegraph-core-version} org.rocksdb diff --git a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/OpenedRocksDB.java b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/OpenedRocksDB.java similarity index 95% rename from hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/OpenedRocksDB.java rename to hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/OpenedRocksDB.java index dfa6893fb..bfd10b4c8 100644 --- a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/OpenedRocksDB.java +++ b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/OpenedRocksDB.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.rocksdb; +package org.apache.hugegraph.backend.store.rocksdb; import java.io.File; import java.io.IOException; @@ -35,10 +35,10 @@ import org.rocksdb.RocksDB; import org.rocksdb.SstFileManager; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBIteratorPool.ReusedRocksIterator; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.store.rocksdb.RocksDBIteratorPool.ReusedRocksIterator; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; public class OpenedRocksDB implements AutoCloseable { diff --git a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBFeatures.java b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBFeatures.java similarity index 96% rename from hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBFeatures.java rename to hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBFeatures.java index b933e7dd6..ed5057c74 100644 --- a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBFeatures.java +++ b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBFeatures.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.rocksdb; +package org.apache.hugegraph.backend.store.rocksdb; -import com.baidu.hugegraph.backend.store.BackendFeatures; +import org.apache.hugegraph.backend.store.BackendFeatures; public class RocksDBFeatures implements BackendFeatures { diff --git a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBIngester.java b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBIngester.java similarity index 95% rename from hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBIngester.java rename to hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBIngester.java index 64f41ee33..59bcef80d 100644 --- a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBIngester.java +++ b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBIngester.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.rocksdb; +package org.apache.hugegraph.backend.store.rocksdb; import java.io.File; import java.io.IOException; @@ -35,8 +35,8 @@ import org.rocksdb.RocksDB; import org.rocksdb.RocksDBException; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.util.Log; public class RocksDBIngester { diff --git a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBIteratorPool.java b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBIteratorPool.java similarity index 95% rename from hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBIteratorPool.java rename to hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBIteratorPool.java index 460412a44..40881d801 100644 --- a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBIteratorPool.java +++ b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBIteratorPool.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.rocksdb; +package org.apache.hugegraph.backend.store.rocksdb; import java.util.Queue; import java.util.concurrent.ArrayBlockingQueue; @@ -28,10 +28,10 @@ import org.rocksdb.RocksDBException; import org.rocksdb.RocksIterator; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.util.Log; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.util.Log; +import org.apache.hugegraph.util.StringEncoding; public final class RocksDBIteratorPool implements AutoCloseable { diff --git a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBMetrics.java b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBMetrics.java similarity index 97% rename from hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBMetrics.java rename to hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBMetrics.java index 1a7c0331e..03b7c81b4 100644 --- a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBMetrics.java +++ b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBMetrics.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.rocksdb; +package org.apache.hugegraph.backend.store.rocksdb; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.backend.store.BackendMetrics; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.UnitUtil; +import org.apache.hugegraph.backend.store.BackendMetrics; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.UnitUtil; import com.google.common.collect.ImmutableMap; public class RocksDBMetrics implements BackendMetrics { diff --git a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBOptions.java b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBOptions.java similarity index 97% rename from hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBOptions.java rename to hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBOptions.java index 0bd4667ff..8fe5c9dbe 100644 --- a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBOptions.java +++ b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBOptions.java @@ -17,25 +17,25 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.rocksdb; +package org.apache.hugegraph.backend.store.rocksdb; -import static com.baidu.hugegraph.config.OptionChecker.allowValues; -import static com.baidu.hugegraph.config.OptionChecker.disallowEmpty; -import static com.baidu.hugegraph.config.OptionChecker.inValues; -import static com.baidu.hugegraph.config.OptionChecker.rangeDouble; -import static com.baidu.hugegraph.config.OptionChecker.rangeInt; +import static org.apache.hugegraph.config.OptionChecker.allowValues; +import static org.apache.hugegraph.config.OptionChecker.disallowEmpty; +import static org.apache.hugegraph.config.OptionChecker.inValues; +import static org.apache.hugegraph.config.OptionChecker.rangeDouble; +import static org.apache.hugegraph.config.OptionChecker.rangeInt; import org.rocksdb.CompactionStyle; import org.rocksdb.CompressionType; import org.rocksdb.DataBlockIndexType; import org.rocksdb.IndexType; -import com.baidu.hugegraph.config.ConfigConvOption; -import com.baidu.hugegraph.config.ConfigListConvOption; -import com.baidu.hugegraph.config.ConfigListOption; -import com.baidu.hugegraph.config.ConfigOption; -import com.baidu.hugegraph.config.OptionHolder; -import com.baidu.hugegraph.util.Bytes; +import org.apache.hugegraph.config.ConfigConvOption; +import org.apache.hugegraph.config.ConfigListConvOption; +import org.apache.hugegraph.config.ConfigListOption; +import org.apache.hugegraph.config.ConfigOption; +import org.apache.hugegraph.config.OptionHolder; +import org.apache.hugegraph.util.Bytes; import com.google.common.collect.ImmutableList; public class RocksDBOptions extends OptionHolder { diff --git a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBSessions.java b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBSessions.java similarity index 93% rename from hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBSessions.java rename to hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBSessions.java index ad74bc6ab..0def8d98f 100644 --- a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBSessions.java +++ b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBSessions.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.rocksdb; +package org.apache.hugegraph.backend.store.rocksdb; import java.util.List; import java.util.Set; @@ -25,10 +25,10 @@ import java.util.Set; import org.apache.commons.lang3.tuple.Pair; import org.rocksdb.RocksDBException; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumnIterator; -import com.baidu.hugegraph.backend.store.BackendSession.AbstractBackendSession; -import com.baidu.hugegraph.backend.store.BackendSessionPool; -import com.baidu.hugegraph.config.HugeConfig; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumnIterator; +import org.apache.hugegraph.backend.store.BackendSession.AbstractBackendSession; +import org.apache.hugegraph.backend.store.BackendSessionPool; +import org.apache.hugegraph.config.HugeConfig; public abstract class RocksDBSessions extends BackendSessionPool { diff --git a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBStdSessions.java b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBStdSessions.java similarity index 95% rename from hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBStdSessions.java rename to hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBStdSessions.java index 81eb76836..c80fc5d20 100644 --- a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBStdSessions.java +++ b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBStdSessions.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.rocksdb; +package org.apache.hugegraph.backend.store.rocksdb; import java.io.File; import java.nio.file.Path; @@ -59,19 +59,18 @@ import org.rocksdb.WriteBatch; import org.rocksdb.WriteOptions; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.serializer.BinarySerializer; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumn; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumnIterator; -import com.baidu.hugegraph.backend.store.BackendEntryIterator; -import com.baidu.hugegraph.backend.store.rocksdb.OpenedRocksDB.CFHandle; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBIteratorPool.ReusedRocksIterator; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.serializer.BinarySerializer; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumn; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumnIterator; +import org.apache.hugegraph.backend.store.BackendEntryIterator; +import org.apache.hugegraph.backend.store.rocksdb.RocksDBIteratorPool.ReusedRocksIterator; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; +import org.apache.hugegraph.util.StringEncoding; import com.google.common.collect.ImmutableList; public class RocksDBStdSessions extends RocksDBSessions { @@ -162,7 +161,7 @@ public class RocksDBStdSessions extends RocksDBSessions { for (ColumnFamilyHandle cfh : cfhs) { String table = decode(cfh.getName()); - this.rocksdb.addCf(table, new CFHandle(this.rocksdb(), cfh)); + this.rocksdb.addCf(table, new OpenedRocksDB.CFHandle(this.rocksdb(), cfh)); } this.ingestExternalFile(); @@ -180,7 +179,7 @@ public class RocksDBStdSessions extends RocksDBSessions { */ List cfhs = new ArrayList<>(); for (String table : tables) { - CFHandle cfh = this.rocksdb.cf(table); + OpenedRocksDB.CFHandle cfh = this.rocksdb.cf(table); if (cfh == null) { continue; } @@ -194,7 +193,7 @@ public class RocksDBStdSessions extends RocksDBSessions { this.rocksdb().dropColumnFamilies(cfhs); for (String table : tables) { - CFHandle cfh = this.rocksdb.cf(table); + OpenedRocksDB.CFHandle cfh = this.rocksdb.cf(table); if (cfh == null) { continue; } @@ -233,7 +232,7 @@ public class RocksDBStdSessions extends RocksDBSessions { } List values = new ArrayList<>(); for (String cf : this.openedTables()) { - try (CFHandle cfh = this.cf(cf)) { + try (OpenedRocksDB.CFHandle cfh = this.cf(cf)) { values.add(this.rocksdb().getProperty(cfh.get(), property)); } } @@ -356,8 +355,8 @@ public class RocksDBStdSessions extends RocksDBSessions { return this.rocksdb.rocksdb(); } - private CFHandle cf(String cfName) { - CFHandle cfh = this.rocksdb.cf(cfName); + private OpenedRocksDB.CFHandle cf(String cfName) { + OpenedRocksDB.CFHandle cfh = this.rocksdb.cf(cfName); if (cfh == null) { throw new BackendException("Table '%s' is not opened", cfName); } @@ -375,7 +374,7 @@ public class RocksDBStdSessions extends RocksDBSessions { for (String cf : this.rocksdb.cfs()) { Path path = Paths.get(directory, cf); if (path.toFile().isDirectory()) { - try (CFHandle cfh = this.cf(cf)) { + try (OpenedRocksDB.CFHandle cfh = this.cf(cf)) { ingester.ingest(path, cfh.get()); } } @@ -397,7 +396,7 @@ public class RocksDBStdSessions extends RocksDBSessions { * Don't merge old CFs, we expect a clear DB when using this one */ RocksDB rocksdb = RocksDB.open(options, dataPath); - Map cfs = new ConcurrentHashMap<>(); + Map cfs = new ConcurrentHashMap<>(); return new OpenedRocksDB(rocksdb, cfs, sstFileManager); } @@ -436,9 +435,9 @@ public class RocksDBStdSessions extends RocksDBSessions { E.checkState(cfhs.size() == cfs.size(), "Expect same size of cf-handles and cf-names"); // Collect CF Handles - Map cfHandles = new ConcurrentHashMap<>(); + Map cfHandles = new ConcurrentHashMap<>(); for (int i = 0; i < cfs.size(); i++) { - cfHandles.put(cfs.get(i), new CFHandle(rocksdb, cfhs.get(i))); + cfHandles.put(cfs.get(i), new OpenedRocksDB.CFHandle(rocksdb, cfhs.get(i))); } return new OpenedRocksDB(rocksdb, cfHandles, sstFileManager); } @@ -818,7 +817,7 @@ public class RocksDBStdSessions extends RocksDBSessions { */ @Override public String property(String table, String property) { - try (CFHandle cf = cf(table)) { + try (OpenedRocksDB.CFHandle cf = cf(table)) { return rocksdb().getProperty(cf.get(), property); } catch (RocksDBException e) { throw new BackendException(e); @@ -829,7 +828,7 @@ public class RocksDBStdSessions extends RocksDBSessions { public Pair keyRange(String table) { byte[] startKey; byte[] endKey; - try (CFHandle cf = cf(table); + try (OpenedRocksDB.CFHandle cf = cf(table); RocksIterator iter = rocksdb().newIterator(cf.get())) { iter.seekToFirst(); if (!iter.isValid()) { @@ -847,7 +846,7 @@ public class RocksDBStdSessions extends RocksDBSessions { @Override public void compactRange(String table) { - try (CFHandle cf = cf(table)) { + try (OpenedRocksDB.CFHandle cf = cf(table)) { // Waits while compaction is performed on the background threads rocksdb().compactRange(cf.get()); } catch (RocksDBException e) { @@ -891,7 +890,7 @@ public class RocksDBStdSessions extends RocksDBSessions { */ @Override public void put(String table, byte[] key, byte[] value) { - try (CFHandle cf = cf(table)) { + try (OpenedRocksDB.CFHandle cf = cf(table)) { this.batch.put(cf.get(), key, value); } catch (RocksDBException e) { throw new BackendException(e); @@ -905,7 +904,7 @@ public class RocksDBStdSessions extends RocksDBSessions { */ @Override public void merge(String table, byte[] key, byte[] value) { - try (CFHandle cf = cf(table)) { + try (OpenedRocksDB.CFHandle cf = cf(table)) { this.batch.merge(cf.get(), key, value); } catch (RocksDBException e) { throw new BackendException(e); @@ -917,7 +916,7 @@ public class RocksDBStdSessions extends RocksDBSessions { */ @Override public void increase(String table, byte[] key, byte[] value) { - try (CFHandle cf = cf(table)) { + try (OpenedRocksDB.CFHandle cf = cf(table)) { rocksdb().merge(cf.get(), key, value); } catch (RocksDBException e) { throw new BackendException(e); @@ -929,7 +928,7 @@ public class RocksDBStdSessions extends RocksDBSessions { */ @Override public void delete(String table, byte[] key) { - try (CFHandle cf = cf(table)) { + try (OpenedRocksDB.CFHandle cf = cf(table)) { this.batch.delete(cf.get(), key); } catch (RocksDBException e) { throw new BackendException(e); @@ -942,7 +941,7 @@ public class RocksDBStdSessions extends RocksDBSessions { */ @Override public void deleteSingle(String table, byte[] key) { - try (CFHandle cf = cf(table)) { + try (OpenedRocksDB.CFHandle cf = cf(table)) { this.batch.singleDelete(cf.get(), key); } catch (RocksDBException e) { throw new BackendException(e); @@ -957,7 +956,7 @@ public class RocksDBStdSessions extends RocksDBSessions { byte[] keyFrom = key; byte[] keyTo = Arrays.copyOf(keyFrom, keyFrom.length); BinarySerializer.increaseOne(keyTo); - try (CFHandle cf = cf(table)) { + try (OpenedRocksDB.CFHandle cf = cf(table)) { this.batch.deleteRange(cf.get(), keyFrom, keyTo); } catch (RocksDBException e) { throw new BackendException(e); @@ -969,7 +968,7 @@ public class RocksDBStdSessions extends RocksDBSessions { */ @Override public void deleteRange(String table, byte[] keyFrom, byte[] keyTo) { - try (CFHandle cf = cf(table)) { + try (OpenedRocksDB.CFHandle cf = cf(table)) { this.batch.deleteRange(cf.get(), keyFrom, keyTo); } catch (RocksDBException e) { throw new BackendException(e); @@ -983,7 +982,7 @@ public class RocksDBStdSessions extends RocksDBSessions { public byte[] get(String table, byte[] key) { assert !this.hasChanges(); - try (CFHandle cf = cf(table)) { + try (OpenedRocksDB.CFHandle cf = cf(table)) { return rocksdb().get(cf.get(), key); } catch (RocksDBException e) { throw new BackendException(e); @@ -997,7 +996,7 @@ public class RocksDBStdSessions extends RocksDBSessions { public BackendColumnIterator get(String table, List keys) { assert !this.hasChanges(); - try (CFHandle cf = cf(table)) { + try (OpenedRocksDB.CFHandle cf = cf(table)) { // Fill ColumnFamilyHandle list List cfs = new ArrayList<>(keys.size()); ColumnFamilyHandle cfh = cf.get(); @@ -1023,7 +1022,7 @@ public class RocksDBStdSessions extends RocksDBSessions { @Override public BackendColumnIterator scan(String table) { assert !this.hasChanges(); - try (CFHandle cf = cf(table)) { + try (OpenedRocksDB.CFHandle cf = cf(table)) { ReusedRocksIterator iter = cf.newIterator(); return new ScanIterator(table, iter, null, null, SCAN_ANY); } @@ -1045,7 +1044,7 @@ public class RocksDBStdSessions extends RocksDBSessions { * options.setAutoPrefixMode(true); * options.setIterateUpperBound(prefix + 1); */ - try (CFHandle cf = cf(table)) { + try (OpenedRocksDB.CFHandle cf = cf(table)) { ReusedRocksIterator iter = cf.newIterator(); return new ScanIterator(table, iter, prefix, null, SCAN_PREFIX_BEGIN); @@ -1069,7 +1068,7 @@ public class RocksDBStdSessions extends RocksDBSessions { * options.setAutoPrefixMode(true); * options.setIterateUpperBound(keyTo); */ - try (CFHandle cf = cf(table)) { + try (OpenedRocksDB.CFHandle cf = cf(table)) { ReusedRocksIterator iter = cf.newIterator(); return new ScanIterator(table, iter, keyFrom, keyTo, scanType); } diff --git a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBStore.java b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBStore.java similarity index 95% rename from hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBStore.java rename to hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBStore.java index 7b6137203..05d44791f 100644 --- a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBStore.java +++ b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBStore.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.rocksdb; +package org.apache.hugegraph.backend.store.rocksdb; import java.io.IOException; import java.nio.file.Files; @@ -49,32 +49,31 @@ import org.apache.commons.io.FileUtils; import org.rocksdb.RocksDBException; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.serializer.MergeIterator; -import com.baidu.hugegraph.backend.store.AbstractBackendStore; -import com.baidu.hugegraph.backend.store.BackendAction; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendFeatures; -import com.baidu.hugegraph.backend.store.BackendMutation; -import com.baidu.hugegraph.backend.store.BackendSessionPool; -import com.baidu.hugegraph.backend.store.BackendStoreProvider; -import com.baidu.hugegraph.backend.store.BackendTable; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBSessions.Session; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.exception.ConnectionException; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.Consumers; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.ExecutorUtil; -import com.baidu.hugegraph.util.InsertionOrderUtil; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.serializer.MergeIterator; +import org.apache.hugegraph.backend.store.AbstractBackendStore; +import org.apache.hugegraph.backend.store.BackendAction; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendFeatures; +import org.apache.hugegraph.backend.store.BackendMutation; +import org.apache.hugegraph.backend.store.BackendSessionPool; +import org.apache.hugegraph.backend.store.BackendStoreProvider; +import org.apache.hugegraph.backend.store.BackendTable; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.exception.ConnectionException; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.Consumers; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.ExecutorUtil; +import org.apache.hugegraph.util.InsertionOrderUtil; +import org.apache.hugegraph.util.Log; import com.google.common.collect.ImmutableList; -public abstract class RocksDBStore extends AbstractBackendStore { +public abstract class RocksDBStore extends AbstractBackendStore { private static final Logger LOG = Log.logger(RocksDBStore.class); @@ -443,7 +442,7 @@ public abstract class RocksDBStore extends AbstractBackendStore { } for (HugeType type : mutation.types()) { - Session session = this.session(type); + RocksDBSessions.Session session = this.session(type); for (Iterator it = mutation.mutation(type); it.hasNext();) { this.mutate(session, it.next()); @@ -454,7 +453,7 @@ public abstract class RocksDBStore extends AbstractBackendStore { } } - private void mutate(Session session, BackendAction item) { + private void mutate(RocksDBSessions.Session session, BackendAction item) { BackendEntry entry = item.entry(); RocksDBTable table; @@ -668,7 +667,7 @@ public abstract class RocksDBStore extends AbstractBackendStore { try { this.checkOpened(); - for (Session session : this.session()) { + for (RocksDBSessions.Session session : this.session()) { assert !session.hasChanges(); } } finally { @@ -683,7 +682,7 @@ public abstract class RocksDBStore extends AbstractBackendStore { try { this.checkOpened(); // Unable to guarantee atomicity when committing multi sessions - for (Session session : this.session()) { + for (RocksDBSessions.Session session : this.session()) { Object count = session.commit(); if (LOG.isDebugEnabled()) { LOG.debug("Store {} committed {} items", this.store, count); @@ -701,7 +700,7 @@ public abstract class RocksDBStore extends AbstractBackendStore { try { this.checkOpened(); - for (Session session : this.session()) { + for (RocksDBSessions.Session session : this.session()) { session.rollback(); } } finally { @@ -710,7 +709,7 @@ public abstract class RocksDBStore extends AbstractBackendStore { } @Override - protected Session session(HugeType tableType) { + protected RocksDBSessions.Session session(HugeType tableType) { this.checkOpened(); // Optimized disk @@ -804,7 +803,7 @@ public abstract class RocksDBStore extends AbstractBackendStore { } } - private List session() { + private List session() { this.checkOpened(); if (this.tableDiskMapping.isEmpty()) { @@ -812,7 +811,7 @@ public abstract class RocksDBStore extends AbstractBackendStore { } // Collect session of each table with optimized disk - List list = new ArrayList<>(this.tableDiskMapping.size() + 1); + List list = new ArrayList<>(this.tableDiskMapping.size() + 1); list.add(this.sessions.session()); for (String disk : this.tableDiskMapping.values()) { list.add(db(disk).session()); @@ -975,7 +974,7 @@ public abstract class RocksDBStore extends AbstractBackendStore { readLock.lock(); try { super.checkOpened(); - Session session = super.sessions.session(); + RocksDBSessions.Session session = super.sessions.session(); this.counters.increaseCounter(session, type, increment); } finally { readLock.unlock(); @@ -988,7 +987,7 @@ public abstract class RocksDBStore extends AbstractBackendStore { readLock.lock(); try { super.checkOpened(); - Session session = super.sessions.session(); + RocksDBSessions.Session session = super.sessions.session(); return this.counters.getCounter(session, type); } finally { readLock.unlock(); @@ -1132,7 +1131,7 @@ public abstract class RocksDBStore extends AbstractBackendStore { Lock writeLock = this.storeLock().writeLock(); writeLock.lock(); try { - Session session = super.session(HugeType.META); + RocksDBSessions.Session session = super.session(HugeType.META); String driverVersion = this.provider().driverVersion(); this.meta.writeVersion(session, driverVersion); LOG.info("Write down the backend version: {}", driverVersion); @@ -1147,7 +1146,7 @@ public abstract class RocksDBStore extends AbstractBackendStore { readLock.lock(); try { super.checkOpened(); - Session session = super.session(null); + RocksDBSessions.Session session = super.session(null); return this.meta.readVersion(session); } finally { readLock.unlock(); diff --git a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBStoreProvider.java b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBStoreProvider.java similarity index 82% rename from hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBStoreProvider.java rename to hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBStoreProvider.java index 35c0b5db2..b6e7fc617 100644 --- a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBStoreProvider.java +++ b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBStoreProvider.java @@ -17,17 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.rocksdb; +package org.apache.hugegraph.backend.store.rocksdb; import java.io.File; -import com.baidu.hugegraph.backend.store.AbstractBackendStoreProvider; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBStore.RocksDBGraphStore; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBStore.RocksDBSchemaStore; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBStore.RocksDBSystemStore; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.util.ConfigUtil; +import org.apache.hugegraph.backend.store.AbstractBackendStoreProvider; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.util.ConfigUtil; public class RocksDBStoreProvider extends AbstractBackendStoreProvider { @@ -37,12 +34,12 @@ public class RocksDBStoreProvider extends AbstractBackendStoreProvider { @Override protected BackendStore newSchemaStore(HugeConfig config, String store) { - return new RocksDBSchemaStore(this, this.database(), store); + return new RocksDBStore.RocksDBSchemaStore(this, this.database(), store); } @Override protected BackendStore newGraphStore(HugeConfig config, String store) { - return new RocksDBGraphStore(this, this.database(), store); + return new RocksDBStore.RocksDBGraphStore(this, this.database(), store); } @Override @@ -70,7 +67,7 @@ public class RocksDBStoreProvider extends AbstractBackendStoreProvider { @Override protected BackendStore newSystemStore(HugeConfig config, String store) { - return new RocksDBSystemStore(this, this.database(), store); + return new RocksDBStore.RocksDBSystemStore(this, this.database(), store); } @Override diff --git a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBTable.java b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBTable.java similarity index 72% rename from hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBTable.java rename to hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBTable.java index c173fac70..9bf03c183 100644 --- a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBTable.java +++ b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBTable.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.rocksdb; +package org.apache.hugegraph.backend.store.rocksdb; import java.util.ArrayList; import java.util.Collection; @@ -30,34 +30,32 @@ import org.apache.commons.lang3.tuple.Pair; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.page.PageState; -import com.baidu.hugegraph.backend.query.Aggregate; -import com.baidu.hugegraph.backend.query.Aggregate.AggregateFunc; -import com.baidu.hugegraph.backend.query.Condition.Relation; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.IdPrefixQuery; -import com.baidu.hugegraph.backend.query.IdRangeQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.serializer.BinaryBackendEntry; -import com.baidu.hugegraph.backend.serializer.BinaryEntryIterator; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumn; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumnIterator; -import com.baidu.hugegraph.backend.store.BackendEntryIterator; -import com.baidu.hugegraph.backend.store.BackendTable; -import com.baidu.hugegraph.backend.store.Shard; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBSessions.Countable; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBSessions.Session; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.iterator.FlatMapperIterator; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.page.PageState; +import org.apache.hugegraph.backend.query.Aggregate; +import org.apache.hugegraph.backend.query.Aggregate.AggregateFunc; +import org.apache.hugegraph.backend.query.Condition.Relation; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.IdPrefixQuery; +import org.apache.hugegraph.backend.query.IdRangeQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.serializer.BinaryBackendEntry; +import org.apache.hugegraph.backend.serializer.BinaryEntryIterator; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumn; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumnIterator; +import org.apache.hugegraph.backend.store.BackendEntryIterator; +import org.apache.hugegraph.backend.store.BackendTable; +import org.apache.hugegraph.backend.store.Shard; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.iterator.FlatMapperIterator; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; +import org.apache.hugegraph.util.StringEncoding; -public class RocksDBTable extends BackendTable { +public class RocksDBTable extends BackendTable { private static final Logger LOG = Log.logger(RocksDBTable.class); @@ -79,17 +77,17 @@ public class RocksDBTable extends BackendTable { } @Override - public void init(Session session) { + public void init(RocksDBSessions.Session session) { // pass } @Override - public void clear(Session session) { + public void clear(RocksDBSessions.Session session) { // pass } @Override - public void insert(Session session, BackendEntry entry) { + public void insert(RocksDBSessions.Session session, BackendEntry entry) { assert !entry.columns().isEmpty(); for (BackendColumn col : entry.columns()) { assert entry.belongToMe(col) : entry; @@ -98,7 +96,7 @@ public class RocksDBTable extends BackendTable { } @Override - public void delete(Session session, BackendEntry entry) { + public void delete(RocksDBSessions.Session session, BackendEntry entry) { if (entry.columns().isEmpty()) { session.delete(this.table(), entry.id().asBytes()); } else { @@ -110,19 +108,19 @@ public class RocksDBTable extends BackendTable { } @Override - public void append(Session session, BackendEntry entry) { + public void append(RocksDBSessions.Session session, BackendEntry entry) { assert entry.columns().size() == 1; this.insert(session, entry); } @Override - public void eliminate(Session session, BackendEntry entry) { + public void eliminate(RocksDBSessions.Session session, BackendEntry entry) { assert entry.columns().size() == 1; this.delete(session, entry); } @Override - public boolean queryExist(Session session, BackendEntry entry) { + public boolean queryExist(RocksDBSessions.Session session, BackendEntry entry) { Id id = entry.id(); try (BackendColumnIterator iter = this.queryById(session, id)) { return iter.hasNext(); @@ -130,7 +128,7 @@ public class RocksDBTable extends BackendTable { } @Override - public Number queryNumber(Session session, Query query) { + public Number queryNumber(RocksDBSessions.Session session, Query query) { Aggregate aggregate = query.aggregateNotNull(); if (aggregate.func() != AggregateFunc.COUNT) { throw new NotSupportException(aggregate.toString()); @@ -139,15 +137,15 @@ public class RocksDBTable extends BackendTable { assert aggregate.func() == AggregateFunc.COUNT; assert query.noLimit(); try (BackendColumnIterator results = this.queryBy(session, query)) { - if (results instanceof Countable) { - return ((Countable) results).count(); + if (results instanceof RocksDBSessions.Countable) { + return ((RocksDBSessions.Countable) results).count(); } return IteratorUtils.count(results); } } @Override - public Iterator query(Session session, Query query) { + public Iterator query(RocksDBSessions.Session session, Query query) { if (query.limit() == 0L && !query.noLimit()) { LOG.debug("Return empty result(limit=0) for query {}", query); return Collections.emptyIterator(); @@ -155,7 +153,7 @@ public class RocksDBTable extends BackendTable { return newEntryIterator(this.queryBy(session, query), query); } - protected BackendColumnIterator queryBy(Session session, Query query) { + protected BackendColumnIterator queryBy(RocksDBSessions.Session session, Query query) { // Query all if (query.empty()) { return this.queryAll(session, query); @@ -184,22 +182,22 @@ public class RocksDBTable extends BackendTable { return this.queryByCond(session, cq); } - protected BackendColumnIterator queryAll(Session session, Query query) { + protected BackendColumnIterator queryAll(RocksDBSessions.Session session, Query query) { if (query.paging()) { PageState page = PageState.fromString(query.page()); byte[] begin = page.position(); - return session.scan(this.table(), begin, null, Session.SCAN_ANY); + return session.scan(this.table(), begin, null, RocksDBSessions.Session.SCAN_ANY); } else { return session.scan(this.table()); } } - protected BackendColumnIterator queryById(Session session, Id id) { + protected BackendColumnIterator queryById(RocksDBSessions.Session session, Id id) { // TODO: change to get() after vertex and schema don't use id prefix return session.scan(this.table(), id.asBytes()); } - protected BackendColumnIterator queryByIds(Session session, + protected BackendColumnIterator queryByIds(RocksDBSessions.Session session, Collection ids) { if (ids.size() == 1) { return this.queryById(session, ids.iterator().next()); @@ -211,7 +209,7 @@ public class RocksDBTable extends BackendTable { )); } - protected BackendColumnIterator getById(Session session, Id id) { + protected BackendColumnIterator getById(RocksDBSessions.Session session, Id id) { byte[] value = session.get(this.table(), id.asBytes()); if (value == null) { return BackendColumnIterator.empty(); @@ -220,7 +218,7 @@ public class RocksDBTable extends BackendTable { return BackendColumnIterator.iterator(col); } - protected BackendColumnIterator getByIds(Session session, Set ids) { + protected BackendColumnIterator getByIds(RocksDBSessions.Session session, Set ids) { if (ids.size() == 1) { return this.getById(session, ids.iterator().next()); } @@ -232,29 +230,29 @@ public class RocksDBTable extends BackendTable { return session.get(this.table(), keys); } - protected BackendColumnIterator queryByPrefix(Session session, + protected BackendColumnIterator queryByPrefix(RocksDBSessions.Session session, IdPrefixQuery query) { int type = query.inclusiveStart() ? - Session.SCAN_GTE_BEGIN : Session.SCAN_GT_BEGIN; - type |= Session.SCAN_PREFIX_END; + RocksDBSessions.Session.SCAN_GTE_BEGIN : RocksDBSessions.Session.SCAN_GT_BEGIN; + type |= RocksDBSessions.Session.SCAN_PREFIX_END; return session.scan(this.table(), query.start().asBytes(), query.prefix().asBytes(), type); } - protected BackendColumnIterator queryByRange(Session session, + protected BackendColumnIterator queryByRange(RocksDBSessions.Session session, IdRangeQuery query) { byte[] start = query.start().asBytes(); byte[] end = query.end() == null ? null : query.end().asBytes(); int type = query.inclusiveStart() ? - Session.SCAN_GTE_BEGIN : Session.SCAN_GT_BEGIN; + RocksDBSessions.Session.SCAN_GTE_BEGIN : RocksDBSessions.Session.SCAN_GT_BEGIN; if (end != null) { type |= query.inclusiveEnd() ? - Session.SCAN_LTE_END : Session.SCAN_LT_END; + RocksDBSessions.Session.SCAN_LTE_END : RocksDBSessions.Session.SCAN_LT_END; } return session.scan(this.table(), start, end, type); } - protected BackendColumnIterator queryByCond(Session session, + protected BackendColumnIterator queryByCond(RocksDBSessions.Session session, ConditionQuery query) { if (query.containsScanRelation()) { E.checkArgument(query.relations().size() == 1, @@ -266,7 +264,7 @@ public class RocksDBTable extends BackendTable { throw new NotSupportException("query: %s", query); } - protected BackendColumnIterator queryByRange(Session session, Shard shard, + protected BackendColumnIterator queryByRange(RocksDBSessions.Session session, Shard shard, String page) { byte[] start = this.shardSplitter.position(shard.start()); byte[] end = this.shardSplitter.position(shard.end()); @@ -280,9 +278,9 @@ public class RocksDBTable extends BackendTable { if (start == null) { start = ShardSplitter.START_BYTES; } - int type = Session.SCAN_GTE_BEGIN; + int type = RocksDBSessions.Session.SCAN_GTE_BEGIN; if (end != null) { - type |= Session.SCAN_LT_END; + type |= RocksDBSessions.Session.SCAN_LT_END; } return session.scan(this.table(), start, end, type); } @@ -310,7 +308,7 @@ public class RocksDBTable extends BackendTable { return BinaryEntryIterator.sizeOfEntry(entry); } - private static class RocksDBShardSplitter extends ShardSplitter { + private static class RocksDBShardSplitter extends ShardSplitter { private static final String MEM_SIZE = "rocksdb.size-all-mem-tables"; private static final String SST_SIZE = "rocksdb.total-sst-files-size"; @@ -322,7 +320,7 @@ public class RocksDBTable extends BackendTable { } @Override - public List getSplits(Session session, long splitSize) { + public List getSplits(RocksDBSessions.Session session, long splitSize) { E.checkArgument(splitSize >= MIN_SHARD_SIZE, "The split-size must be >= %s bytes, but got %s", MIN_SHARD_SIZE, splitSize); @@ -350,14 +348,14 @@ public class RocksDBTable extends BackendTable { } @Override - public long estimateDataSize(Session session) { + public long estimateDataSize(RocksDBSessions.Session session) { long mem = Long.parseLong(session.property(this.table(), MEM_SIZE)); long sst = Long.parseLong(session.property(this.table(), SST_SIZE)); return mem + sst; } @Override - public long estimateNumKeys(Session session) { + public long estimateNumKeys(RocksDBSessions.Session session) { return Long.parseLong(session.property(this.table(), NUM_KEYS)); } diff --git a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBTables.java b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBTables.java similarity index 87% rename from hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBTables.java rename to hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBTables.java index 7d399dff1..f04f450cf 100644 --- a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdb/RocksDBTables.java +++ b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBTables.java @@ -17,25 +17,24 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.rocksdb; +package org.apache.hugegraph.backend.store.rocksdb; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.Collection; import java.util.List; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.Condition.Relation; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.serializer.BinarySerializer; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumnIterator; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBSessions.Session; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.Condition.Relation; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.serializer.BinarySerializer; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumnIterator; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.StringEncoding; public class RocksDBTables { @@ -47,7 +46,7 @@ public class RocksDBTables { super(database, TABLE); } - public void writeVersion(Session session, String version) { + public void writeVersion(RocksDBSessions.Session session, String version) { byte[] key = new byte[]{HugeKeys.VERSION.code()}; byte[] value = StringEncoding.encode(version); session.put(this.table(), key, value); @@ -59,7 +58,7 @@ public class RocksDBTables { } } - public String readVersion(Session session) { + public String readVersion(RocksDBSessions.Session session) { byte[] key = new byte[]{HugeKeys.VERSION.code()}; byte[] value = session.get(this.table(), key); if (value == null) { @@ -77,7 +76,7 @@ public class RocksDBTables { super(database, TABLE); } - public long getCounter(Session session, HugeType type) { + public long getCounter(RocksDBSessions.Session session, HugeType type) { byte[] key = new byte[]{type.code()}; byte[] value = session.get(this.table(), key); if (value != null) { @@ -87,7 +86,7 @@ public class RocksDBTables { } } - public void increaseCounter(Session session, HugeType type, + public void increaseCounter(RocksDBSessions.Session session, HugeType type, long increment) { byte[] key = new byte[]{type.code()}; session.increase(this.table(), key, toBytes(increment)); @@ -114,7 +113,7 @@ public class RocksDBTables { } @Override - public void delete(Session session, BackendEntry entry) { + public void delete(RocksDBSessions.Session session, BackendEntry entry) { assert entry.columns().isEmpty(); /* * Use `scanPrefix + delete` instead of `deletePrefix` due to @@ -179,12 +178,12 @@ public class RocksDBTables { } @Override - protected BackendColumnIterator queryById(Session session, Id id) { + protected BackendColumnIterator queryById(RocksDBSessions.Session session, Id id) { return this.getById(session, id); } @Override - protected BackendColumnIterator queryByIds(Session session, + protected BackendColumnIterator queryByIds(RocksDBSessions.Session session, Collection ids) { // TODO: use getByIds() after batch version multi-get is ready return super.queryByIds(session, ids); @@ -209,7 +208,7 @@ public class RocksDBTables { } @Override - protected BackendColumnIterator queryById(Session session, Id id) { + protected BackendColumnIterator queryById(RocksDBSessions.Session session, Id id) { return this.getById(session, id); } } @@ -221,13 +220,13 @@ public class RocksDBTables { } @Override - public void eliminate(Session session, BackendEntry entry) { + public void eliminate(RocksDBSessions.Session session, BackendEntry entry) { assert entry.columns().size() == 1; super.delete(session, entry); } @Override - public void delete(Session session, BackendEntry entry) { + public void delete(RocksDBSessions.Session session, BackendEntry entry) { /* * Only delete index by label will come here * Regular index delete will call eliminate() @@ -291,7 +290,7 @@ public class RocksDBTables { } @Override - protected BackendColumnIterator queryByCond(Session session, + protected BackendColumnIterator queryByCond(RocksDBSessions.Session session, ConditionQuery query) { assert query.conditionsSize() > 0; @@ -340,10 +339,10 @@ public class RocksDBTables { if (max == null) { E.checkArgumentNotNull(prefix, "Range index prefix is missing"); return session.scan(this.table(), begin, prefix.asBytes(), - Session.SCAN_PREFIX_END); + RocksDBSessions.Session.SCAN_PREFIX_END); } else { byte[] end = max.asBytes(); - int type = maxEq ? Session.SCAN_LTE_END : Session.SCAN_LT_END; + int type = maxEq ? RocksDBSessions.Session.SCAN_LTE_END : RocksDBSessions.Session.SCAN_LT_END; return session.scan(this.table(), begin, end, type); } } @@ -403,7 +402,7 @@ public class RocksDBTables { } @Override - protected BackendColumnIterator queryById(Session session, Id id) { + protected BackendColumnIterator queryById(RocksDBSessions.Session session, Id id) { return this.getById(session, id); } diff --git a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdbsst/RocksDBSstSessions.java b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdbsst/RocksDBSstSessions.java similarity index 96% rename from hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdbsst/RocksDBSstSessions.java rename to hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdbsst/RocksDBSstSessions.java index fc31b7e28..d2eecdf40 100644 --- a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdbsst/RocksDBSstSessions.java +++ b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdbsst/RocksDBSstSessions.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.rocksdbsst; +package org.apache.hugegraph.backend.store.rocksdbsst; import java.io.File; import java.io.IOException; @@ -38,14 +38,14 @@ import org.rocksdb.Options; import org.rocksdb.RocksDBException; import org.rocksdb.SstFileWriter; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumnIterator; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBIngester; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBSessions; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBStdSessions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumnIterator; +import org.apache.hugegraph.backend.store.rocksdb.RocksDBIngester; +import org.apache.hugegraph.backend.store.rocksdb.RocksDBSessions; +import org.apache.hugegraph.backend.store.rocksdb.RocksDBStdSessions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.util.E; public class RocksDBSstSessions extends RocksDBSessions { diff --git a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdbsst/RocksDBSstStore.java b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdbsst/RocksDBSstStore.java similarity index 91% rename from hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdbsst/RocksDBSstStore.java rename to hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdbsst/RocksDBSstStore.java index 8f7f0fad7..6d3a891aa 100644 --- a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdbsst/RocksDBSstStore.java +++ b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdbsst/RocksDBSstStore.java @@ -17,19 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.rocksdbsst; +package org.apache.hugegraph.backend.store.rocksdbsst; import java.util.List; import org.rocksdb.RocksDBException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.store.BackendStoreProvider; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBSessions; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBStore; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBTables; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.type.HugeType; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.store.BackendStoreProvider; +import org.apache.hugegraph.backend.store.rocksdb.RocksDBSessions; +import org.apache.hugegraph.backend.store.rocksdb.RocksDBStore; +import org.apache.hugegraph.backend.store.rocksdb.RocksDBTables; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.type.HugeType; public abstract class RocksDBSstStore extends RocksDBStore { diff --git a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdbsst/RocksDBSstStoreProvider.java b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdbsst/RocksDBSstStoreProvider.java similarity index 73% rename from hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdbsst/RocksDBSstStoreProvider.java rename to hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdbsst/RocksDBSstStoreProvider.java index 69fa0a193..50710a478 100644 --- a/hugegraph-rocksdb/src/main/java/com/baidu/hugegraph/backend/store/rocksdbsst/RocksDBSstStoreProvider.java +++ b/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdbsst/RocksDBSstStoreProvider.java @@ -17,18 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.rocksdbsst; +package org.apache.hugegraph.backend.store.rocksdbsst; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBStoreProvider; -import com.baidu.hugegraph.backend.store.rocksdbsst.RocksDBSstStore.RocksDBSstGraphStore; -import com.baidu.hugegraph.config.HugeConfig; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.backend.store.rocksdb.RocksDBStoreProvider; +import org.apache.hugegraph.config.HugeConfig; public class RocksDBSstStoreProvider extends RocksDBStoreProvider { @Override protected BackendStore newGraphStore(HugeConfig config, String store) { - return new RocksDBSstGraphStore(this, this.database(), store); + return new RocksDBSstStore.RocksDBSstGraphStore(this, this.database(), store); } @Override diff --git a/hugegraph-scylladb/pom.xml b/hugegraph-scylladb/pom.xml index bb9f80a70..2c32ee01d 100644 --- a/hugegraph-scylladb/pom.xml +++ b/hugegraph-scylladb/pom.xml @@ -20,18 +20,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hugegraph - com.baidu.hugegraph - 0.13.0 + org.apache.hugegraph + ${revision} + ../pom.xml 4.0.0 hugegraph-scylladb + + 1.0.0 + + - com.baidu.hugegraph + org.apache.hugegraph hugegraph-cassandra - ${project.version} + ${hugegraph-cassandra-version} diff --git a/hugegraph-scylladb/src/main/java/com/baidu/hugegraph/backend/store/scylladb/ScyllaDBFeatures.java b/hugegraph-scylladb/src/main/java/org/apache/hugegraph/backend/store/scylladb/ScyllaDBFeatures.java similarity index 89% rename from hugegraph-scylladb/src/main/java/com/baidu/hugegraph/backend/store/scylladb/ScyllaDBFeatures.java rename to hugegraph-scylladb/src/main/java/org/apache/hugegraph/backend/store/scylladb/ScyllaDBFeatures.java index 0612c1d66..4448858c4 100644 --- a/hugegraph-scylladb/src/main/java/com/baidu/hugegraph/backend/store/scylladb/ScyllaDBFeatures.java +++ b/hugegraph-scylladb/src/main/java/org/apache/hugegraph/backend/store/scylladb/ScyllaDBFeatures.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.scylladb; +package org.apache.hugegraph.backend.store.scylladb; -import com.baidu.hugegraph.backend.store.cassandra.CassandraFeatures; +import org.apache.hugegraph.backend.store.cassandra.CassandraFeatures; public class ScyllaDBFeatures extends CassandraFeatures { diff --git a/hugegraph-scylladb/src/main/java/com/baidu/hugegraph/backend/store/scylladb/ScyllaDBMetrics.java b/hugegraph-scylladb/src/main/java/org/apache/hugegraph/backend/store/scylladb/ScyllaDBMetrics.java similarity index 92% rename from hugegraph-scylladb/src/main/java/com/baidu/hugegraph/backend/store/scylladb/ScyllaDBMetrics.java rename to hugegraph-scylladb/src/main/java/org/apache/hugegraph/backend/store/scylladb/ScyllaDBMetrics.java index 5dc45aae6..25f733bf8 100644 --- a/hugegraph-scylladb/src/main/java/com/baidu/hugegraph/backend/store/scylladb/ScyllaDBMetrics.java +++ b/hugegraph-scylladb/src/main/java/org/apache/hugegraph/backend/store/scylladb/ScyllaDBMetrics.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.scylladb; +package org.apache.hugegraph.backend.store.scylladb; import java.util.Map; import org.apache.cassandra.tools.NodeProbe; -import com.baidu.hugegraph.backend.store.cassandra.CassandraMetrics; -import com.baidu.hugegraph.backend.store.cassandra.CassandraSessionPool; -import com.baidu.hugegraph.config.HugeConfig; +import org.apache.hugegraph.backend.store.cassandra.CassandraMetrics; +import org.apache.hugegraph.backend.store.cassandra.CassandraSessionPool; +import org.apache.hugegraph.config.HugeConfig; public class ScyllaDBMetrics extends CassandraMetrics { diff --git a/hugegraph-scylladb/src/main/java/com/baidu/hugegraph/backend/store/scylladb/ScyllaDBStoreProvider.java b/hugegraph-scylladb/src/main/java/org/apache/hugegraph/backend/store/scylladb/ScyllaDBStoreProvider.java similarity index 89% rename from hugegraph-scylladb/src/main/java/com/baidu/hugegraph/backend/store/scylladb/ScyllaDBStoreProvider.java rename to hugegraph-scylladb/src/main/java/org/apache/hugegraph/backend/store/scylladb/ScyllaDBStoreProvider.java index 8d2bc5b7a..14365f761 100644 --- a/hugegraph-scylladb/src/main/java/com/baidu/hugegraph/backend/store/scylladb/ScyllaDBStoreProvider.java +++ b/hugegraph-scylladb/src/main/java/org/apache/hugegraph/backend/store/scylladb/ScyllaDBStoreProvider.java @@ -17,21 +17,21 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.scylladb; +package org.apache.hugegraph.backend.store.scylladb; import org.slf4j.Logger; -import com.baidu.hugegraph.backend.store.BackendFeatures; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.store.BackendStoreProvider; -import com.baidu.hugegraph.backend.store.cassandra.CassandraMetrics; -import com.baidu.hugegraph.backend.store.cassandra.CassandraSessionPool; -import com.baidu.hugegraph.backend.store.cassandra.CassandraStore; -import com.baidu.hugegraph.backend.store.cassandra.CassandraStoreProvider; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.backend.store.BackendFeatures; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.backend.store.BackendStoreProvider; +import org.apache.hugegraph.backend.store.cassandra.CassandraMetrics; +import org.apache.hugegraph.backend.store.cassandra.CassandraSessionPool; +import org.apache.hugegraph.backend.store.cassandra.CassandraStore; +import org.apache.hugegraph.backend.store.cassandra.CassandraStoreProvider; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; public class ScyllaDBStoreProvider extends CassandraStoreProvider { diff --git a/hugegraph-scylladb/src/main/java/com/baidu/hugegraph/backend/store/scylladb/ScyllaDBTablesWithMV.java b/hugegraph-scylladb/src/main/java/org/apache/hugegraph/backend/store/scylladb/ScyllaDBTablesWithMV.java similarity index 95% rename from hugegraph-scylladb/src/main/java/com/baidu/hugegraph/backend/store/scylladb/ScyllaDBTablesWithMV.java rename to hugegraph-scylladb/src/main/java/org/apache/hugegraph/backend/store/scylladb/ScyllaDBTablesWithMV.java index 2a771c14c..d432b8b7d 100644 --- a/hugegraph-scylladb/src/main/java/com/baidu/hugegraph/backend/store/scylladb/ScyllaDBTablesWithMV.java +++ b/hugegraph-scylladb/src/main/java/org/apache/hugegraph/backend/store/scylladb/ScyllaDBTablesWithMV.java @@ -17,20 +17,20 @@ * under the License. */ -package com.baidu.hugegraph.backend.store.scylladb; +package org.apache.hugegraph.backend.store.scylladb; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.cassandra.CassandraSessionPool; -import com.baidu.hugegraph.backend.store.cassandra.CassandraTable; -import com.baidu.hugegraph.backend.store.cassandra.CassandraTables; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.cassandra.CassandraSessionPool; +import org.apache.hugegraph.backend.store.cassandra.CassandraTable; +import org.apache.hugegraph.backend.store.cassandra.CassandraTables; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.HugeKeys; import com.datastax.driver.core.querybuilder.Select; public class ScyllaDBTablesWithMV { diff --git a/hugegraph-test/pom.xml b/hugegraph-test/pom.xml index 72dc03b75..1530fbc5a 100644 --- a/hugegraph-test/pom.xml +++ b/hugegraph-test/pom.xml @@ -20,8 +20,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hugegraph - com.baidu.hugegraph - 0.13.0 + org.apache.hugegraph + ${revision} + ../pom.xml 4.0.0 @@ -35,49 +36,49 @@ - com.baidu.hugegraph + org.apache.hugegraph hugegraph-core - ${project.version} + ${revision} - com.baidu.hugegraph + org.apache.hugegraph hugegraph-api - ${project.version} + ${revision} - com.baidu.hugegraph + org.apache.hugegraph hugegraph-cassandra - ${project.version} + ${revision} - com.baidu.hugegraph + org.apache.hugegraph hugegraph-scylladb - ${project.version} + ${revision} - com.baidu.hugegraph + org.apache.hugegraph hugegraph-rocksdb - ${project.version} + ${revision} - com.baidu.hugegraph + org.apache.hugegraph hugegraph-hbase - ${project.version} + ${revision} - com.baidu.hugegraph + org.apache.hugegraph hugegraph-mysql - ${project.version} + ${revision} - com.baidu.hugegraph + org.apache.hugegraph hugegraph-postgresql - ${project.version} + ${revision} - com.baidu.hugegraph + org.apache.hugegraph hugegraph-dist - ${project.version} + ${revision} @@ -195,7 +196,7 @@ 0.8.8 - com/baidu/hugegraph/traversal/algorithm/*.class + org/apache/hugegraph/traversal/algorithm/*.class diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/ProcessStandardTest.java b/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/ProcessStandardTest.java deleted file mode 100644 index f3729962e..000000000 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/ProcessStandardTest.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package com.baidu.hugegraph.tinkerpop; - -import org.apache.tinkerpop.gremlin.GraphProviderClass; -import org.junit.runner.RunWith; - -@RunWith(ProcessBasicSuite.class) -@GraphProviderClass(provider = ProcessTestGraphProvider.class, - graph = TestGraph.class) -public class ProcessStandardTest { -} diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/StructureStandardTest.java b/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/StructureStandardTest.java deleted file mode 100644 index 8f507a4cc..000000000 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/StructureStandardTest.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package com.baidu.hugegraph.tinkerpop; - -import org.apache.tinkerpop.gremlin.GraphProviderClass; -import org.junit.runner.RunWith; - -@RunWith(StructureBasicSuite.class) -@GraphProviderClass(provider = StructureTestGraphProvider.class, - graph = TestGraph.class) -public class StructureStandardTest { -} diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/UnitTestSuite.java b/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/UnitTestSuite.java deleted file mode 100644 index c95aaf600..000000000 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/UnitTestSuite.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright 2017 HugeGraph Authors - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with this - * work for additional information regarding copyright ownership. The ASF - * licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ - -package com.baidu.hugegraph.unit; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -import com.baidu.hugegraph.unit.core.SystemSchemaStoreTest; -import com.baidu.hugegraph.unit.util.RateLimiterTest; -import com.baidu.hugegraph.unit.cache.CacheManagerTest; -import com.baidu.hugegraph.unit.cache.CacheTest; -import com.baidu.hugegraph.unit.cache.CachedGraphTransactionTest; -import com.baidu.hugegraph.unit.cache.CachedSchemaTransactionTest; -import com.baidu.hugegraph.unit.cache.RamTableTest; -import com.baidu.hugegraph.unit.cassandra.CassandraTest; -import com.baidu.hugegraph.unit.core.AnalyzerTest; -import com.baidu.hugegraph.unit.core.BackendMutationTest; -import com.baidu.hugegraph.unit.core.BackendStoreInfoTest; -import com.baidu.hugegraph.unit.core.ConditionQueryFlattenTest; -import com.baidu.hugegraph.unit.core.ConditionTest; -import com.baidu.hugegraph.unit.core.DataTypeTest; -import com.baidu.hugegraph.unit.core.DirectionsTest; -import com.baidu.hugegraph.unit.core.ExceptionTest; -import com.baidu.hugegraph.unit.core.LocksTableTest; -import com.baidu.hugegraph.unit.core.PageStateTest; -import com.baidu.hugegraph.unit.core.QueryTest; -import com.baidu.hugegraph.unit.core.RangeTest; -import com.baidu.hugegraph.unit.core.RolePermissionTest; -import com.baidu.hugegraph.unit.core.RowLockTest; -import com.baidu.hugegraph.unit.core.SecurityManagerTest; -import com.baidu.hugegraph.unit.core.SerialEnumTest; -import com.baidu.hugegraph.unit.core.TraversalUtilTest; -import com.baidu.hugegraph.unit.id.EdgeIdTest; -import com.baidu.hugegraph.unit.id.IdTest; -import com.baidu.hugegraph.unit.id.IdUtilTest; -import com.baidu.hugegraph.unit.id.SplicingIdGeneratorTest; -import com.baidu.hugegraph.unit.mysql.MysqlUtilTest; -import com.baidu.hugegraph.unit.mysql.WhereBuilderTest; -import com.baidu.hugegraph.unit.rocksdb.RocksDBCountersTest; -import com.baidu.hugegraph.unit.rocksdb.RocksDBSessionTest; -import com.baidu.hugegraph.unit.rocksdb.RocksDBSessionsTest; -import com.baidu.hugegraph.unit.serializer.BinaryBackendEntryTest; -import com.baidu.hugegraph.unit.serializer.BinaryScatterSerializerTest; -import com.baidu.hugegraph.unit.serializer.BinarySerializerTest; -import com.baidu.hugegraph.unit.serializer.BytesBufferTest; -import com.baidu.hugegraph.unit.serializer.SerializerFactoryTest; -import com.baidu.hugegraph.unit.serializer.StoreSerializerTest; -import com.baidu.hugegraph.unit.serializer.TableBackendEntryTest; -import com.baidu.hugegraph.unit.serializer.TextBackendEntryTest; -import com.baidu.hugegraph.unit.util.CompressUtilTest; -import com.baidu.hugegraph.unit.util.JsonUtilTest; -import com.baidu.hugegraph.unit.util.StringEncodingTest; -import com.baidu.hugegraph.unit.util.VersionTest; -import com.baidu.hugegraph.unit.util.collection.CollectionFactoryTest; -import com.baidu.hugegraph.unit.util.collection.IdSetTest; -import com.baidu.hugegraph.unit.util.collection.Int2IntsMapTest; -import com.baidu.hugegraph.unit.util.collection.IntMapTest; -import com.baidu.hugegraph.unit.util.collection.IntSetTest; -import com.baidu.hugegraph.unit.util.collection.ObjectIntMappingTest; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ - /* cache */ - CacheTest.RamCacheTest.class, - CacheTest.OffheapCacheTest.class, - CacheTest.LevelCacheTest.class, - CachedSchemaTransactionTest.class, - CachedGraphTransactionTest.class, - CacheManagerTest.class, - RamTableTest.class, - - /* types */ - DataTypeTest.class, - DirectionsTest.class, - SerialEnumTest.class, - - /* id */ - IdTest.class, - EdgeIdTest.class, - IdUtilTest.class, - SplicingIdGeneratorTest.class, - - /* core */ - LocksTableTest.class, - RowLockTest.class, - AnalyzerTest.class, - BackendMutationTest.class, - ConditionTest.class, - ConditionQueryFlattenTest.class, - QueryTest.class, - RangeTest.class, - SecurityManagerTest.class, - RolePermissionTest.class, - ExceptionTest.class, - BackendStoreInfoTest.class, - TraversalUtilTest.class, - PageStateTest.class, - SystemSchemaStoreTest.class, - - /* serializer */ - BytesBufferTest.class, - SerializerFactoryTest.class, - TextBackendEntryTest.class, - TableBackendEntryTest.class, - BinaryBackendEntryTest.class, - BinarySerializerTest.class, - BinaryScatterSerializerTest.class, - StoreSerializerTest.class, - - /* cassandra */ - CassandraTest.class, - - /* mysql */ - MysqlUtilTest.class, - WhereBuilderTest.class, - - /* rocksdb */ - RocksDBSessionsTest.class, - RocksDBSessionTest.class, - RocksDBCountersTest.class, - - /* utils */ - VersionTest.class, - JsonUtilTest.class, - StringEncodingTest.class, - CompressUtilTest.class, - RateLimiterTest.FixedTimerWindowRateLimiterTest.class, - RateLimiterTest.FixedWatchWindowRateLimiterTest.class, - - /* utils.collection */ - CollectionFactoryTest.class, - ObjectIntMappingTest.class, - Int2IntsMapTest.class, - IdSetTest.class, - IntMapTest.class, - IntSetTest.class -}) -public class UnitTestSuite { -} diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/ApiTestSuite.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/ApiTestSuite.java similarity index 90% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/ApiTestSuite.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/ApiTestSuite.java index ff926de51..47f7e8658 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/ApiTestSuite.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/ApiTestSuite.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; +import org.apache.hugegraph.api.traversers.TraversersApiTestSuite; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; -import com.baidu.hugegraph.api.traversers.TraversersApiTestSuite; -import com.baidu.hugegraph.dist.RegisterUtil; +import org.apache.hugegraph.dist.RegisterUtil; @RunWith(Suite.class) @Suite.SuiteClasses({ diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/BaseApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/BaseApiTest.java similarity index 99% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/BaseApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/BaseApiTest.java index f3535c938..00c8730db 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/BaseApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/BaseApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.io.IOException; import java.net.URLEncoder; @@ -44,9 +44,9 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.util.CollectionUtil; +import org.apache.hugegraph.util.JsonUtil; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/CypherApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/CypherApiTest.java similarity index 96% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/CypherApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/CypherApiTest.java index da849a4e9..ce0a1b05a 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/CypherApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/CypherApiTest.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; -import static com.baidu.hugegraph.testutil.Assert.assertContains; +import static org.apache.hugegraph.testutil.Assert.assertContains; import java.util.Map; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/EdgeApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/EdgeApiTest.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/EdgeApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/EdgeApiTest.java index 00aa867be..ef485276e 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/EdgeApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/EdgeApiTest.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.io.IOException; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableMap; import jakarta.ws.rs.core.Response; @@ -35,10 +35,10 @@ public class EdgeApiTest extends BaseApiTest { @Before public void prepareSchema() { - BaseApiTest.initPropertyKey(); - BaseApiTest.initVertexLabel(); - BaseApiTest.initEdgeLabel(); - BaseApiTest.initVertex(); + initPropertyKey(); + initVertexLabel(); + initEdgeLabel(); + initVertex(); } @Test diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/EdgeLabelApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/EdgeLabelApiTest.java similarity index 99% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/EdgeLabelApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/EdgeLabelApiTest.java index e8fedba83..dba3d38d1 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/EdgeLabelApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/EdgeLabelApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.util.Map; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/GremlinApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/GremlinApiTest.java similarity index 99% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/GremlinApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/GremlinApiTest.java index a854ddfaa..911106747 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/GremlinApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/GremlinApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.util.List; import java.util.Map; @@ -27,7 +27,7 @@ import jakarta.ws.rs.core.Response; import org.junit.Assume; import org.junit.Test; -import com.baidu.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableMap; public class GremlinApiTest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/IndexLabelApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/IndexLabelApiTest.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/IndexLabelApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/IndexLabelApiTest.java index 77a6ba766..b1c1cd9e5 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/IndexLabelApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/IndexLabelApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.util.Map; @@ -33,9 +33,9 @@ public class IndexLabelApiTest extends BaseApiTest { @Before public void prepareSchema() { - BaseApiTest.initPropertyKey(); - BaseApiTest.initVertexLabel(); - BaseApiTest.initEdgeLabel(); + initPropertyKey(); + initVertexLabel(); + initEdgeLabel(); } @Test diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/LoginApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/LoginApiTest.java similarity index 98% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/LoginApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/LoginApiTest.java index 2a3b63d9c..35a19c8b3 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/LoginApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/LoginApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.nio.file.Paths; import java.util.Map; @@ -32,8 +32,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.util.JsonUtil; public class LoginApiTest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/MetricsApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/MetricsApiTest.java similarity index 99% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/MetricsApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/MetricsApiTest.java index aee8d3cce..3c4d4c4ef 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/MetricsApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/MetricsApiTest.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.util.Map; import jakarta.ws.rs.core.Response; import org.junit.Test; -import com.baidu.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Assert; public class MetricsApiTest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/ProjectApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/ProjectApiTest.java similarity index 99% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/ProjectApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/ProjectApiTest.java index bed6992d9..b4ed0a9d7 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/ProjectApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/ProjectApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.util.List; import java.util.Map; @@ -30,7 +30,7 @@ import org.junit.After; import org.junit.Assert; import org.junit.Test; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.JsonUtil; import com.google.common.collect.ImmutableMap; public class ProjectApiTest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/PropertyKeyApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/PropertyKeyApiTest.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/PropertyKeyApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/PropertyKeyApiTest.java index 3b93e5cbd..d3b9c0357 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/PropertyKeyApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/PropertyKeyApiTest.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import jakarta.ws.rs.core.Response; import org.junit.Test; -import com.baidu.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Assert; public class PropertyKeyApiTest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/SchemaApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/SchemaApiTest.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/SchemaApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/SchemaApiTest.java index d24df2821..ae0f58c0b 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/SchemaApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/SchemaApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import jakarta.ws.rs.core.Response; import org.junit.Test; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/TaskApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/TaskApiTest.java similarity index 98% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/TaskApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/TaskApiTest.java index f105217dd..19e166b60 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/TaskApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/TaskApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.util.List; import java.util.Map; @@ -27,7 +27,7 @@ import jakarta.ws.rs.core.Response; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Assert; public class TaskApiTest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/UserApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/UserApiTest.java similarity index 98% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/UserApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/UserApiTest.java index ac78a6cee..18c4de61e 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/UserApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/UserApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.util.List; import java.util.Map; @@ -29,7 +29,7 @@ import org.junit.After; import org.junit.Assert; import org.junit.Test; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.JsonUtil; import com.google.common.collect.ImmutableMap; public class UserApiTest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/VertexApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/VertexApiTest.java similarity index 96% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/VertexApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/VertexApiTest.java index a1073dcdd..91761488c 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/VertexApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/VertexApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.io.IOException; @@ -31,8 +31,8 @@ public class VertexApiTest extends BaseApiTest { @Before public void prepareSchema() { - BaseApiTest.initPropertyKey(); - BaseApiTest.initVertexLabel(); + initPropertyKey(); + initVertexLabel(); } @Test diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/VertexLabelApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/VertexLabelApiTest.java similarity index 98% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/VertexLabelApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/VertexLabelApiTest.java index be7a42088..cfdcf4644 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/VertexLabelApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/VertexLabelApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.util.Map; @@ -33,7 +33,7 @@ public class VertexLabelApiTest extends BaseApiTest { @Before public void prepareSchema() { - BaseApiTest.initPropertyKey(); + initPropertyKey(); } @Test diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/AdamicAdarAPITest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/AdamicAdarAPITest.java similarity index 93% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/AdamicAdarAPITest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/AdamicAdarAPITest.java index 6fb438909..9613e9e5e 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/AdamicAdarAPITest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/AdamicAdarAPITest.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 HugeGraph Authors + * Copyright 2017 HugeGraph Authors * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with this @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.Map; @@ -26,7 +26,7 @@ import jakarta.ws.rs.core.Response; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; import com.google.common.collect.ImmutableMap; public class AdamicAdarAPITest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/AllShortestPathsApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/AllShortestPathsApiTest.java similarity index 96% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/AllShortestPathsApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/AllShortestPathsApiTest.java index 57d7877f7..a9070e281 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/AllShortestPathsApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/AllShortestPathsApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.List; import java.util.Map; @@ -26,7 +26,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/CountApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/CountApiTest.java similarity index 94% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/CountApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/CountApiTest.java index 529f2adb8..97ca54c90 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/CountApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/CountApiTest.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import jakarta.ws.rs.core.Response; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; -import com.baidu.hugegraph.testutil.Assert; +import org.apache.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.testutil.Assert; public class CountApiTest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/CrosspointsApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/CrosspointsApiTest.java similarity index 94% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/CrosspointsApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/CrosspointsApiTest.java index bf59b2c9e..16fb8a930 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/CrosspointsApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/CrosspointsApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.List; import java.util.Map; @@ -26,8 +26,8 @@ import jakarta.ws.rs.core.Response; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; -import com.baidu.hugegraph.testutil.Assert; +import org.apache.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableMap; public class CrosspointsApiTest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/CustomizedCrosspointsApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/CustomizedCrosspointsApiTest.java similarity index 96% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/CustomizedCrosspointsApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/CustomizedCrosspointsApiTest.java index df99e0022..ff82209f5 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/CustomizedCrosspointsApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/CustomizedCrosspointsApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.List; import java.util.Map; @@ -27,7 +27,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; public class CustomizedCrosspointsApiTest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/EdgesApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/EdgesApiTest.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/EdgesApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/EdgesApiTest.java index 18cde518f..6eca9c1c4 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/EdgesApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/EdgesApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.List; import java.util.Map; @@ -27,7 +27,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/FusiformSimilarityApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/FusiformSimilarityApiTest.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/FusiformSimilarityApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/FusiformSimilarityApiTest.java index 9a7fcdfeb..acfbcf7e7 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/FusiformSimilarityApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/FusiformSimilarityApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.List; import java.util.Map; @@ -27,7 +27,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; public class FusiformSimilarityApiTest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/JaccardSimilarityApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/JaccardSimilarityApiTest.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/JaccardSimilarityApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/JaccardSimilarityApiTest.java index d3782fb19..c83cd5726 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/JaccardSimilarityApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/JaccardSimilarityApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.Map; @@ -26,7 +26,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; import com.google.common.collect.ImmutableMap; public class JaccardSimilarityApiTest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/KneighborApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/KneighborApiTest.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/KneighborApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/KneighborApiTest.java index 7be50f422..df7129d86 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/KneighborApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/KneighborApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.List; import java.util.Map; @@ -27,7 +27,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/KoutApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/KoutApiTest.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/KoutApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/KoutApiTest.java index 23b59b62f..ef7d357bb 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/KoutApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/KoutApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.List; import java.util.Map; @@ -27,7 +27,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/MultiNodeShortestPathApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/MultiNodeShortestPathApiTest.java similarity index 96% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/MultiNodeShortestPathApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/MultiNodeShortestPathApiTest.java index 1a51d593a..f9c5a29be 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/MultiNodeShortestPathApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/MultiNodeShortestPathApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.List; import java.util.Map; @@ -27,7 +27,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; public class MultiNodeShortestPathApiTest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/NeighborRankApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/NeighborRankApiTest.java similarity index 95% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/NeighborRankApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/NeighborRankApiTest.java index dc6b1e95a..b65a51ad9 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/NeighborRankApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/NeighborRankApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.List; import java.util.Map; @@ -27,7 +27,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; public class NeighborRankApiTest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/PathsApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/PathsApiTest.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/PathsApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/PathsApiTest.java index 6aeb3b242..498fa3271 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/PathsApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/PathsApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.List; import java.util.Map; @@ -27,7 +27,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/PersonalRankApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/PersonalRankApiTest.java similarity index 95% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/PersonalRankApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/PersonalRankApiTest.java index 8c92d2913..1de2f9b05 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/PersonalRankApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/PersonalRankApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.Map; @@ -25,7 +25,7 @@ import jakarta.ws.rs.core.Response; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; public class PersonalRankApiTest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/RaysApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/RaysApiTest.java similarity index 96% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/RaysApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/RaysApiTest.java index 6cfda4e30..a113faf89 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/RaysApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/RaysApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.List; import java.util.Map; @@ -27,7 +27,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; import com.google.common.collect.ImmutableMap; public class RaysApiTest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/ResourceAllocationAPITest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/ResourceAllocationAPITest.java similarity index 93% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/ResourceAllocationAPITest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/ResourceAllocationAPITest.java index 2a8d43299..d3a14f161 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/ResourceAllocationAPITest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/ResourceAllocationAPITest.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 HugeGraph Authors + * Copyright 2017 HugeGraph Authors * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with this @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.Map; @@ -26,7 +26,7 @@ import jakarta.ws.rs.core.Response; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; import com.google.common.collect.ImmutableMap; public class ResourceAllocationAPITest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/RingsApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/RingsApiTest.java similarity index 95% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/RingsApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/RingsApiTest.java index 67a1d7ef1..a56d37640 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/RingsApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/RingsApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.List; import java.util.Map; @@ -27,7 +27,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; import com.google.common.collect.ImmutableMap; public class RingsApiTest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/SameNeighborsApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/SameNeighborsApiTest.java similarity index 96% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/SameNeighborsApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/SameNeighborsApiTest.java index 89af06ff2..e506c9cb2 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/SameNeighborsApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/SameNeighborsApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.List; import java.util.Map; @@ -27,7 +27,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; import com.google.common.collect.ImmutableMap; public class SameNeighborsApiTest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/ShortestPathApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/ShortestPathApiTest.java similarity index 96% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/ShortestPathApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/ShortestPathApiTest.java index a09f85eec..d4453dc3a 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/ShortestPathApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/ShortestPathApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.List; import java.util.Map; @@ -27,7 +27,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/SingleSourceShortestPathApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/SingleSourceShortestPathApiTest.java similarity index 95% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/SingleSourceShortestPathApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/SingleSourceShortestPathApiTest.java index b9295f662..2d0038691 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/SingleSourceShortestPathApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/SingleSourceShortestPathApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.Map; @@ -26,7 +26,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; import com.google.common.collect.ImmutableMap; public class SingleSourceShortestPathApiTest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/TemplatePathsApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/TemplatePathsApiTest.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/TemplatePathsApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/TemplatePathsApiTest.java index 9671d3c84..5c041340f 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/TemplatePathsApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/TemplatePathsApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.List; import java.util.Map; @@ -27,7 +27,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; import com.google.common.collect.ImmutableList; public class TemplatePathsApiTest extends BaseApiTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/TraversersApiTestSuite.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/TraversersApiTestSuite.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/TraversersApiTestSuite.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/TraversersApiTestSuite.java index b29b68550..7b0ce8cd9 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/TraversersApiTestSuite.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/TraversersApiTestSuite.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/WeightedShortestPathApiTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/WeightedShortestPathApiTest.java similarity index 96% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/WeightedShortestPathApiTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/WeightedShortestPathApiTest.java index 1b798b750..04b811908 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/WeightedShortestPathApiTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/WeightedShortestPathApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traversers; +package org.apache.hugegraph.api.traversers; import java.util.List; import java.util.Map; @@ -27,7 +27,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/AuthTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/core/AuthTest.java similarity index 98% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/core/AuthTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/core/AuthTest.java index ac0b09f4a..ad68c817b 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/AuthTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/core/AuthTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.core; +package org.apache.hugegraph.core; import java.util.Date; import java.util.HashMap; @@ -30,27 +30,27 @@ import org.apache.commons.collections.CollectionUtils; import org.junit.After; import org.junit.Test; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.auth.AuthManager; -import com.baidu.hugegraph.auth.HugeAccess; -import com.baidu.hugegraph.auth.HugeBelong; -import com.baidu.hugegraph.auth.HugeGroup; -import com.baidu.hugegraph.auth.HugePermission; -import com.baidu.hugegraph.auth.HugeProject; -import com.baidu.hugegraph.auth.HugeResource; -import com.baidu.hugegraph.auth.HugeTarget; -import com.baidu.hugegraph.auth.HugeUser; -import com.baidu.hugegraph.auth.RolePermission; -import com.baidu.hugegraph.auth.UserWithRole; -import com.baidu.hugegraph.backend.cache.Cache; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.auth.AuthManager; +import org.apache.hugegraph.auth.HugeAccess; +import org.apache.hugegraph.auth.HugeBelong; +import org.apache.hugegraph.auth.HugeGroup; +import org.apache.hugegraph.auth.HugePermission; +import org.apache.hugegraph.auth.HugeProject; +import org.apache.hugegraph.auth.HugeResource; +import org.apache.hugegraph.auth.HugeTarget; +import org.apache.hugegraph.auth.HugeUser; +import org.apache.hugegraph.auth.RolePermission; +import org.apache.hugegraph.auth.UserWithRole; +import org.apache.hugegraph.backend.cache.Cache; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.StringEncoding; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/BaseCoreTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/core/BaseCoreTest.java similarity index 91% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/core/BaseCoreTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/core/BaseCoreTest.java index 43118961e..ab92ac417 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/BaseCoreTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/core/BaseCoreTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.core; +package org.apache.hugegraph.core; import java.util.Random; @@ -27,12 +27,12 @@ import org.junit.After; import org.junit.Before; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.store.BackendFeatures; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.backend.store.BackendFeatures; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.util.Log; public class BaseCoreTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/CoreTestSuite.java b/hugegraph-test/src/main/java/org/apache/hugegraph/core/CoreTestSuite.java similarity index 84% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/core/CoreTestSuite.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/core/CoreTestSuite.java index a95ff0912..4d60e8651 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/CoreTestSuite.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/core/CoreTestSuite.java @@ -17,8 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.core; +package org.apache.hugegraph.core; +import org.apache.hugegraph.testutil.Utils; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -26,14 +27,13 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.core.PropertyCoreTest.EdgePropertyCoreTest; -import com.baidu.hugegraph.core.PropertyCoreTest.VertexPropertyCoreTest; -import com.baidu.hugegraph.dist.RegisterUtil; -import com.baidu.hugegraph.testutil.Utils; -import com.baidu.hugegraph.type.define.NodeRole; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.core.PropertyCoreTest.EdgePropertyCoreTest; +import org.apache.hugegraph.core.PropertyCoreTest.VertexPropertyCoreTest; +import org.apache.hugegraph.dist.RegisterUtil; +import org.apache.hugegraph.type.define.NodeRole; +import org.apache.hugegraph.util.Log; @RunWith(Suite.class) @Suite.SuiteClasses({ diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/EdgeCoreTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/core/EdgeCoreTest.java similarity index 99% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/core/EdgeCoreTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/core/EdgeCoreTest.java index 701fa3128..023fbcba4 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/EdgeCoreTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/core/EdgeCoreTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.core; +package org.apache.hugegraph.core; import java.util.Collections; import java.util.Date; @@ -42,42 +42,42 @@ import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.hugegraph.testutil.FakeObjects; +import org.apache.hugegraph.testutil.Utils; import org.junit.Assume; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.page.PageInfo; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; -import com.baidu.hugegraph.backend.store.BackendTable; -import com.baidu.hugegraph.backend.store.Shard; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.exception.LimitExceedException; -import com.baidu.hugegraph.exception.NoIndexException; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.Userdata; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.FakeObjects.FakeEdge; -import com.baidu.hugegraph.testutil.Utils; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.traversal.optimize.ConditionP; -import com.baidu.hugegraph.traversal.optimize.Text; -import com.baidu.hugegraph.traversal.optimize.TraversalUtil; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.util.Events; -import com.baidu.hugegraph.util.collection.CollectionFactory; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.page.PageInfo; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.backend.store.BackendTable; +import org.apache.hugegraph.backend.store.Shard; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.exception.LimitExceedException; +import org.apache.hugegraph.exception.NoIndexException; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.schema.Userdata; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.traversal.optimize.ConditionP; +import org.apache.hugegraph.traversal.optimize.Text; +import org.apache.hugegraph.traversal.optimize.TraversalUtil; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.util.Events; +import org.apache.hugegraph.util.collection.CollectionFactory; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -5427,7 +5427,7 @@ public class EdgeCoreTest extends BaseCoreTest { edges = graph.traversal().E().toList(); Assert.assertEquals(3, edges.size()); Assert.assertFalse(Utils.contains(edges, - new FakeEdge("authored", james, java1))); + new FakeObjects.FakeEdge("authored", james, java1))); } @Test @@ -7508,7 +7508,7 @@ public class EdgeCoreTest extends BaseCoreTest { Vertex inVertex, Object... kvs) { Assert.assertTrue(Utils.contains(edges, - new FakeEdge(label, outVertex, inVertex, kvs))); + new FakeObjects.FakeEdge(label, outVertex, inVertex, kvs))); } private int traverseInPage(Function> fetcher) { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/EdgeLabelCoreTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/core/EdgeLabelCoreTest.java similarity index 98% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/core/EdgeLabelCoreTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/core/EdgeLabelCoreTest.java index 909dd2f32..4dba7c473 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/EdgeLabelCoreTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/core/EdgeLabelCoreTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.core; +package org.apache.hugegraph.core; import java.util.Date; import java.util.List; @@ -29,19 +29,19 @@ import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Assume; import org.junit.Test; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.exception.ExistedException; -import com.baidu.hugegraph.exception.NoIndexException; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.Userdata; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.define.Frequency; -import com.baidu.hugegraph.util.DateUtil; -import com.baidu.hugegraph.util.Events; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.exception.ExistedException; +import org.apache.hugegraph.exception.NoIndexException; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.schema.Userdata; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.define.Frequency; +import org.apache.hugegraph.util.DateUtil; +import org.apache.hugegraph.util.Events; import com.google.common.collect.ImmutableSet; public class EdgeLabelCoreTest extends SchemaCoreTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/IndexLabelCoreTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/core/IndexLabelCoreTest.java similarity index 99% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/core/IndexLabelCoreTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/core/IndexLabelCoreTest.java index 55efdd0ab..e7e82dac7 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/IndexLabelCoreTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/core/IndexLabelCoreTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.core; +package org.apache.hugegraph.core; import java.util.Date; import java.util.List; @@ -29,21 +29,21 @@ import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Assume; import org.junit.Test; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.exception.ExistedException; -import com.baidu.hugegraph.exception.NoIndexException; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.Userdata; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.IndexType; -import com.baidu.hugegraph.type.define.WriteType; -import com.baidu.hugegraph.util.DateUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.exception.ExistedException; +import org.apache.hugegraph.exception.NoIndexException; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.schema.Userdata; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.IndexType; +import org.apache.hugegraph.type.define.WriteType; +import org.apache.hugegraph.util.DateUtil; import com.google.common.collect.ImmutableList; public class IndexLabelCoreTest extends SchemaCoreTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/MultiGraphsTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/core/MultiGraphsTest.java similarity index 95% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/core/MultiGraphsTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/core/MultiGraphsTest.java index e68bc1f82..7963c9366 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/MultiGraphsTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/core/MultiGraphsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.core; +package org.apache.hugegraph.core; import java.nio.file.Paths; import java.util.ArrayList; @@ -30,25 +30,25 @@ import org.apache.commons.configuration2.PropertiesConfiguration; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.util.GraphFactory; +import org.apache.hugegraph.testutil.Utils; import org.junit.Test; import org.rocksdb.RocksDBException; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.store.BackendStoreInfo; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBOptions; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.exception.ConnectionException; -import com.baidu.hugegraph.exception.ExistedException; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Utils; -import com.baidu.hugegraph.type.define.NodeRole; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.store.BackendStoreInfo; +import org.apache.hugegraph.backend.store.rocksdb.RocksDBOptions; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.exception.ConnectionException; +import org.apache.hugegraph.exception.ExistedException; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.define.NodeRole; import com.google.common.collect.ImmutableList; public class MultiGraphsTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/PropertyCoreTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/core/PropertyCoreTest.java similarity index 98% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/core/PropertyCoreTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/core/PropertyCoreTest.java index f71760ebd..e37ba0f3e 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/PropertyCoreTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/core/PropertyCoreTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.core; +package org.apache.hugegraph.core; import java.math.BigDecimal; import java.text.ParseException; @@ -30,16 +30,16 @@ import java.util.UUID; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.hugegraph.testutil.Utils; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Utils; -import com.baidu.hugegraph.traversal.optimize.TraversalUtil; -import com.baidu.hugegraph.util.Blob; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.traversal.optimize.TraversalUtil; +import org.apache.hugegraph.util.Blob; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/PropertyKeyCoreTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/core/PropertyKeyCoreTest.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/core/PropertyKeyCoreTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/core/PropertyKeyCoreTest.java index 7891b92f2..8d24dd99c 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/PropertyKeyCoreTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/core/PropertyKeyCoreTest.java @@ -17,26 +17,26 @@ * under the License. */ -package com.baidu.hugegraph.core; +package org.apache.hugegraph.core; import java.util.Date; import org.junit.Assume; import org.junit.Test; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.exception.ExistedException; -import com.baidu.hugegraph.exception.NotAllowException; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.Userdata; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.define.AggregateType; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.type.define.WriteType; -import com.baidu.hugegraph.util.DateUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.exception.ExistedException; +import org.apache.hugegraph.exception.NotAllowException; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.schema.Userdata; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.define.AggregateType; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.DataType; +import org.apache.hugegraph.type.define.WriteType; +import org.apache.hugegraph.util.DateUtil; import com.google.common.collect.ImmutableList; public class PropertyKeyCoreTest extends SchemaCoreTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/RamTableTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/core/RamTableTest.java similarity index 98% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/core/RamTableTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/core/RamTableTest.java index 78dd71f6e..28b046673 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/RamTableTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/core/RamTableTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.core; +package org.apache.hugegraph.core; import java.io.File; import java.nio.file.Paths; @@ -34,18 +34,18 @@ import org.junit.Assume; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.ram.RamTable; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.type.define.Directions; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.ram.RamTable; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.type.define.Directions; public class RamTableTest extends BaseCoreTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/RestoreCoreTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/core/RestoreCoreTest.java similarity index 98% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/core/RestoreCoreTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/core/RestoreCoreTest.java index 84dca4855..f7115f11f 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/RestoreCoreTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/core/RestoreCoreTest.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.core; +package org.apache.hugegraph.core; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.After; import org.junit.Test; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.exception.ExistedException; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.define.GraphMode; -import com.baidu.hugegraph.type.define.IdStrategy; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.exception.ExistedException; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.define.GraphMode; +import org.apache.hugegraph.type.define.IdStrategy; public class RestoreCoreTest extends BaseCoreTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/RoleElectionStateMachineTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/core/RoleElectionStateMachineTest.java similarity index 95% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/core/RoleElectionStateMachineTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/core/RoleElectionStateMachineTest.java index c32e1ee23..00d8d1d76 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/RoleElectionStateMachineTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/core/RoleElectionStateMachineTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.core; +package org.apache.hugegraph.core; import java.util.ArrayList; import java.util.Collections; @@ -32,15 +32,15 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.locks.LockSupport; -import com.baidu.hugegraph.election.Config; -import com.baidu.hugegraph.election.RoleElectionStateMachine; -import com.baidu.hugegraph.election.RoleElectionStateMachineImpl; -import com.baidu.hugegraph.election.RoleTypeData; -import com.baidu.hugegraph.election.RoleTypeDataAdapter; -import com.baidu.hugegraph.election.StateMachineCallback; -import com.baidu.hugegraph.election.StateMachineContext; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Utils; +import org.apache.hugegraph.election.Config; +import org.apache.hugegraph.election.RoleElectionStateMachine; +import org.apache.hugegraph.election.RoleElectionStateMachineImpl; +import org.apache.hugegraph.election.RoleTypeData; +import org.apache.hugegraph.election.RoleTypeDataAdapter; +import org.apache.hugegraph.election.StateMachineCallback; +import org.apache.hugegraph.election.StateMachineContext; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Utils; import org.junit.Test; public class RoleElectionStateMachineTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/SchemaCoreTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/core/SchemaCoreTest.java similarity index 92% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/core/SchemaCoreTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/core/SchemaCoreTest.java index e47cca06b..f006aeb61 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/SchemaCoreTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/core/SchemaCoreTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.core; +package org.apache.hugegraph.core; import java.util.ArrayList; import java.util.Collection; @@ -26,14 +26,14 @@ import java.util.List; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.testutil.Assert; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.testutil.Assert; public class SchemaCoreTest extends BaseCoreTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/TaskCoreTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/core/TaskCoreTest.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/core/TaskCoreTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/core/TaskCoreTest.java index 05a6d3936..4cd0de52c 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/TaskCoreTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/core/TaskCoreTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.core; +package org.apache.hugegraph.core; import java.util.Arrays; import java.util.Iterator; @@ -27,22 +27,22 @@ import java.util.concurrent.TimeoutException; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.api.job.GremlinAPI.GremlinRequest; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.job.EphemeralJob; -import com.baidu.hugegraph.job.EphemeralJobBuilder; -import com.baidu.hugegraph.job.GremlinJob; -import com.baidu.hugegraph.job.JobBuilder; -import com.baidu.hugegraph.task.HugeTask; -import com.baidu.hugegraph.task.TaskCallable; -import com.baidu.hugegraph.task.TaskScheduler; -import com.baidu.hugegraph.task.TaskStatus; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.api.job.GremlinAPI.GremlinRequest; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.job.EphemeralJob; +import org.apache.hugegraph.job.EphemeralJobBuilder; +import org.apache.hugegraph.job.GremlinJob; +import org.apache.hugegraph.job.JobBuilder; +import org.apache.hugegraph.task.HugeTask; +import org.apache.hugegraph.task.TaskCallable; +import org.apache.hugegraph.task.TaskScheduler; +import org.apache.hugegraph.task.TaskStatus; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Whitebox; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/VertexCoreTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/core/VertexCoreTest.java similarity index 99% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/core/VertexCoreTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/core/VertexCoreTest.java index 47ac8c201..6cfce9a12 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/VertexCoreTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/core/VertexCoreTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.core; +package org.apache.hugegraph.core; import java.math.BigDecimal; import java.util.ArrayList; @@ -41,47 +41,47 @@ import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; +import org.apache.hugegraph.testutil.FakeObjects; +import org.apache.hugegraph.testutil.Utils; import org.junit.Assume; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.Id.IdType; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.id.SnowflakeIdGenerator; -import com.baidu.hugegraph.backend.id.SplicingIdGenerator; -import com.baidu.hugegraph.backend.page.PageInfo; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.store.BackendTable; -import com.baidu.hugegraph.backend.store.Shard; -import com.baidu.hugegraph.backend.tx.GraphTransaction; -import com.baidu.hugegraph.exception.LimitExceedException; -import com.baidu.hugegraph.exception.NoIndexException; -import com.baidu.hugegraph.exception.NotAllowException; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.Userdata; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.FakeObjects.FakeVertex; -import com.baidu.hugegraph.testutil.Utils; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.traversal.optimize.ConditionP; -import com.baidu.hugegraph.traversal.optimize.Text; -import com.baidu.hugegraph.traversal.optimize.TraversalUtil; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.GraphReadMode; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.type.define.WriteType; -import com.baidu.hugegraph.util.Blob; -import com.baidu.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.LongEncoding; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.Id.IdType; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.id.SnowflakeIdGenerator; +import org.apache.hugegraph.backend.id.SplicingIdGenerator; +import org.apache.hugegraph.backend.page.PageInfo; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.store.BackendTable; +import org.apache.hugegraph.backend.store.Shard; +import org.apache.hugegraph.backend.tx.GraphTransaction; +import org.apache.hugegraph.exception.LimitExceedException; +import org.apache.hugegraph.exception.NoIndexException; +import org.apache.hugegraph.exception.NotAllowException; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.schema.Userdata; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.traversal.optimize.ConditionP; +import org.apache.hugegraph.traversal.optimize.Text; +import org.apache.hugegraph.traversal.optimize.TraversalUtil; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.GraphReadMode; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.type.define.WriteType; +import org.apache.hugegraph.util.Blob; +import org.apache.hugegraph.util.CollectionUtil; +import org.apache.hugegraph.util.LongEncoding; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -9333,11 +9333,11 @@ public class VertexCoreTest extends BaseCoreTest { private static void assertContains(List vertices, Object... keyValues) { - Assert.assertTrue(Utils.contains(vertices, new FakeVertex(keyValues))); + Assert.assertTrue(Utils.contains(vertices, new FakeObjects.FakeVertex(keyValues))); } private static void assertNotContains(List vertices, Object... keyValues) { - Assert.assertFalse(Utils.contains(vertices, new FakeVertex(keyValues))); + Assert.assertFalse(Utils.contains(vertices, new FakeObjects.FakeVertex(keyValues))); } } diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/VertexLabelCoreTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/core/VertexLabelCoreTest.java similarity index 98% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/core/VertexLabelCoreTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/core/VertexLabelCoreTest.java index a077bbf96..6e94c7e70 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/VertexLabelCoreTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/core/VertexLabelCoreTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.core; +package org.apache.hugegraph.core; import java.util.Date; import java.util.List; @@ -28,23 +28,23 @@ import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Assume; import org.junit.Test; -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.exception.ExistedException; -import com.baidu.hugegraph.exception.NoIndexException; -import com.baidu.hugegraph.exception.NotFoundException; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.Userdata; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.task.HugeTask; -import com.baidu.hugegraph.task.TaskScheduler; -import com.baidu.hugegraph.task.TaskStatus; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.define.IdStrategy; -import com.baidu.hugegraph.util.DateUtil; -import com.baidu.hugegraph.util.Events; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.exception.ExistedException; +import org.apache.hugegraph.exception.NoIndexException; +import org.apache.hugegraph.exception.NotFoundException; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.schema.Userdata; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.task.HugeTask; +import org.apache.hugegraph.task.TaskScheduler; +import org.apache.hugegraph.task.TaskStatus; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.define.IdStrategy; +import org.apache.hugegraph.util.DateUtil; +import org.apache.hugegraph.util.Events; import com.google.common.collect.ImmutableSet; public class VertexLabelCoreTest extends SchemaCoreTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/testutil/FakeObjects.java b/hugegraph-test/src/main/java/org/apache/hugegraph/testutil/FakeObjects.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/testutil/FakeObjects.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/testutil/FakeObjects.java index a64f34dfc..d039f7919 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/testutil/FakeObjects.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/testutil/FakeObjects.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.testutil; +package org.apache.hugegraph.testutil; import java.util.Map; @@ -25,7 +25,7 @@ import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; -import com.baidu.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeEdge; public class FakeObjects { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/testutil/Utils.java b/hugegraph-test/src/main/java/org/apache/hugegraph/testutil/Utils.java similarity index 86% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/testutil/Utils.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/testutil/Utils.java index 770b0f26e..68fbe3ee3 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/testutil/Utils.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/testutil/Utils.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.testutil; +package org.apache.hugegraph.testutil; import java.io.File; import java.util.Date; @@ -29,14 +29,12 @@ import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.testutil.FakeObjects.FakeEdge; -import com.baidu.hugegraph.testutil.FakeObjects.FakeVertex; -import com.baidu.hugegraph.util.DateUtil; -import com.baidu.hugegraph.util.E; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.util.DateUtil; +import org.apache.hugegraph.util.E; public class Utils { @@ -66,7 +64,7 @@ public class Utils { } public static boolean contains(List vertices, - FakeVertex fakeVertex) { + FakeObjects.FakeVertex fakeVertex) { for (Vertex v : vertices) { if (fakeVertex.equalsVertex(v)) { return true; @@ -75,7 +73,7 @@ public class Utils { return false; } - public static boolean contains(List edges, FakeEdge fakeEdge) { + public static boolean contains(List edges, FakeObjects.FakeEdge fakeEdge) { for (Edge e : edges) { if (fakeEdge.equalsEdge(e)) { return true; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/ProcessBasicSuite.java b/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/ProcessBasicSuite.java similarity index 92% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/ProcessBasicSuite.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/ProcessBasicSuite.java index a4fabb4ce..b3199f14b 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/ProcessBasicSuite.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/ProcessBasicSuite.java @@ -1,23 +1,23 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * Copyright 2017 HugeGraph Authors * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations * under the License. */ -package com.baidu.hugegraph.tinkerpop; +package org.apache.hugegraph.tinkerpop; import org.apache.tinkerpop.gremlin.AbstractGremlinSuite; import org.apache.tinkerpop.gremlin.GraphManager; @@ -92,12 +92,12 @@ import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.Transl import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.EarlyLimitStrategyProcessTest; import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IncidentToAdjacentStrategyProcessTest; import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategyProcessTest; +import org.apache.hugegraph.tinkerpop.tests.HugeGraphWriteTest; import org.junit.runners.model.InitializationError; import org.junit.runners.model.RunnerBuilder; import org.junit.runners.model.Statement; -import com.baidu.hugegraph.dist.RegisterUtil; -import com.baidu.hugegraph.tinkerpop.tests.HugeGraphWriteTest; +import org.apache.hugegraph.dist.RegisterUtil; /** * Standard process test suite for tinkerpop graph diff --git a/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/ProcessStandardTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/ProcessStandardTest.java new file mode 100644 index 000000000..08a72dccb --- /dev/null +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/ProcessStandardTest.java @@ -0,0 +1,29 @@ +/* + * Copyright 2017 HugeGraph Authors + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + */ + +package org.apache.hugegraph.tinkerpop; + +import org.apache.tinkerpop.gremlin.GraphProviderClass; +import org.junit.runner.RunWith; + +@RunWith(ProcessBasicSuite.class) +@GraphProviderClass(provider = ProcessTestGraphProvider.class, + graph = TestGraph.class) +public class ProcessStandardTest { +} diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/ProcessTestGraphProvider.java b/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/ProcessTestGraphProvider.java similarity index 96% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/ProcessTestGraphProvider.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/ProcessTestGraphProvider.java index 614992c92..42bffec8e 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/ProcessTestGraphProvider.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/ProcessTestGraphProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.tinkerpop; +package org.apache.hugegraph.tinkerpop; import java.io.IOException; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/StructureBasicSuite.java b/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/StructureBasicSuite.java similarity index 83% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/StructureBasicSuite.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/StructureBasicSuite.java index b6cb39e5f..20f8eec23 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/StructureBasicSuite.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/StructureBasicSuite.java @@ -1,23 +1,23 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * Copyright 2017 HugeGraph Authors * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations * under the License. */ -package com.baidu.hugegraph.tinkerpop; +package org.apache.hugegraph.tinkerpop; import org.apache.commons.configuration.ConfigurationException; import org.apache.tinkerpop.gremlin.AbstractGremlinSuite; @@ -56,7 +56,7 @@ import org.junit.runners.model.InitializationError; import org.junit.runners.model.RunnerBuilder; import org.junit.runners.model.Statement; -import com.baidu.hugegraph.dist.RegisterUtil; +import org.apache.hugegraph.dist.RegisterUtil; /** * Standard structure test suite for tinkerpop graph diff --git a/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/StructureStandardTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/StructureStandardTest.java new file mode 100644 index 000000000..c18dfa8b1 --- /dev/null +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/StructureStandardTest.java @@ -0,0 +1,29 @@ +/* + * Copyright 2017 HugeGraph Authors + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + */ + +package org.apache.hugegraph.tinkerpop; + +import org.apache.tinkerpop.gremlin.GraphProviderClass; +import org.junit.runner.RunWith; + +@RunWith(StructureBasicSuite.class) +@GraphProviderClass(provider = StructureTestGraphProvider.class, + graph = TestGraph.class) +public class StructureStandardTest { +} diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/StructureTestGraphProvider.java b/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/StructureTestGraphProvider.java similarity index 96% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/StructureTestGraphProvider.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/StructureTestGraphProvider.java index 8f3df2c23..963a35e1c 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/StructureTestGraphProvider.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/StructureTestGraphProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.tinkerpop; +package org.apache.hugegraph.tinkerpop; import java.io.IOException; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/TestGraph.java b/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/TestGraph.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/TestGraph.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/TestGraph.java index e0f873c30..9eadc72dd 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/TestGraph.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/TestGraph.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.tinkerpop; +package org.apache.hugegraph.tinkerpop; import java.util.ArrayList; import java.util.Arrays; @@ -34,25 +34,25 @@ import org.apache.tinkerpop.gremlin.structure.Transaction; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.io.Io; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.store.BackendStoreInfo; -import com.baidu.hugegraph.io.HugeGraphIoRegistry; -import com.baidu.hugegraph.io.HugeGraphSONModule; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.task.TaskScheduler; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.type.define.IdStrategy; -import com.baidu.hugegraph.type.define.NodeRole; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.store.BackendStoreInfo; +import org.apache.hugegraph.io.HugeGraphIoRegistry; +import org.apache.hugegraph.io.HugeGraphSONModule; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.task.TaskScheduler; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.type.define.IdStrategy; +import org.apache.hugegraph.type.define.NodeRole; import com.google.common.collect.ImmutableSet; -@Graph.OptIn("com.baidu.hugegraph.tinkerpop.StructureBasicSuite") -@Graph.OptIn("com.baidu.hugegraph.tinkerpop.ProcessBasicSuite") -@Graph.OptIn("com.baidu.hugegraph.tinkerpop.StructurePerformanceSuite") -@Graph.OptIn("com.baidu.hugegraph.tinkerpop.ProcessPerformanceSuite") +@Graph.OptIn("org.apache.hugegraph.tinkerpop.StructureBasicSuite") +@Graph.OptIn("org.apache.hugegraph.tinkerpop.ProcessBasicSuite") +@Graph.OptIn("org.apache.hugegraph.tinkerpop.StructurePerformanceSuite") +@Graph.OptIn("org.apache.hugegraph.tinkerpop.ProcessPerformanceSuite") public class TestGraph implements Graph { public static final String DEFAULT_VL = "vertex"; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/TestGraphFactory.java b/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/TestGraphFactory.java similarity index 92% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/TestGraphFactory.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/TestGraphFactory.java index 204cfa3fd..142cee12a 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/TestGraphFactory.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/TestGraphFactory.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.tinkerpop; +package org.apache.hugegraph.tinkerpop; -import com.baidu.hugegraph.HugeFactory; +import org.apache.hugegraph.HugeFactory; import org.apache.commons.configuration2.Configuration; public class TestGraphFactory { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/TestGraphProvider.java b/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/TestGraphProvider.java similarity index 96% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/TestGraphProvider.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/TestGraphProvider.java index 3a9a1fb1f..5f5d689ef 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/TestGraphProvider.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/TestGraphProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.tinkerpop; +package org.apache.hugegraph.tinkerpop; import java.io.BufferedReader; import java.io.File; @@ -46,18 +46,18 @@ import org.junit.Assert; import org.junit.Assume; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.config.CoreOptions; -import com.baidu.hugegraph.perf.PerfUtil.Watched; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeElement; -import com.baidu.hugegraph.structure.HugeProperty; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.structure.HugeVertexProperty; -import com.baidu.hugegraph.testutil.Utils; -import com.baidu.hugegraph.type.define.IdStrategy; -import com.baidu.hugegraph.util.E; -import com.baidu.hugegraph.util.Log; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.config.CoreOptions; +import org.apache.hugegraph.perf.PerfUtil.Watched; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeElement; +import org.apache.hugegraph.structure.HugeProperty; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.structure.HugeVertexProperty; +import org.apache.hugegraph.testutil.Utils; +import org.apache.hugegraph.type.define.IdStrategy; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.RateLimiter; @@ -86,7 +86,7 @@ public class TestGraphProvider extends AbstractGraphProvider { private static final String GREMLIN_GRAPH_KEY = "gremlin.graph"; private static final String GREMLIN_GRAPH_VALUE = - "com.baidu.hugegraph.tinkerpop.TestGraphFactory"; + "org.apache.hugegraph.tinkerpop.TestGraphFactory"; private static final String AKEY_CLASS_PREFIX = "org.apache.tinkerpop.gremlin.structure." + diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/tests/HugeGraphWriteTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/tests/HugeGraphWriteTest.java similarity index 52% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/tests/HugeGraphWriteTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/tests/HugeGraphWriteTest.java index 3c49e6bbf..27e997719 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/tinkerpop/tests/HugeGraphWriteTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/tests/HugeGraphWriteTest.java @@ -1,23 +1,23 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * Copyright 2017 HugeGraph Authors * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations * under the License. */ -package com.baidu.hugegraph.tinkerpop.tests; +package org.apache.hugegraph.tinkerpop.tests; import java.io.IOException; @@ -25,7 +25,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.IO; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; import org.apache.tinkerpop.gremlin.process.traversal.step.map.WriteTest; -import com.baidu.hugegraph.io.HugeGraphIoRegistry; +import org.apache.hugegraph.io.HugeGraphIoRegistry; public class HugeGraphWriteTest extends WriteTest.Traversals { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/BaseUnitTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/BaseUnitTest.java similarity index 93% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/BaseUnitTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/BaseUnitTest.java index 21eb2abef..ffdf643ae 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/BaseUnitTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/BaseUnitTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit; +package org.apache.hugegraph.unit; import java.util.ArrayList; import java.util.Collection; @@ -32,10 +32,10 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.slf4j.Logger; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.util.Log; -import com.baidu.hugegraph.util.TimeUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.util.Log; +import org.apache.hugegraph.util.TimeUtil; public class BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/FakeObjects.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/FakeObjects.java similarity index 90% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/FakeObjects.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/FakeObjects.java index 8daa55134..f7c991fc5 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/FakeObjects.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/FakeObjects.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit; +package org.apache.hugegraph.unit; import java.util.Date; @@ -25,24 +25,24 @@ import org.apache.commons.configuration2.Configuration; import org.apache.commons.configuration2.PropertiesConfiguration; import org.mockito.Mockito; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.EdgeId; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.type.define.Frequency; -import com.baidu.hugegraph.type.define.IdStrategy; -import com.baidu.hugegraph.type.define.IndexType; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.EdgeId; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.DataType; +import org.apache.hugegraph.type.define.Frequency; +import org.apache.hugegraph.type.define.IdStrategy; +import org.apache.hugegraph.type.define.IndexType; public final class FakeObjects { diff --git a/hugegraph-test/src/main/java/org/apache/hugegraph/unit/UnitTestSuite.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/UnitTestSuite.java new file mode 100644 index 000000000..1fed4872e --- /dev/null +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/UnitTestSuite.java @@ -0,0 +1,156 @@ +/* + * Copyright 2017 HugeGraph Authors + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + */ + +package org.apache.hugegraph.unit; + +import org.apache.hugegraph.unit.cassandra.CassandraTest; +import org.apache.hugegraph.unit.id.EdgeIdTest; +import org.apache.hugegraph.unit.id.IdTest; +import org.apache.hugegraph.unit.id.IdUtilTest; +import org.apache.hugegraph.unit.id.SplicingIdGeneratorTest; +import org.apache.hugegraph.unit.mysql.MysqlUtilTest; +import org.apache.hugegraph.unit.mysql.WhereBuilderTest; +import org.apache.hugegraph.unit.rocksdb.RocksDBCountersTest; +import org.apache.hugegraph.unit.rocksdb.RocksDBSessionTest; +import org.apache.hugegraph.unit.rocksdb.RocksDBSessionsTest; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +import org.apache.hugegraph.unit.core.SystemSchemaStoreTest; +import org.apache.hugegraph.unit.util.RateLimiterTest; +import org.apache.hugegraph.unit.cache.CacheManagerTest; +import org.apache.hugegraph.unit.cache.CacheTest; +import org.apache.hugegraph.unit.cache.CachedGraphTransactionTest; +import org.apache.hugegraph.unit.cache.CachedSchemaTransactionTest; +import org.apache.hugegraph.unit.cache.RamTableTest; +import org.apache.hugegraph.unit.core.AnalyzerTest; +import org.apache.hugegraph.unit.core.BackendMutationTest; +import org.apache.hugegraph.unit.core.BackendStoreInfoTest; +import org.apache.hugegraph.unit.core.ConditionQueryFlattenTest; +import org.apache.hugegraph.unit.core.ConditionTest; +import org.apache.hugegraph.unit.core.DataTypeTest; +import org.apache.hugegraph.unit.core.DirectionsTest; +import org.apache.hugegraph.unit.core.ExceptionTest; +import org.apache.hugegraph.unit.core.LocksTableTest; +import org.apache.hugegraph.unit.core.PageStateTest; +import org.apache.hugegraph.unit.core.QueryTest; +import org.apache.hugegraph.unit.core.RangeTest; +import org.apache.hugegraph.unit.core.RolePermissionTest; +import org.apache.hugegraph.unit.core.RowLockTest; +import org.apache.hugegraph.unit.core.SecurityManagerTest; +import org.apache.hugegraph.unit.core.SerialEnumTest; +import org.apache.hugegraph.unit.core.TraversalUtilTest; +import org.apache.hugegraph.unit.serializer.BinaryBackendEntryTest; +import org.apache.hugegraph.unit.serializer.BinaryScatterSerializerTest; +import org.apache.hugegraph.unit.serializer.BinarySerializerTest; +import org.apache.hugegraph.unit.serializer.BytesBufferTest; +import org.apache.hugegraph.unit.serializer.SerializerFactoryTest; +import org.apache.hugegraph.unit.serializer.StoreSerializerTest; +import org.apache.hugegraph.unit.serializer.TableBackendEntryTest; +import org.apache.hugegraph.unit.serializer.TextBackendEntryTest; +import org.apache.hugegraph.unit.util.CompressUtilTest; +import org.apache.hugegraph.unit.util.JsonUtilTest; +import org.apache.hugegraph.unit.util.StringEncodingTest; +import org.apache.hugegraph.unit.util.VersionTest; +import org.apache.hugegraph.unit.util.collection.CollectionFactoryTest; +import org.apache.hugegraph.unit.util.collection.IdSetTest; +import org.apache.hugegraph.unit.util.collection.Int2IntsMapTest; +import org.apache.hugegraph.unit.util.collection.IntMapTest; +import org.apache.hugegraph.unit.util.collection.IntSetTest; +import org.apache.hugegraph.unit.util.collection.ObjectIntMappingTest; + +@RunWith(Suite.class) +@Suite.SuiteClasses({ + /* cache */ + CacheTest.RamCacheTest.class, + CacheTest.OffheapCacheTest.class, + CacheTest.LevelCacheTest.class, + CachedSchemaTransactionTest.class, + CachedGraphTransactionTest.class, + CacheManagerTest.class, + RamTableTest.class, + + /* types */ + DataTypeTest.class, + DirectionsTest.class, + SerialEnumTest.class, + + /* id */ + IdTest.class, + EdgeIdTest.class, + IdUtilTest.class, + SplicingIdGeneratorTest.class, + + /* core */ + LocksTableTest.class, + RowLockTest.class, + AnalyzerTest.class, + BackendMutationTest.class, + ConditionTest.class, + ConditionQueryFlattenTest.class, + QueryTest.class, + RangeTest.class, + SecurityManagerTest.class, + RolePermissionTest.class, + ExceptionTest.class, + BackendStoreInfoTest.class, + TraversalUtilTest.class, + PageStateTest.class, + SystemSchemaStoreTest.class, + + /* serializer */ + BytesBufferTest.class, + SerializerFactoryTest.class, + TextBackendEntryTest.class, + TableBackendEntryTest.class, + BinaryBackendEntryTest.class, + BinarySerializerTest.class, + BinaryScatterSerializerTest.class, + StoreSerializerTest.class, + + /* cassandra */ + CassandraTest.class, + + /* mysql */ + MysqlUtilTest.class, + WhereBuilderTest.class, + + /* rocksdb */ + RocksDBSessionsTest.class, + RocksDBSessionTest.class, + RocksDBCountersTest.class, + + /* utils */ + VersionTest.class, + JsonUtilTest.class, + StringEncodingTest.class, + CompressUtilTest.class, + RateLimiterTest.FixedTimerWindowRateLimiterTest.class, + RateLimiterTest.FixedWatchWindowRateLimiterTest.class, + + /* utils.collection */ + CollectionFactoryTest.class, + ObjectIntMappingTest.class, + Int2IntsMapTest.class, + IdSetTest.class, + IntMapTest.class, + IntSetTest.class +}) +public class UnitTestSuite { +} diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/cache/CacheManagerTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/cache/CacheManagerTest.java similarity index 96% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/cache/CacheManagerTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/cache/CacheManagerTest.java index 5d3c807c8..8d13de875 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/cache/CacheManagerTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/cache/CacheManagerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.cache; +package org.apache.hugegraph.unit.cache; import java.lang.reflect.Proxy; import java.util.Map; @@ -28,15 +28,15 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import com.baidu.hugegraph.backend.cache.Cache; -import com.baidu.hugegraph.backend.cache.CacheManager; -import com.baidu.hugegraph.backend.cache.OffheapCache; -import com.baidu.hugegraph.backend.cache.RamCache; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.backend.cache.Cache; +import org.apache.hugegraph.backend.cache.CacheManager; +import org.apache.hugegraph.backend.cache.OffheapCache; +import org.apache.hugegraph.backend.cache.RamCache; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.unit.BaseUnitTest; import com.google.common.collect.ImmutableMap; public class CacheManagerTest extends BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/cache/CacheTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/cache/CacheTest.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/cache/CacheTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/cache/CacheTest.java index 574975031..7eb4a5b05 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/cache/CacheTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/cache/CacheTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.cache; +package org.apache.hugegraph.unit.cache; import java.util.Date; import java.util.HashMap; @@ -32,18 +32,18 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.cache.Cache; -import com.baidu.hugegraph.backend.cache.LevelCache; -import com.baidu.hugegraph.backend.cache.OffheapCache; -import com.baidu.hugegraph.backend.cache.RamCache; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.unit.BaseUnitTest; -import com.baidu.hugegraph.util.Blob; -import com.baidu.hugegraph.util.Bytes; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.cache.Cache; +import org.apache.hugegraph.backend.cache.LevelCache; +import org.apache.hugegraph.backend.cache.OffheapCache; +import org.apache.hugegraph.backend.cache.RamCache; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.util.Blob; +import org.apache.hugegraph.util.Bytes; public abstract class CacheTest extends BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/cache/CachedGraphTransactionTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/cache/CachedGraphTransactionTest.java similarity index 90% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/cache/CachedGraphTransactionTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/cache/CachedGraphTransactionTest.java index 0f9751588..3bb9e3d98 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/cache/CachedGraphTransactionTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/cache/CachedGraphTransactionTest.java @@ -17,29 +17,29 @@ * under the License. */ -package com.baidu.hugegraph.unit.cache; +package org.apache.hugegraph.unit.cache; import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.cache.CachedGraphTransaction; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.structure.HugeVertexProperty; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.IdStrategy; -import com.baidu.hugegraph.unit.BaseUnitTest; -import com.baidu.hugegraph.unit.FakeObjects; -import com.baidu.hugegraph.util.Events; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.backend.cache.CachedGraphTransaction; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.structure.HugeVertexProperty; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.IdStrategy; +import org.apache.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.unit.FakeObjects; +import org.apache.hugegraph.util.Events; public class CachedGraphTransactionTest extends BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/cache/CachedSchemaTransactionTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/cache/CachedSchemaTransactionTest.java similarity index 93% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/cache/CachedSchemaTransactionTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/cache/CachedSchemaTransactionTest.java index 469858e37..f57390bfa 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/cache/CachedSchemaTransactionTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/cache/CachedSchemaTransactionTest.java @@ -17,23 +17,23 @@ * under the License. */ -package com.baidu.hugegraph.unit.cache; +package org.apache.hugegraph.unit.cache; import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.HugeGraphParams; -import com.baidu.hugegraph.backend.cache.CachedSchemaTransaction; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.unit.BaseUnitTest; -import com.baidu.hugegraph.unit.FakeObjects; -import com.baidu.hugegraph.util.Events; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.HugeGraphParams; +import org.apache.hugegraph.backend.cache.CachedSchemaTransaction; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.unit.FakeObjects; +import org.apache.hugegraph.util.Events; import com.google.common.collect.ImmutableMap; public class CachedSchemaTransactionTest extends BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/cache/RamTableTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/cache/RamTableTest.java similarity index 94% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/cache/RamTableTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/cache/RamTableTest.java index 408dfc616..afbd0bc4c 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/cache/RamTableTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/cache/RamTableTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.cache; +package org.apache.hugegraph.unit.cache; import java.util.Iterator; @@ -25,19 +25,19 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.store.ram.RamTable; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.SchemaManager; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.unit.FakeObjects; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.store.ram.RamTable; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.SchemaManager; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.unit.FakeObjects; public class RamTableTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/cassandra/CassandraTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/cassandra/CassandraTest.java similarity index 94% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/cassandra/CassandraTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/cassandra/CassandraTest.java index 8c1236ac2..463388be0 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/cassandra/CassandraTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/cassandra/CassandraTest.java @@ -17,22 +17,22 @@ * under the License. */ -package com.baidu.hugegraph.unit.cassandra; +package org.apache.hugegraph.unit.cassandra; import java.util.Map; -import com.baidu.hugegraph.config.OptionSpace; +import org.apache.hugegraph.config.OptionSpace; import org.apache.commons.configuration2.Configuration; import org.apache.commons.configuration2.PropertiesConfiguration; import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.backend.store.cassandra.CassandraOptions; -import com.baidu.hugegraph.backend.store.cassandra.CassandraStore; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.backend.store.cassandra.CassandraOptions; +import org.apache.hugegraph.backend.store.cassandra.CassandraStore; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Whitebox; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -41,7 +41,7 @@ public class CassandraTest { @Before public void setup() { OptionSpace.register("cassandra", - "com.baidu.hugegraph.backend.store.cassandra.CassandraOptions"); + "org.apache.hugegraph.backend.store.cassandra.CassandraOptions"); } @After diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/AnalyzerTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/AnalyzerTest.java similarity index 98% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/AnalyzerTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/AnalyzerTest.java index c88488890..1e5940e78 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/AnalyzerTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/AnalyzerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.core; +package org.apache.hugegraph.unit.core; import java.util.Arrays; import java.util.HashSet; @@ -27,9 +27,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.analyzer.Analyzer; -import com.baidu.hugegraph.analyzer.AnalyzerFactory; -import com.baidu.hugegraph.testutil.Assert; +import org.apache.hugegraph.analyzer.Analyzer; +import org.apache.hugegraph.analyzer.AnalyzerFactory; +import org.apache.hugegraph.testutil.Assert; public class AnalyzerTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/BackendMutationTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/BackendMutationTest.java similarity index 95% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/BackendMutationTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/BackendMutationTest.java index d8a32865a..9527c1f1a 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/BackendMutationTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/BackendMutationTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.core; +package org.apache.hugegraph.unit.core; import java.util.List; @@ -25,17 +25,17 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.id.SplicingIdGenerator; -import com.baidu.hugegraph.backend.serializer.TextBackendEntry; -import com.baidu.hugegraph.backend.store.BackendAction; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendMutation; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Action; -import com.baidu.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.id.SplicingIdGenerator; +import org.apache.hugegraph.backend.serializer.TextBackendEntry; +import org.apache.hugegraph.backend.store.BackendAction; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendMutation; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Action; +import org.apache.hugegraph.unit.BaseUnitTest; public class BackendMutationTest extends BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/BackendStoreInfoTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/BackendStoreInfoTest.java similarity index 84% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/BackendStoreInfoTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/BackendStoreInfoTest.java index 7f5f9e9ad..e7ccfc111 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/BackendStoreInfoTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/BackendStoreInfoTest.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.unit.core; +package org.apache.hugegraph.unit.core; -import com.baidu.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.HugeConfig; import org.junit.Test; import org.mockito.Mockito; -import com.baidu.hugegraph.backend.store.BackendStore; -import com.baidu.hugegraph.backend.store.BackendStoreInfo; -import com.baidu.hugegraph.backend.store.BackendStoreProvider; -import com.baidu.hugegraph.testutil.Assert; +import org.apache.hugegraph.backend.store.BackendStore; +import org.apache.hugegraph.backend.store.BackendStoreInfo; +import org.apache.hugegraph.backend.store.BackendStoreProvider; +import org.apache.hugegraph.testutil.Assert; public class BackendStoreInfoTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/ConditionQueryFlattenTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/ConditionQueryFlattenTest.java similarity index 95% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/ConditionQueryFlattenTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/ConditionQueryFlattenTest.java index e0bd953ef..8422fca67 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/ConditionQueryFlattenTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/ConditionQueryFlattenTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.core; +package org.apache.hugegraph.unit.core; import java.util.ArrayList; import java.util.Collection; @@ -26,14 +26,14 @@ import java.util.List; import org.junit.After; import org.junit.Test; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.ConditionQueryFlatten; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.ConditionQueryFlatten; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.unit.BaseUnitTest; import com.google.common.collect.ImmutableList; public class ConditionQueryFlattenTest extends BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/ConditionTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/ConditionTest.java similarity index 98% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/ConditionTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/ConditionTest.java index 5877dafe7..b3a14a36f 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/ConditionTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/ConditionTest.java @@ -17,20 +17,20 @@ * under the License. */ -package com.baidu.hugegraph.unit.core; +package org.apache.hugegraph.unit.core; import java.util.Date; import org.junit.Test; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.query.Condition; -import com.baidu.hugegraph.backend.query.Condition.Relation; -import com.baidu.hugegraph.backend.query.Condition.RelationType; -import com.baidu.hugegraph.backend.query.Condition.SyspropRelation; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.query.Condition; +import org.apache.hugegraph.backend.query.Condition.Relation; +import org.apache.hugegraph.backend.query.Condition.RelationType; +import org.apache.hugegraph.backend.query.Condition.SyspropRelation; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.unit.BaseUnitTest; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/DataTypeTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/DataTypeTest.java similarity index 94% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/DataTypeTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/DataTypeTest.java index 121f86334..93c92ff5a 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/DataTypeTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/DataTypeTest.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.unit.core; +package org.apache.hugegraph.unit.core; import java.util.Date; import java.util.UUID; +import org.apache.hugegraph.testutil.Utils; import org.junit.Test; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Utils; -import com.baidu.hugegraph.type.define.DataType; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.define.DataType; public class DataTypeTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/DirectionsTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/DirectionsTest.java similarity index 93% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/DirectionsTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/DirectionsTest.java index 6f1cd1676..62ead0715 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/DirectionsTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/DirectionsTest.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.unit.core; +package org.apache.hugegraph.unit.core; import org.apache.tinkerpop.gremlin.structure.Direction; import org.junit.Test; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Directions; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Directions; public class DirectionsTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/ExceptionTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/ExceptionTest.java similarity index 91% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/ExceptionTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/ExceptionTest.java index 955ca49ec..1bc1b2495 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/ExceptionTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/ExceptionTest.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.unit.core; +package org.apache.hugegraph.unit.core; import java.util.Map; import org.junit.Test; -import com.baidu.hugegraph.exception.HugeGremlinException; -import com.baidu.hugegraph.testutil.Assert; +import org.apache.hugegraph.exception.HugeGremlinException; +import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/LocksTableTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/LocksTableTest.java similarity index 96% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/LocksTableTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/LocksTableTest.java index 7213880b8..27093a1d6 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/LocksTableTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/LocksTableTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.core; +package org.apache.hugegraph.unit.core; import java.util.List; import java.util.Map; @@ -29,13 +29,13 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.concurrent.LockManager; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.unit.BaseUnitTest; -import com.baidu.hugegraph.util.LockUtil; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.concurrent.LockManager; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.util.LockUtil; import com.google.common.collect.ImmutableSet; public class LocksTableTest extends BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/PageStateTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/PageStateTest.java similarity index 94% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/PageStateTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/PageStateTest.java index 6fd1860b6..14aaaf82d 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/PageStateTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/PageStateTest.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.unit.core; +package org.apache.hugegraph.unit.core; import java.util.Arrays; import org.junit.Test; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.page.PageState; -import com.baidu.hugegraph.testutil.Assert; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.page.PageState; +import org.apache.hugegraph.testutil.Assert; public class PageStateTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/QueryTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/QueryTest.java similarity index 91% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/QueryTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/QueryTest.java index dbfca5b50..da3309e09 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/QueryTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/QueryTest.java @@ -17,21 +17,21 @@ * under the License. */ -package com.baidu.hugegraph.unit.core; +package org.apache.hugegraph.unit.core; import org.junit.Test; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.query.Aggregate.AggregateFunc; -import com.baidu.hugegraph.backend.query.ConditionQuery; -import com.baidu.hugegraph.backend.query.IdPrefixQuery; -import com.baidu.hugegraph.backend.query.IdQuery; -import com.baidu.hugegraph.backend.query.IdRangeQuery; -import com.baidu.hugegraph.backend.query.Query; -import com.baidu.hugegraph.backend.query.Query.Order; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.query.Aggregate.AggregateFunc; +import org.apache.hugegraph.backend.query.ConditionQuery; +import org.apache.hugegraph.backend.query.IdPrefixQuery; +import org.apache.hugegraph.backend.query.IdQuery; +import org.apache.hugegraph.backend.query.IdRangeQuery; +import org.apache.hugegraph.backend.query.Query; +import org.apache.hugegraph.backend.query.Query.Order; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.HugeKeys; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/RangeTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/RangeTest.java similarity index 96% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/RangeTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/RangeTest.java index 6fb93a389..c1642288d 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/RangeTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/RangeTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.core; +package org.apache.hugegraph.unit.core; import java.util.List; @@ -26,9 +26,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.backend.store.BackendTable.ShardSplitter.Range; -import com.baidu.hugegraph.backend.store.Shard; -import com.baidu.hugegraph.testutil.Assert; +import org.apache.hugegraph.backend.store.BackendTable.ShardSplitter.Range; +import org.apache.hugegraph.backend.store.Shard; +import org.apache.hugegraph.testutil.Assert; public class RangeTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/RolePermissionTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/RolePermissionTest.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/RolePermissionTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/RolePermissionTest.java index 0478c8848..74bba7070 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/RolePermissionTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/RolePermissionTest.java @@ -17,27 +17,27 @@ * under the License. */ -package com.baidu.hugegraph.unit.core; +package org.apache.hugegraph.unit.core; import org.junit.Test; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.auth.HugePermission; -import com.baidu.hugegraph.auth.HugeProject; -import com.baidu.hugegraph.auth.HugeResource; -import com.baidu.hugegraph.auth.HugeResource.NameObject; -import com.baidu.hugegraph.auth.HugeTarget; -import com.baidu.hugegraph.auth.HugeUser; -import com.baidu.hugegraph.auth.ResourceObject; -import com.baidu.hugegraph.auth.ResourceType; -import com.baidu.hugegraph.auth.RolePermission; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.type.define.IdStrategy; -import com.baidu.hugegraph.unit.FakeObjects; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.auth.HugePermission; +import org.apache.hugegraph.auth.HugeProject; +import org.apache.hugegraph.auth.HugeResource; +import org.apache.hugegraph.auth.HugeResource.NameObject; +import org.apache.hugegraph.auth.HugeTarget; +import org.apache.hugegraph.auth.HugeUser; +import org.apache.hugegraph.auth.ResourceObject; +import org.apache.hugegraph.auth.ResourceType; +import org.apache.hugegraph.auth.RolePermission; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.type.define.IdStrategy; +import org.apache.hugegraph.unit.FakeObjects; import com.google.common.collect.ImmutableMap; public class RolePermissionTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/RowLockTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/RowLockTest.java similarity index 91% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/RowLockTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/RowLockTest.java index f03fe2139..b77733d6d 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/RowLockTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/RowLockTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.core; +package org.apache.hugegraph.unit.core; import java.util.ArrayList; import java.util.HashSet; @@ -30,11 +30,11 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.unit.BaseUnitTest; -import com.baidu.hugegraph.util.LockUtil; +import org.apache.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.util.LockUtil; -import static com.baidu.hugegraph.unit.core.LocksTableTest.destroyLockGroup; -import static com.baidu.hugegraph.unit.core.LocksTableTest.genLockGroup; +import static org.apache.hugegraph.unit.core.LocksTableTest.destroyLockGroup; +import static org.apache.hugegraph.unit.core.LocksTableTest.genLockGroup; public class RowLockTest extends BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/SecurityManagerTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/SecurityManagerTest.java similarity index 94% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/SecurityManagerTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/SecurityManagerTest.java index 9f04c875d..a5de13d5c 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/SecurityManagerTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/SecurityManagerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.core; +package org.apache.hugegraph.unit.core; import java.io.File; import java.io.FileDescriptor; @@ -38,19 +38,19 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.HugeFactory; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.job.GremlinJob; -import com.baidu.hugegraph.job.JobBuilder; -import com.baidu.hugegraph.security.HugeSecurityManager; -import com.baidu.hugegraph.task.HugeTask; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.define.NodeRole; -import com.baidu.hugegraph.unit.FakeObjects; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.HugeFactory; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.job.GremlinJob; +import org.apache.hugegraph.job.JobBuilder; +import org.apache.hugegraph.security.HugeSecurityManager; +import org.apache.hugegraph.task.HugeTask; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.define.NodeRole; +import org.apache.hugegraph.unit.FakeObjects; +import org.apache.hugegraph.util.JsonUtil; import com.google.common.collect.ImmutableMap; public class SecurityManagerTest { @@ -281,7 +281,7 @@ public class SecurityManagerTest { @Test public void testPackageDefinition() { - sm.checkPackageDefinition("com.baidu.hugegraph.util"); + sm.checkPackageDefinition("org.apache.hugegraph.util"); } @Test diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/SerialEnumTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/SerialEnumTest.java similarity index 88% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/SerialEnumTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/SerialEnumTest.java index e3afc7947..d94f295c6 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/SerialEnumTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/SerialEnumTest.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.unit.core; +package org.apache.hugegraph.unit.core; import org.junit.Test; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.SerialEnum; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.SerialEnum; public class SerialEnumTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/SystemSchemaStoreTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/SystemSchemaStoreTest.java similarity index 80% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/SystemSchemaStoreTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/SystemSchemaStoreTest.java index 92778c536..213fe7b9d 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/SystemSchemaStoreTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/SystemSchemaStoreTest.java @@ -17,19 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.unit.core; +package org.apache.hugegraph.unit.core; import org.junit.Test; import org.mockito.Mockito; -import com.baidu.hugegraph.HugeGraph; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.store.SystemSchemaStore; -import com.baidu.hugegraph.schema.SchemaElement; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.HugeGraph; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.store.SystemSchemaStore; +import org.apache.hugegraph.schema.SchemaElement; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Whitebox; public class SystemSchemaStoreTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/TraversalUtilTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/TraversalUtilTest.java similarity index 98% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/TraversalUtilTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/TraversalUtilTest.java index 3d89eeffa..a5fcb7462 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/TraversalUtilTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/core/TraversalUtilTest.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.unit.core; +package org.apache.hugegraph.unit.core; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.junit.Test; -import com.baidu.hugegraph.HugeException; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.traversal.optimize.TraversalUtil; -import com.baidu.hugegraph.util.DateUtil; +import org.apache.hugegraph.HugeException; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.traversal.optimize.TraversalUtil; +import org.apache.hugegraph.util.DateUtil; public class TraversalUtilTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/id/EdgeIdTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/id/EdgeIdTest.java similarity index 93% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/id/EdgeIdTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/id/EdgeIdTest.java index b48c67eef..6e89bfde5 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/id/EdgeIdTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/id/EdgeIdTest.java @@ -17,20 +17,20 @@ * under the License. */ -package com.baidu.hugegraph.unit.id; +package org.apache.hugegraph.unit.id; import java.util.Set; +import org.apache.hugegraph.unit.BaseUnitTest; import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.backend.id.EdgeId; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.backend.id.EdgeId; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.define.Directions; import com.google.common.collect.ImmutableSet; public class EdgeIdTest extends BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/id/IdTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/id/IdTest.java similarity index 95% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/id/IdTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/id/IdTest.java index f77652255..a8469491c 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/id/IdTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/id/IdTest.java @@ -17,20 +17,20 @@ * under the License. */ -package com.baidu.hugegraph.unit.id; +package org.apache.hugegraph.unit.id; import java.nio.ByteBuffer; import java.util.UUID; +import org.apache.hugegraph.unit.BaseUnitTest; import org.junit.Test; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.Id.IdType; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.unit.BaseUnitTest; -import com.baidu.hugegraph.util.NumericUtil; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.Id.IdType; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.util.NumericUtil; +import org.apache.hugegraph.util.StringEncoding; import com.google.common.primitives.Bytes; public class IdTest extends BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/id/IdUtilTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/id/IdUtilTest.java similarity index 96% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/id/IdUtilTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/id/IdUtilTest.java index 0eef593f2..ac0bde2e8 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/id/IdUtilTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/id/IdUtilTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 HugeGraph Authors + * Copyright 2017 HugeGraph Authors * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with this @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.unit.id; +package org.apache.hugegraph.unit.id; import java.nio.ByteBuffer; import org.junit.Assert; import org.junit.Test; -import com.baidu.hugegraph.backend.id.EdgeId; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.id.IdUtil; +import org.apache.hugegraph.backend.id.EdgeId; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.id.IdUtil; public class IdUtilTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/id/SplicingIdGeneratorTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/id/SplicingIdGeneratorTest.java similarity index 89% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/id/SplicingIdGeneratorTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/id/SplicingIdGeneratorTest.java index 03451464e..2639229a0 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/id/SplicingIdGeneratorTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/id/SplicingIdGeneratorTest.java @@ -17,22 +17,22 @@ * under the License. */ -package com.baidu.hugegraph.unit.id; +package org.apache.hugegraph.unit.id; import java.util.List; +import org.apache.hugegraph.unit.FakeObjects; import org.junit.Test; import org.mockito.Mockito; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.id.SplicingIdGenerator; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.define.IdStrategy; -import com.baidu.hugegraph.unit.FakeObjects; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.id.SplicingIdGenerator; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.define.IdStrategy; import com.google.common.collect.ImmutableList; public class SplicingIdGeneratorTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/mysql/MysqlUtilTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/mysql/MysqlUtilTest.java similarity index 92% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/mysql/MysqlUtilTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/mysql/MysqlUtilTest.java index d8fa4b089..a75e6d6b6 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/mysql/MysqlUtilTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/mysql/MysqlUtilTest.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.unit.mysql; +package org.apache.hugegraph.unit.mysql; import org.junit.Test; -import com.baidu.hugegraph.backend.store.mysql.MysqlUtil; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.backend.store.mysql.MysqlUtil; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.unit.BaseUnitTest; public class MysqlUtilTest extends BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/mysql/WhereBuilderTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/mysql/WhereBuilderTest.java similarity index 93% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/mysql/WhereBuilderTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/mysql/WhereBuilderTest.java index b37e98e0b..f274d91e2 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/mysql/WhereBuilderTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/mysql/WhereBuilderTest.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.unit.mysql; +package org.apache.hugegraph.unit.mysql; import org.junit.Test; -import com.baidu.hugegraph.backend.query.Condition.RelationType; -import com.baidu.hugegraph.backend.store.mysql.WhereBuilder; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.backend.query.Condition.RelationType; +import org.apache.hugegraph.backend.store.mysql.WhereBuilder; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.unit.BaseUnitTest; import com.google.common.collect.ImmutableList; public class WhereBuilderTest extends BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/rocksdb/BaseRocksDBUnitTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/rocksdb/BaseRocksDBUnitTest.java similarity index 92% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/rocksdb/BaseRocksDBUnitTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/rocksdb/BaseRocksDBUnitTest.java index c9859e73d..3fe7fe66a 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/rocksdb/BaseRocksDBUnitTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/rocksdb/BaseRocksDBUnitTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.rocksdb; +package org.apache.hugegraph.unit.rocksdb; import java.io.IOException; import java.nio.ByteBuffer; @@ -30,11 +30,11 @@ import org.junit.AfterClass; import org.junit.Before; import org.rocksdb.RocksDBException; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBSessions; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBStdSessions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.unit.BaseUnitTest; -import com.baidu.hugegraph.unit.FakeObjects; +import org.apache.hugegraph.backend.store.rocksdb.RocksDBSessions; +import org.apache.hugegraph.backend.store.rocksdb.RocksDBStdSessions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.unit.FakeObjects; public class BaseRocksDBUnitTest extends BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/rocksdb/RocksDBCountersTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/rocksdb/RocksDBCountersTest.java similarity index 91% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/rocksdb/RocksDBCountersTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/rocksdb/RocksDBCountersTest.java index 097ce90c7..e2453cf0c 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/rocksdb/RocksDBCountersTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/rocksdb/RocksDBCountersTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.rocksdb; +package org.apache.hugegraph.unit.rocksdb; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -27,12 +27,12 @@ import org.junit.Before; import org.junit.Test; import org.rocksdb.RocksDBException; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBSessions.Session; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBTables; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.HugeType; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.store.rocksdb.RocksDBSessions.Session; +import org.apache.hugegraph.backend.store.rocksdb.RocksDBTables; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.HugeType; public class RocksDBCountersTest extends BaseRocksDBUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/rocksdb/RocksDBPerfTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/rocksdb/RocksDBPerfTest.java similarity index 96% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/rocksdb/RocksDBPerfTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/rocksdb/RocksDBPerfTest.java index ded05734e..4f6bbea23 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/rocksdb/RocksDBPerfTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/rocksdb/RocksDBPerfTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.rocksdb; +package org.apache.hugegraph.unit.rocksdb; import java.util.Arrays; import java.util.HashMap; @@ -29,9 +29,9 @@ import java.util.Random; import org.junit.Test; import org.rocksdb.RocksDBException; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumn; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumnIterator; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBSessions.Session; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumn; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumnIterator; +import org.apache.hugegraph.backend.store.rocksdb.RocksDBSessions.Session; public class RocksDBPerfTest extends BaseRocksDBUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/rocksdb/RocksDBSessionTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/rocksdb/RocksDBSessionTest.java similarity index 98% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/rocksdb/RocksDBSessionTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/rocksdb/RocksDBSessionTest.java index 3abc3c936..49bd250f7 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/rocksdb/RocksDBSessionTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/rocksdb/RocksDBSessionTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.rocksdb; +package org.apache.hugegraph.unit.rocksdb; import java.nio.ByteBuffer; import java.util.Arrays; @@ -26,15 +26,15 @@ import java.util.Iterator; import java.util.Map; import java.util.Random; -import com.baidu.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.unit.BaseUnitTest; import org.junit.Assume; import org.junit.Test; import org.rocksdb.RocksDBException; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumn; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumnIterator; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBSessions.Session; -import com.baidu.hugegraph.testutil.Assert; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumn; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumnIterator; +import org.apache.hugegraph.backend.store.rocksdb.RocksDBSessions.Session; +import org.apache.hugegraph.testutil.Assert; public class RocksDBSessionTest extends BaseRocksDBUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/rocksdb/RocksDBSessionsTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/rocksdb/RocksDBSessionsTest.java similarity index 94% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/rocksdb/RocksDBSessionsTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/rocksdb/RocksDBSessionsTest.java index 71e497f59..fdec647a5 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/rocksdb/RocksDBSessionsTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/rocksdb/RocksDBSessionsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.rocksdb; +package org.apache.hugegraph.unit.rocksdb; import java.io.File; import java.io.IOException; @@ -26,14 +26,14 @@ import org.apache.commons.io.FileUtils; import org.junit.Test; import org.rocksdb.RocksDBException; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBMetrics; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBOptions; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBSessions; -import com.baidu.hugegraph.backend.store.rocksdb.RocksDBStdSessions; -import com.baidu.hugegraph.backend.store.rocksdbsst.RocksDBSstSessions; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.unit.FakeObjects; +import org.apache.hugegraph.backend.store.rocksdb.RocksDBMetrics; +import org.apache.hugegraph.backend.store.rocksdb.RocksDBOptions; +import org.apache.hugegraph.backend.store.rocksdb.RocksDBSessions; +import org.apache.hugegraph.backend.store.rocksdb.RocksDBStdSessions; +import org.apache.hugegraph.backend.store.rocksdbsst.RocksDBSstSessions; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.unit.FakeObjects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/BinaryBackendEntryTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/BinaryBackendEntryTest.java similarity index 93% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/BinaryBackendEntryTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/BinaryBackendEntryTest.java index 8674f944a..12f81ad46 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/BinaryBackendEntryTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/BinaryBackendEntryTest.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.unit.serializer; +package org.apache.hugegraph.unit.serializer; import org.junit.Test; -import com.baidu.hugegraph.backend.serializer.BinaryBackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumn; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.backend.serializer.BinaryBackendEntry; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumn; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.unit.BaseUnitTest; import com.google.common.collect.ImmutableList; public class BinaryBackendEntryTest extends BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/BinaryScatterSerializerTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/BinaryScatterSerializerTest.java similarity index 85% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/BinaryScatterSerializerTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/BinaryScatterSerializerTest.java index 972892145..e6ad08fbe 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/BinaryScatterSerializerTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/BinaryScatterSerializerTest.java @@ -17,20 +17,20 @@ * under the License. */ -package com.baidu.hugegraph.unit.serializer; +package org.apache.hugegraph.unit.serializer; -import com.baidu.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.HugeConfig; import org.junit.Test; -import com.baidu.hugegraph.backend.serializer.BinaryBackendEntry; -import com.baidu.hugegraph.backend.serializer.BinaryScatterSerializer; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.unit.BaseUnitTest; -import com.baidu.hugegraph.unit.FakeObjects; +import org.apache.hugegraph.backend.serializer.BinaryBackendEntry; +import org.apache.hugegraph.backend.serializer.BinaryScatterSerializer; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.unit.FakeObjects; public class BinaryScatterSerializerTest extends BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/BinarySerializerTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/BinarySerializerTest.java similarity index 91% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/BinarySerializerTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/BinarySerializerTest.java index 503255a56..e390dd645 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/BinarySerializerTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/BinarySerializerTest.java @@ -17,19 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.unit.serializer; +package org.apache.hugegraph.unit.serializer; -import com.baidu.hugegraph.config.HugeConfig; +import org.apache.hugegraph.config.HugeConfig; import org.junit.Test; -import com.baidu.hugegraph.backend.serializer.BinarySerializer; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.unit.BaseUnitTest; -import com.baidu.hugegraph.unit.FakeObjects; +import org.apache.hugegraph.backend.serializer.BinarySerializer; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.unit.FakeObjects; public class BinarySerializerTest extends BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/BytesBufferTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/BytesBufferTest.java similarity index 98% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/BytesBufferTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/BytesBufferTest.java index bb100a9ee..b73bc470c 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/BytesBufferTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/BytesBufferTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.serializer; +package org.apache.hugegraph.unit.serializer; import java.awt.Point; import java.util.Arrays; @@ -31,17 +31,17 @@ import java.util.UUID; import org.junit.Test; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.id.IdGenerator.UuidId; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.unit.BaseUnitTest; -import com.baidu.hugegraph.unit.FakeObjects; -import com.baidu.hugegraph.util.Blob; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.id.IdGenerator.UuidId; +import org.apache.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.DataType; +import org.apache.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.unit.FakeObjects; +import org.apache.hugegraph.util.Blob; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/SerializerFactoryTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/SerializerFactoryTest.java similarity index 79% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/SerializerFactoryTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/SerializerFactoryTest.java index 4889af4a3..3a81fa804 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/SerializerFactoryTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/SerializerFactoryTest.java @@ -17,20 +17,20 @@ * under the License. */ -package com.baidu.hugegraph.unit.serializer; +package org.apache.hugegraph.unit.serializer; import org.junit.Test; -import com.baidu.hugegraph.backend.BackendException; -import com.baidu.hugegraph.backend.serializer.AbstractSerializer; -import com.baidu.hugegraph.backend.serializer.BinaryScatterSerializer; -import com.baidu.hugegraph.backend.serializer.BinarySerializer; -import com.baidu.hugegraph.backend.serializer.SerializerFactory; -import com.baidu.hugegraph.backend.serializer.TextSerializer; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.unit.BaseUnitTest; -import com.baidu.hugegraph.unit.FakeObjects; +import org.apache.hugegraph.backend.BackendException; +import org.apache.hugegraph.backend.serializer.AbstractSerializer; +import org.apache.hugegraph.backend.serializer.BinaryScatterSerializer; +import org.apache.hugegraph.backend.serializer.BinarySerializer; +import org.apache.hugegraph.backend.serializer.SerializerFactory; +import org.apache.hugegraph.backend.serializer.TextSerializer; +import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.unit.FakeObjects; public class SerializerFactoryTest extends BaseUnitTest { @@ -70,14 +70,14 @@ public class SerializerFactoryTest extends BaseUnitTest { Assert.assertThrows(BackendException.class, () -> { // invalid class - SerializerFactory.register("fake", "com.baidu.hugegraph.Invalid"); + SerializerFactory.register("fake", "org.apache.hugegraph.Invalid"); }, e -> { Assert.assertContains("Invalid class:", e.getMessage()); }); Assert.assertThrows(BackendException.class, () -> { // subclass - SerializerFactory.register("fake", "com.baidu.hugegraph.HugeGraph"); + SerializerFactory.register("fake", "org.apache.hugegraph.HugeGraph"); }, e -> { Assert.assertContains("Class is not a subclass of class", e.getMessage()); diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/StoreSerializerTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/StoreSerializerTest.java similarity index 81% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/StoreSerializerTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/StoreSerializerTest.java index 21dd2ddf0..57058e5e2 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/StoreSerializerTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/StoreSerializerTest.java @@ -17,24 +17,24 @@ * under the License. */ -package com.baidu.hugegraph.unit.serializer; +package org.apache.hugegraph.unit.serializer; import java.util.Iterator; import org.junit.Test; -import com.baidu.hugegraph.backend.serializer.BinaryBackendEntry; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; -import com.baidu.hugegraph.backend.store.BackendAction; -import com.baidu.hugegraph.backend.store.BackendEntry; -import com.baidu.hugegraph.backend.store.BackendMutation; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction; -import com.baidu.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType; -import com.baidu.hugegraph.backend.store.raft.StoreCommand; -import com.baidu.hugegraph.backend.store.raft.StoreSerializer; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Action; +import org.apache.hugegraph.backend.serializer.BinaryBackendEntry; +import org.apache.hugegraph.backend.serializer.BytesBuffer; +import org.apache.hugegraph.backend.store.BackendAction; +import org.apache.hugegraph.backend.store.BackendEntry; +import org.apache.hugegraph.backend.store.BackendMutation; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreAction; +import org.apache.hugegraph.backend.store.raft.rpc.RaftRequests.StoreType; +import org.apache.hugegraph.backend.store.raft.StoreCommand; +import org.apache.hugegraph.backend.store.raft.StoreSerializer; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Action; public class StoreSerializerTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/TableBackendEntryTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/TableBackendEntryTest.java similarity index 93% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/TableBackendEntryTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/TableBackendEntryTest.java index 8837692af..52c574f7f 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/TableBackendEntryTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/TableBackendEntryTest.java @@ -17,20 +17,20 @@ * under the License. */ -package com.baidu.hugegraph.unit.serializer; +package org.apache.hugegraph.unit.serializer; import org.apache.commons.lang3.NotImplementedException; import org.junit.Test; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.serializer.TableBackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumn; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.serializer.TableBackendEntry; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumn; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.unit.BaseUnitTest; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/TextBackendEntryTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/TextBackendEntryTest.java similarity index 89% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/TextBackendEntryTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/TextBackendEntryTest.java index 9edfba0ca..20789d934 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/TextBackendEntryTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/serializer/TextBackendEntryTest.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.unit.serializer; +package org.apache.hugegraph.unit.serializer; import org.junit.Test; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.backend.serializer.TextBackendEntry; -import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumn; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.HugeKeys; -import com.baidu.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.backend.serializer.TextBackendEntry; +import org.apache.hugegraph.backend.store.BackendEntry.BackendColumn; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.HugeKeys; +import org.apache.hugegraph.unit.BaseUnitTest; import com.google.common.collect.ImmutableList; public class TextBackendEntryTest extends BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/CompressUtilTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/CompressUtilTest.java similarity index 87% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/CompressUtilTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/CompressUtilTest.java index c3b8f7c73..b2ddc9aa8 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/CompressUtilTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/CompressUtilTest.java @@ -1,21 +1,23 @@ /* + * Copyright 2017 HugeGraph Authors + * * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. */ -package com.baidu.hugegraph.unit.util; +package org.apache.hugegraph.unit.util; import java.io.File; import java.io.IOException; @@ -32,7 +34,7 @@ import org.apache.commons.io.FileUtils; import org.junit.Test; import com.alipay.sofa.jraft.util.CRC64; -import com.baidu.hugegraph.util.CompressUtil; +import org.apache.hugegraph.util.CompressUtil; import com.google.common.collect.ImmutableList; import junit.framework.AssertionFailedError; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/JsonUtilTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/JsonUtilTest.java similarity index 91% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/JsonUtilTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/JsonUtilTest.java index a65de1d34..84bca00be 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/JsonUtilTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/JsonUtilTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.util; +package org.apache.hugegraph.unit.util; import java.util.Arrays; import java.util.Date; @@ -25,36 +25,36 @@ import java.util.List; import java.util.UUID; import org.apache.tinkerpop.shaded.jackson.core.type.TypeReference; +import org.apache.hugegraph.testutil.Utils; import org.eclipse.collections.api.map.primitive.MutableIntObjectMap; import org.junit.Test; import org.mockito.Mockito; -import com.baidu.hugegraph.backend.id.EdgeId; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.schema.EdgeLabel; -import com.baidu.hugegraph.schema.IndexLabel; -import com.baidu.hugegraph.schema.PropertyKey; -import com.baidu.hugegraph.schema.VertexLabel; -import com.baidu.hugegraph.structure.HugeEdge; -import com.baidu.hugegraph.structure.HugeEdgeProperty; -import com.baidu.hugegraph.structure.HugeProperty; -import com.baidu.hugegraph.structure.HugeVertex; -import com.baidu.hugegraph.structure.HugeVertexProperty; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Utils; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.type.define.Cardinality; -import com.baidu.hugegraph.type.define.DataType; -import com.baidu.hugegraph.type.define.Directions; -import com.baidu.hugegraph.type.define.Frequency; -import com.baidu.hugegraph.type.define.IdStrategy; -import com.baidu.hugegraph.type.define.IndexType; -import com.baidu.hugegraph.unit.BaseUnitTest; -import com.baidu.hugegraph.unit.FakeObjects; -import com.baidu.hugegraph.util.JsonUtil; -import com.baidu.hugegraph.util.collection.CollectionFactory; +import org.apache.hugegraph.backend.id.EdgeId; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.schema.EdgeLabel; +import org.apache.hugegraph.schema.IndexLabel; +import org.apache.hugegraph.schema.PropertyKey; +import org.apache.hugegraph.schema.VertexLabel; +import org.apache.hugegraph.structure.HugeEdge; +import org.apache.hugegraph.structure.HugeEdgeProperty; +import org.apache.hugegraph.structure.HugeProperty; +import org.apache.hugegraph.structure.HugeVertex; +import org.apache.hugegraph.structure.HugeVertexProperty; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.type.HugeType; +import org.apache.hugegraph.type.define.Cardinality; +import org.apache.hugegraph.type.define.DataType; +import org.apache.hugegraph.type.define.Directions; +import org.apache.hugegraph.type.define.Frequency; +import org.apache.hugegraph.type.define.IdStrategy; +import org.apache.hugegraph.type.define.IndexType; +import org.apache.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.unit.FakeObjects; +import org.apache.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.collection.CollectionFactory; import com.google.common.collect.ImmutableList; public class JsonUtilTest extends BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/RateLimiterTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/RateLimiterTest.java similarity index 95% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/RateLimiterTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/RateLimiterTest.java index d4d63e437..47d0608ff 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/RateLimiterTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/RateLimiterTest.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.unit.util; +package org.apache.hugegraph.unit.util; import java.util.concurrent.atomic.LongAdder; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.util.FixedTimerWindowRateLimiter; -import com.baidu.hugegraph.util.FixedWatchWindowRateLimiter; -import com.baidu.hugegraph.util.RateLimiter; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.util.FixedTimerWindowRateLimiter; +import org.apache.hugegraph.util.FixedWatchWindowRateLimiter; +import org.apache.hugegraph.util.RateLimiter; public abstract class RateLimiterTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/StringEncodingTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/StringEncodingTest.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/StringEncodingTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/StringEncodingTest.java index 6eb5ce9c6..8b84eacf8 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/StringEncodingTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/StringEncodingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 HugeGraph Authors + * Copyright 2017 HugeGraph Authors * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with this @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.unit.util; +package org.apache.hugegraph.unit.util; import java.util.UUID; import org.junit.Test; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.StringEncoding; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.util.Bytes; +import org.apache.hugegraph.util.StringEncoding; public class StringEncodingTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/VersionTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/VersionTest.java similarity index 87% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/VersionTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/VersionTest.java index 6da79fb86..10b6e291f 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/VersionTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/VersionTest.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.unit.util; +package org.apache.hugegraph.unit.util; import org.junit.Test; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.util.VersionUtil; -import com.baidu.hugegraph.version.CoreVersion; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.util.VersionUtil; +import org.apache.hugegraph.version.CoreVersion; public class VersionTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/collection/CollectionFactoryTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/collection/CollectionFactoryTest.java similarity index 94% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/collection/CollectionFactoryTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/collection/CollectionFactoryTest.java index bdcd91f4e..ad5c41851 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/collection/CollectionFactoryTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/collection/CollectionFactoryTest.java @@ -1,21 +1,23 @@ /* + * Copyright 2017 HugeGraph Authors + * * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. */ -package com.baidu.hugegraph.unit.util.collection; +package org.apache.hugegraph.unit.util.collection; import java.util.ArrayList; import java.util.Collection; @@ -33,12 +35,12 @@ import org.eclipse.collections.impl.set.mutable.UnifiedSet; import org.eclipse.collections.impl.set.mutable.primitive.LongHashSet; import org.junit.Test; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.type.define.CollectionType; -import com.baidu.hugegraph.util.collection.CollectionFactory; -import com.baidu.hugegraph.util.collection.IdSet; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.type.define.CollectionType; +import org.apache.hugegraph.util.collection.CollectionFactory; +import org.apache.hugegraph.util.collection.IdSet; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/collection/IdSetTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/collection/IdSetTest.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/collection/IdSetTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/collection/IdSetTest.java index 7c52a6230..5afaf6b62 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/collection/IdSetTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/collection/IdSetTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.util.collection; +package org.apache.hugegraph.unit.util.collection; import java.util.HashSet; import java.util.Iterator; @@ -31,12 +31,12 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Whitebox; -import com.baidu.hugegraph.type.define.CollectionType; -import com.baidu.hugegraph.util.collection.IdSet; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.testutil.Whitebox; +import org.apache.hugegraph.type.define.CollectionType; +import org.apache.hugegraph.util.collection.IdSet; public class IdSetTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/collection/Int2IntsMapTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/collection/Int2IntsMapTest.java similarity index 97% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/collection/Int2IntsMapTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/collection/Int2IntsMapTest.java index a94f0483f..4369ffd07 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/collection/Int2IntsMapTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/collection/Int2IntsMapTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.util.collection; +package org.apache.hugegraph.unit.util.collection; import java.util.HashSet; import java.util.Random; @@ -27,8 +27,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.util.collection.Int2IntsMap; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.util.collection.Int2IntsMap; public class Int2IntsMapTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/collection/IntMapTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/collection/IntMapTest.java similarity index 98% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/collection/IntMapTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/collection/IntMapTest.java index c195bc3da..85d193f95 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/collection/IntMapTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/collection/IntMapTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.util.collection; +package org.apache.hugegraph.unit.util.collection; import java.util.HashMap; import java.util.Map; @@ -30,10 +30,10 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.unit.BaseUnitTest; -import com.baidu.hugegraph.util.collection.IntIterator; -import com.baidu.hugegraph.util.collection.IntMap; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.util.collection.IntIterator; +import org.apache.hugegraph.util.collection.IntMap; public class IntMapTest extends BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/collection/IntSetTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/collection/IntSetTest.java similarity index 96% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/collection/IntSetTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/collection/IntSetTest.java index ceb05d427..cdd2b3db8 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/collection/IntSetTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/collection/IntSetTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.util.collection; +package org.apache.hugegraph.unit.util.collection; import java.util.HashSet; import java.util.Random; @@ -27,9 +27,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.unit.BaseUnitTest; -import com.baidu.hugegraph.util.collection.IntSet; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.unit.BaseUnitTest; +import org.apache.hugegraph.util.collection.IntSet; public class IntSetTest extends BaseUnitTest { diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/collection/ObjectIntMappingTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/collection/ObjectIntMappingTest.java similarity index 93% rename from hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/collection/ObjectIntMappingTest.java rename to hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/collection/ObjectIntMappingTest.java index 66f805baa..8121c3591 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/collection/ObjectIntMappingTest.java +++ b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/collection/ObjectIntMappingTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit.util.collection; +package org.apache.hugegraph.unit.util.collection; import java.util.Iterator; import java.util.LinkedHashSet; @@ -28,11 +28,11 @@ import org.apache.commons.lang.RandomStringUtils; import org.junit.After; import org.junit.Test; -import com.baidu.hugegraph.backend.id.Id; -import com.baidu.hugegraph.backend.id.IdGenerator; -import com.baidu.hugegraph.testutil.Assert; -import com.baidu.hugegraph.util.collection.ObjectIntMappingFactory; -import com.baidu.hugegraph.util.collection.ObjectIntMapping; +import org.apache.hugegraph.backend.id.Id; +import org.apache.hugegraph.backend.id.IdGenerator; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.util.collection.ObjectIntMappingFactory; +import org.apache.hugegraph.util.collection.ObjectIntMapping; public class ObjectIntMappingTest { diff --git a/hugegraph-test/src/main/resources/hugegraph.properties b/hugegraph-test/src/main/resources/hugegraph.properties index 67203c87a..b6d52ab1f 100644 --- a/hugegraph-test/src/main/resources/hugegraph.properties +++ b/hugegraph-test/src/main/resources/hugegraph.properties @@ -1,4 +1,4 @@ -gremlin.graph=com.baidu.hugegraph.HugeFactory +gremlin.graph=org.apache.hugegraph.HugeFactory backend=${backend} serializer=${serializer} diff --git a/hugegraph-test/src/main/resources/log4j2.xml b/hugegraph-test/src/main/resources/log4j2.xml index 7810ea470..e71371b26 100644 --- a/hugegraph-test/src/main/resources/log4j2.xml +++ b/hugegraph-test/src/main/resources/log4j2.xml @@ -112,15 +112,15 @@ - + - + - + diff --git a/pom.xml b/pom.xml index 5541d531c..a51ef9b0c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,9 +2,9 @@ 4.0.0 - com.baidu.hugegraph + org.apache.hugegraph hugegraph - 0.13.0 + ${revision} pom 3.3.9 @@ -88,6 +88,7 @@ + 1.0.0 UTF-8 ${project.basedir}/.. hugegraph @@ -108,8 +109,8 @@ bash 3.1.2 8.45 - 2.0.1 - 2.1.2 + 1.0.0 + 1.0.0 1.47.0 3.21.7 @@ -132,12 +133,12 @@ - com.baidu.hugegraph + org.apache.hugegraph hugegraph-rpc ${hugegraph-rpc.version} - com.baidu.hugegraph + org.apache.hugegraph hugegraph-common ${hugegraph-common.version} @@ -423,6 +424,7 @@ **/META-INF/MANIFEST.MF .repository/** + **/.flattened-pom.xml true @@ -670,4 +672,19 @@ + + + + staged-releases + staged-releases + https://repository.apache.org/content/groups/staging/ + default + + true + + + false + + +