diff --git a/hugegraph-cluster-test/hugegraph-clustertest-dist/src/assembly/static/server/computer.yaml b/hugegraph-cluster-test/hugegraph-clustertest-dist/src/assembly/static/server/computer.yaml deleted file mode 100644 index 1c69388bb0..0000000000 --- a/hugegraph-cluster-test/hugegraph-clustertest-dist/src/assembly/static/server/computer.yaml +++ /dev/null @@ -1,39 +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. -# -# common parameters -common: { - worker_heap: 10000, - vertex_input_dir: /data, - workers: 51, - zookeeper_list: "127.0.0.1:2181", - max_edges_per_segment: 10485760, - edges_immutable: true, - partitions: 255, - compute_threads: 5, - input_threads: 5, - message_async: false, - message_queue_size: 1000, - message_send_threads: 10, - messages_per_segment: 104857600, - hugegraph_url: "http://127.0.0.1:8080", - hugegraph_name: hugegraph, - hugegraph_timeout: 60 -} - -env: { - computer_home: /home/computer -} diff --git a/hugegraph-cluster-test/hugegraph-clustertest-dist/src/assembly/static/server/hugegraph-server.keystore b/hugegraph-cluster-test/hugegraph-clustertest-dist/src/assembly/static/server/hugegraph-server.keystore deleted file mode 100644 index e60c6b4c4c..0000000000 Binary files a/hugegraph-cluster-test/hugegraph-clustertest-dist/src/assembly/static/server/hugegraph-server.keystore and /dev/null differ diff --git a/hugegraph-cluster-test/hugegraph-clustertest-dist/src/assembly/static/server/scripts/empty-sample.groovy b/hugegraph-cluster-test/hugegraph-clustertest-dist/src/assembly/static/server/scripts/empty-sample.groovy deleted file mode 100644 index 85e3669dc6..0000000000 --- a/hugegraph-cluster-test/hugegraph-clustertest-dist/src/assembly/static/server/scripts/empty-sample.groovy +++ /dev/null @@ -1,33 +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. - */ -import org.apache.tinkerpop.gremlin.server.util.LifeCycleHook - -// an init script that returns a Map allows explicit setting of global bindings. -def globals = [:] - -// defines a sample LifeCycleHook that prints some output to the Gremlin Server console. -// note that the name of the key in the "global" map is unimportant. -globals << [hook: [ - onStartUp : { ctx -> - ctx.logger.info("Executed once at startup of Gremlin Server.") - }, - onShutDown: { ctx -> - ctx.logger.info("Executed once at shutdown of Gremlin Server.") - } -] as LifeCycleHook] - -// define the default TraversalSource to bind queries to - this one will be named "g". diff --git a/hugegraph-cluster-test/hugegraph-clustertest-dist/src/assembly/static/server/scripts/example.groovy b/hugegraph-cluster-test/hugegraph-clustertest-dist/src/assembly/static/server/scripts/example.groovy deleted file mode 100644 index 266206845b..0000000000 --- a/hugegraph-cluster-test/hugegraph-clustertest-dist/src/assembly/static/server/scripts/example.groovy +++ /dev/null @@ -1,67 +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. - */ -import org.apache.hugegraph.HugeFactory -import org.apache.hugegraph.dist.RegisterUtil -import org.apache.hugegraph.masterelection.GlobalMasterInfo -import org.apache.tinkerpop.gremlin.structure.T - -RegisterUtil.registerBackends() - -conf = "conf/graphs/hugegraph.properties" -graph = HugeFactory.open(conf) -graph.serverStarted(GlobalMasterInfo.master("server-tinkerpop")) -schema = graph.schema() - -schema.propertyKey("name").asText().ifNotExist().create() -schema.propertyKey("age").asInt().ifNotExist().create() -schema.propertyKey("city").asText().ifNotExist().create() -schema.propertyKey("weight").asDouble().ifNotExist().create() -schema.propertyKey("lang").asText().ifNotExist().create() -schema.propertyKey("date").asText().ifNotExist().create() -schema.propertyKey("price").asInt().ifNotExist().create() - -schema.vertexLabel("person").properties("name", "age", "city").primaryKeys("name").ifNotExist().create() -schema.vertexLabel("software").properties("name", "lang", "price").primaryKeys("name").ifNotExist().create() -schema.indexLabel("personByCity").onV("person").by("city").secondary().ifNotExist().create() -schema.indexLabel("personByAgeAndCity").onV("person").by("age", "city").secondary().ifNotExist().create() -schema.indexLabel("softwareByPrice").onV("software").by("price").range().ifNotExist().create() -schema.edgeLabel("knows").sourceLabel("person").targetLabel("person").properties("date", "weight").ifNotExist().create() -schema.edgeLabel("created").sourceLabel("person").targetLabel("software").properties("date", "weight").ifNotExist().create() -schema.indexLabel("createdByDate").onE("created").by("date").secondary().ifNotExist().create() -schema.indexLabel("createdByWeight").onE("created").by("weight").range().ifNotExist().create() -schema.indexLabel("knowsByWeight").onE("knows").by("weight").range().ifNotExist().create() - -marko = graph.addVertex(T.label, "person", "name", "marko", "age", 29, "city", "Beijing") -vadas = graph.addVertex(T.label, "person", "name", "vadas", "age", 27, "city", "Hongkong") -lop = graph.addVertex(T.label, "software", "name", "lop", "lang", "java", "price", 328) -josh = graph.addVertex(T.label, "person", "name", "josh", "age", 32, "city", "Beijing") -ripple = graph.addVertex(T.label, "software", "name", "ripple", "lang", "java", "price", 199) -peter = graph.addVertex(T.label, "person", "name", "peter", "age", 35, "city", "Shanghai") - -marko.addEdge("knows", vadas, "date", "20160110", "weight", 0.5) -marko.addEdge("knows", josh, "date", "20130220", "weight", 1.0) -marko.addEdge("created", lop, "date", "20171210", "weight", 0.4) -josh.addEdge("created", lop, "date", "20091111", "weight", 0.4) -josh.addEdge("created", ripple, "date", "20171210", "weight", 1.0) -peter.addEdge("created", lop, "date", "20170324", "weight", 0.2) - -graph.tx().commit() - -g = graph.traversal() - -System.out.println(">>>> query all vertices: size=" + g.V().toList().size()) -System.out.println(">>>> query all edges: size=" + g.E().toList().size()) diff --git a/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/base/ClusterConstant.java b/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/base/ClusterConstant.java index 891247aadf..2caa5a6a2a 100644 --- a/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/base/ClusterConstant.java +++ b/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/base/ClusterConstant.java @@ -31,76 +31,66 @@ public class ClusterConstant { public static final String PD = "pd"; public static final String STORE = "store"; public static final String SERVER = "server"; - public static final String LIB_DIR = "lib"; public static final String EXT_DIR = "ext"; public static final String PLUGINS_DIR = "plugins"; public static final String BIN_DIR = "bin"; public static final String CONF_DIR = "conf"; - public static final String PD_PACKAGE_PREFIX = "apache-hugegraph-pd-incubating"; public static final String PD_JAR_PREFIX = "hg-pd-service"; public static final String STORE_PACKAGE_PREFIX = "apache-hugegraph-store-incubating"; public static final String STORE_JAR_PREFIX = "hg-store-node"; public static final String SERVER_PACKAGE_PREFIX = "apache-hugegraph-server-incubating"; public static final String CT_PACKAGE_PREFIX = "apache-hugegraph-ct-incubating"; - public static final String APPLICATION_FILE = "application.yml"; public static final String SERVER_PROPERTIES = "rest-server.properties"; public static final String HUGEGRAPH_PROPERTIES = "graphs/hugegraph.properties"; - public static final String LOG4J_FILE = "log4j2.xml"; - public static final String LICENSE_FILE = "hugegraph.license"; public static final String PD_TEMPLATE_FILE = "pd-application.yml.template"; - public static final String STORE_TEMPLATE_FILE = "store-application.yml.template"; public static final String SERVER_TEMPLATE_FILE = "rest-server.properties.template"; public static final String GRAPH_TEMPLATE_FILE = "hugegraph.properties.template"; public static final String GREMLIN_DRIVER_SETTING_FILE = "gremlin-driver-settings.yaml"; public static final String GREMLIN_SERVER_FILE = "gremlin-server.yaml"; public static final String COMPUTER_SETTING_FILE = "computer.yaml"; - public static final String HUGEGRAPH_SERVER_KEYSTORE = "hugegraph-server.keystore"; public static final String REMOTE_SETTING_FILE = "remote.yaml"; public static final String REMOTE_OBJECTS_SETTING_FILE = "remote-objects.yaml"; public static final String EMPTY_SAMPLE_GROOVY_FILE = "scripts/empty-sample.groovy"; public static final String EXAMPLE_GROOVY_FILE = "scripts/example.groovy"; - public static final String LOCALHOST = "127.0.0.1"; - public static final String JAVA_CMD = System.getProperty("java.home") + - File.separator + BIN_DIR + File.separator + - (SystemUtils.IS_OS_WINDOWS ? "java.exe" : "java"); - - public static final String PD_DIST_PATH = PROJECT_DIR + File.separator + - "hugegraph-pd" + File.separator; - - public static final String PD_LIB_PATH = getFileInDir(PD_DIST_PATH, PD_PACKAGE_PREFIX) + - File.separator + LIB_DIR + File.separator; - - public static final String STORE_DIST_PATH = PROJECT_DIR + File.separator + "hugegraph-store" + - File.separator; - - public static final String STORE_LIB_PATH = getFileInDir(STORE_DIST_PATH, STORE_PACKAGE_PREFIX) - + File.separator + LIB_DIR + File.separator; - - public static final String SERVER_DIST_PATH = PROJECT_DIR + File.separator + - "hugegraph-server" + File.separator; - - public static final String SERVER_LIB_PATH = getFileInDir(SERVER_DIST_PATH, - SERVER_PACKAGE_PREFIX) + - File.separator; - - public static final String CT_DIST_PATH = PROJECT_DIR + File.separator + - "hugegraph-cluster-test" + File.separator; - - public static final String CT_PACKAGE_PATH = getFileInDir(CT_DIST_PATH, CT_PACKAGE_PREFIX) + - File.separator; - - public static final String PD_TEMPLATE_PATH = CT_PACKAGE_PATH + PD + File.separator; - - public static final String STORE_TEMPLATE_PATH = CT_PACKAGE_PATH + STORE + File.separator; - - public static final String SERVER_TEMPLATE_PATH = CT_PACKAGE_PATH + SERVER + File.separator; + public static final String JAVA_CMD = + System.getProperty("java.home") + File.separator + BIN_DIR + File.separator + + (SystemUtils.IS_OS_WINDOWS ? "java.exe" : "java"); + public static final String PD_DIST_PATH = + PROJECT_DIR + File.separator + "hugegraph-pd" + File.separator; + public static final String PD_LIB_PATH = + getFileInDir(PD_DIST_PATH, PD_PACKAGE_PREFIX) + File.separator + LIB_DIR + + File.separator; + public static final String PD_TEMPLATE_PATH = + getFileInDir(PD_DIST_PATH, PD_PACKAGE_PREFIX) + File.separator + CONF_DIR + + File.separator; + public static final String STORE_DIST_PATH = + PROJECT_DIR + File.separator + "hugegraph-store" + File.separator; + public static final String STORE_LIB_PATH = + getFileInDir(STORE_DIST_PATH, STORE_PACKAGE_PREFIX) + File.separator + LIB_DIR + + File.separator; + public static final String STORE_TEMPLATE_PATH = + getFileInDir(STORE_DIST_PATH, STORE_PACKAGE_PREFIX) + File.separator + CONF_DIR + + File.separator; + public static final String SERVER_DIST_PATH = + PROJECT_DIR + File.separator + "hugegraph-server" + File.separator; + public static final String SERVER_LIB_PATH = + getFileInDir(SERVER_DIST_PATH, SERVER_PACKAGE_PREFIX) + + File.separator; + public static final String SERVER_TEMPLATE_PATH = + getFileInDir(SERVER_DIST_PATH, SERVER_PACKAGE_PREFIX) + + File.separator + CONF_DIR + File.separator; + public static final String CT_DIST_PATH = + PROJECT_DIR + File.separator + "hugegraph-cluster-test" + File.separator; + public static final String CT_PACKAGE_PATH = + getFileInDir(CT_DIST_PATH, CT_PACKAGE_PREFIX) + File.separator; + public static final String CONFIG_FILE_PATH = CT_PACKAGE_PATH + CONF_DIR + File.separator; private ClusterConstant() { throw new IllegalStateException("Utility class"); @@ -133,15 +123,15 @@ public static boolean isJava11OrHigher() { } public static String getProjectDir() { - String userDir = System.getProperty("user.dir"); // 获取当前工作目录 - Path path = Paths.get(userDir); // 将路径字符串转换为 Path 对象 + String userDir = System.getProperty("user.dir"); // get current dir + Path path = Paths.get(userDir); if (userDir.endsWith("hugegraph-cluster-test")) { - return path.getParent().toString(); // 返回上一级目录 + return path.getParent().toString(); } else if (userDir.endsWith("hugegraph-clustertest-test")) { - return path.getParent().getParent().toString(); // 返回上两级目录 + return path.getParent().getParent().toString(); } - return userDir; // 如果不匹配则返回当前目录 + return userDir; // Return current dir if not matched } } diff --git a/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/config/GraphConfig.java b/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/config/GraphConfig.java index 2666ec2b59..a6b425d51f 100644 --- a/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/config/GraphConfig.java +++ b/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/config/GraphConfig.java @@ -17,10 +17,9 @@ package org.apache.hugegraph.ct.config; -import static org.apache.hugegraph.ct.base.ClusterConstant.CT_PACKAGE_PATH; +import static org.apache.hugegraph.ct.base.ClusterConstant.CONFIG_FILE_PATH; import static org.apache.hugegraph.ct.base.ClusterConstant.GRAPH_TEMPLATE_FILE; import static org.apache.hugegraph.ct.base.ClusterConstant.HUGEGRAPH_PROPERTIES; -import static org.apache.hugegraph.ct.base.ClusterConstant.SERVER_TEMPLATE_PATH; import java.nio.file.Paths; import java.util.List; @@ -28,7 +27,7 @@ public class GraphConfig extends AbstractConfig { public GraphConfig() { - readTemplate(Paths.get(SERVER_TEMPLATE_PATH + GRAPH_TEMPLATE_FILE)); + readTemplate(Paths.get(CONFIG_FILE_PATH + GRAPH_TEMPLATE_FILE)); this.fileName = HUGEGRAPH_PROPERTIES; } diff --git a/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/config/PDConfig.java b/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/config/PDConfig.java index b9b4495511..d53e45d575 100644 --- a/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/config/PDConfig.java +++ b/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/config/PDConfig.java @@ -18,10 +18,9 @@ package org.apache.hugegraph.ct.config; import static org.apache.hugegraph.ct.base.ClusterConstant.APPLICATION_FILE; -import static org.apache.hugegraph.ct.base.ClusterConstant.CT_PACKAGE_PATH; +import static org.apache.hugegraph.ct.base.ClusterConstant.CONFIG_FILE_PATH; import static org.apache.hugegraph.ct.base.ClusterConstant.LOCALHOST; import static org.apache.hugegraph.ct.base.ClusterConstant.PD_TEMPLATE_FILE; -import static org.apache.hugegraph.ct.base.ClusterConstant.PD_TEMPLATE_PATH; import static org.apache.hugegraph.ct.base.EnvUtil.getAvailablePort; import java.nio.file.Paths; @@ -37,7 +36,7 @@ public class PDConfig extends AbstractConfig { private final int restPort; public PDConfig() { - readTemplate(Paths.get(PD_TEMPLATE_PATH + PD_TEMPLATE_FILE)); + readTemplate(Paths.get(CONFIG_FILE_PATH + PD_TEMPLATE_FILE)); this.fileName = APPLICATION_FILE; this.raftPort = getAvailablePort(); this.grpcPort = getAvailablePort(); diff --git a/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/config/ServerConfig.java b/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/config/ServerConfig.java index 8edb79ea76..569a11dddf 100644 --- a/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/config/ServerConfig.java +++ b/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/config/ServerConfig.java @@ -17,11 +17,10 @@ package org.apache.hugegraph.ct.config; -import static org.apache.hugegraph.ct.base.ClusterConstant.CT_PACKAGE_PATH; +import static org.apache.hugegraph.ct.base.ClusterConstant.CONFIG_FILE_PATH; import static org.apache.hugegraph.ct.base.ClusterConstant.LOCALHOST; import static org.apache.hugegraph.ct.base.ClusterConstant.SERVER_PROPERTIES; import static org.apache.hugegraph.ct.base.ClusterConstant.SERVER_TEMPLATE_FILE; -import static org.apache.hugegraph.ct.base.ClusterConstant.SERVER_TEMPLATE_PATH; import static org.apache.hugegraph.ct.base.EnvUtil.getAvailablePort; import java.nio.file.Paths; @@ -35,7 +34,7 @@ public class ServerConfig extends AbstractConfig { private final int restPort; public ServerConfig() { - readTemplate(Paths.get(SERVER_TEMPLATE_PATH + SERVER_TEMPLATE_FILE)); + readTemplate(Paths.get(CONFIG_FILE_PATH + SERVER_TEMPLATE_FILE)); this.fileName = SERVER_PROPERTIES; this.rpcPort = getAvailablePort(); this.restPort = getAvailablePort(); diff --git a/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/config/StoreConfig.java b/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/config/StoreConfig.java index 58ff98a01f..50495f18a5 100644 --- a/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/config/StoreConfig.java +++ b/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/config/StoreConfig.java @@ -18,10 +18,9 @@ package org.apache.hugegraph.ct.config; import static org.apache.hugegraph.ct.base.ClusterConstant.APPLICATION_FILE; -import static org.apache.hugegraph.ct.base.ClusterConstant.CT_PACKAGE_PATH; +import static org.apache.hugegraph.ct.base.ClusterConstant.CONFIG_FILE_PATH; import static org.apache.hugegraph.ct.base.ClusterConstant.LOCALHOST; import static org.apache.hugegraph.ct.base.ClusterConstant.STORE_TEMPLATE_FILE; -import static org.apache.hugegraph.ct.base.ClusterConstant.STORE_TEMPLATE_PATH; import static org.apache.hugegraph.ct.base.EnvUtil.getAvailablePort; import java.nio.file.Paths; @@ -37,8 +36,7 @@ public class StoreConfig extends AbstractConfig { private final int restPort; public StoreConfig() { - readTemplate( - Paths.get(STORE_TEMPLATE_PATH + STORE_TEMPLATE_FILE)); + readTemplate(Paths.get(CONFIG_FILE_PATH + STORE_TEMPLATE_FILE)); this.fileName = APPLICATION_FILE; this.raftPort = getAvailablePort(); this.grpcPort = getAvailablePort(); diff --git a/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/node/PDNodeWrapper.java b/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/node/PDNodeWrapper.java index b6cfca6096..a89c614c4c 100644 --- a/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/node/PDNodeWrapper.java +++ b/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/node/PDNodeWrapper.java @@ -19,7 +19,6 @@ import static org.apache.hugegraph.ct.base.ClusterConstant.CONF_DIR; import static org.apache.hugegraph.ct.base.ClusterConstant.JAVA_CMD; -import static org.apache.hugegraph.ct.base.ClusterConstant.LICENSE_FILE; import static org.apache.hugegraph.ct.base.ClusterConstant.LOG4J_FILE; import static org.apache.hugegraph.ct.base.ClusterConstant.PD_JAR_PREFIX; import static org.apache.hugegraph.ct.base.ClusterConstant.PD_LIB_PATH; diff --git a/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/node/ServerNodeWrapper.java b/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/node/ServerNodeWrapper.java index 16eff633fb..7f2a5058e7 100644 --- a/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/node/ServerNodeWrapper.java +++ b/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/node/ServerNodeWrapper.java @@ -24,7 +24,6 @@ import static org.apache.hugegraph.ct.base.ClusterConstant.EXT_DIR; import static org.apache.hugegraph.ct.base.ClusterConstant.GREMLIN_DRIVER_SETTING_FILE; import static org.apache.hugegraph.ct.base.ClusterConstant.GREMLIN_SERVER_FILE; -import static org.apache.hugegraph.ct.base.ClusterConstant.HUGEGRAPH_SERVER_KEYSTORE; import static org.apache.hugegraph.ct.base.ClusterConstant.JAVA_CMD; import static org.apache.hugegraph.ct.base.ClusterConstant.LIB_DIR; import static org.apache.hugegraph.ct.base.ClusterConstant.LOG4J_FILE; @@ -46,10 +45,8 @@ public class ServerNodeWrapper extends AbstractNodeWrapper { public ServerNodeWrapper(int clusterIndex, int index) { super(clusterIndex, index); - this.fileNames = new ArrayList<>(List.of(LOG4J_FILE, HUGEGRAPH_SERVER_KEYSTORE, - COMPUTER_SETTING_FILE, GREMLIN_SERVER_FILE, - GREMLIN_DRIVER_SETTING_FILE, REMOTE_SETTING_FILE, - REMOTE_OBJECTS_SETTING_FILE)); + this.fileNames = new ArrayList<>(List.of(LOG4J_FILE, GREMLIN_SERVER_FILE, GREMLIN_DRIVER_SETTING_FILE, + REMOTE_SETTING_FILE, REMOTE_OBJECTS_SETTING_FILE)); this.workPath = SERVER_LIB_PATH; createNodeDir(Paths.get(SERVER_TEMPLATE_PATH), getNodePath() + CONF_DIR + File.separator); this.fileNames = new ArrayList<>(List.of(EMPTY_SAMPLE_GROOVY_FILE, EXAMPLE_GROOVY_FILE)); diff --git a/hugegraph-pd/hg-pd-common/pom.xml b/hugegraph-pd/hg-pd-common/pom.xml index 79cfbe4112..dcb4557f12 100644 --- a/hugegraph-pd/hg-pd-common/pom.xml +++ b/hugegraph-pd/hg-pd-common/pom.xml @@ -44,5 +44,11 @@ commons-collections4 4.4 + + com.google.guava + guava + 31.0.1-android + compile +