You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by GitBox <gi...@apache.org> on 2021/12/07 15:06:06 UTC
[GitHub] [incubator-inlong] luchunliang opened a new pull request #1923: [INLONG-1890] Inlong-Sort-Standalone add sort-standalone-common module.
luchunliang opened a new pull request #1923:
URL: https://github.com/apache/incubator-inlong/pull/1923
### Title Name: [INLONG-1890][Inlong-Sort-Standalone] add sort-standalone-common module.
Fixes #<1890>
### Motivation
*Explain here the context, and why you're making that change. What is the problem you're trying to solve.*
### Modifications
*Describe the modifications you've done.*
### Verifying this change
- [ ] Make sure that the change passes the CI checks.
*(Please pick either of the following options)*
This change is a trivial rework / code cleanup without any test coverage.
*(or)*
This change is already covered by existing tests, such as *(please describe tests)*.
*(or)*
This change added tests and can be verified as follows:
*(example:)*
- *Added integration tests for end-to-end deployment with large payloads (10MB)*
- *Extended integration test for recovery after broker failure*
### Documentation
- Does this pull request introduce a new feature? (yes / no)
- If yes, how is the feature documented? (not applicable / docs / JavaDocs / not documented)
- If a feature is not applicable for documentation, explain why?
- If a feature is not documented yet in this PR, please create a followup issue for adding the documentation
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] luchunliang commented on a change in pull request #1923: [INLONG-1890] Inlong-Sort-Standalone add sort-standalone-common module.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on a change in pull request #1923:
URL: https://github.com/apache/incubator-inlong/pull/1923#discussion_r764551461
##########
File path: inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/utils/InlongLoggerFactory.java
##########
@@ -0,0 +1,85 @@
+/**
+ * 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.inlong.sort.standalone.utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * InlongLoggerFactory
+ */
+public class InlongLoggerFactory {
+
+ /**
+ * getLogger
+ *
+ * @param clazz
+ * @return
+ */
+ public static Logger getLogger(Class<?> clazz) {
+ String className = clazz.getName();
+ String namePrefix = getClassNamePrefix(className, 3);
+ return LoggerFactory.getLogger(namePrefix);
+ }
+
+ /**
+ * getClassNamePrefix
+ *
+ * @param className
+ * @param layer
+ * @return
+ */
+ public static String getClassNamePrefix(String className, int layer) {
+ int index = 0;
+ for (int i = 0; i < layer; i++) {
+ int newIndex = className.indexOf('.', index + 1);
+ if (newIndex <= 0) {
+ break;
+ }
+ index = newIndex;
+ }
+ if (index == 0) {
+ return "Inlong";
+ }
+ String namePrefix = className.substring(0, index);
+ return namePrefix;
+ }
+
+// /**
+// * main
+// * @param args
+// */
+// public static void main(String[] args) {
+// int layer = 3;
+// String className = "";
+// System.out.println(className + ":" + getClassNamePrefix(className, layer));
+// className = "ccc";
+// System.out.println(className + ":" + getClassNamePrefix(className, layer));
+// className = "org.ccc";
+// System.out.println(className + ":" + getClassNamePrefix(className, layer));
+// className = "org.apache.ccc";
+// System.out.println(className + ":" + getClassNamePrefix(className, layer));
+// className = "org.apache.inlong.ccc";
+// System.out.println(className + ":" + getClassNamePrefix(className, layer));
+// className = "org.apache.inlong.sort.ccc";
+// System.out.println(className + ":" + getClassNamePrefix(className, layer));
+// className = "org.apache.inlong.sort.standalone.ccc";
+// System.out.println(className + ":" + getClassNamePrefix(className, layer));
+// }
+}
Review comment:
ok, remove unused code.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] aloyszhang commented on a change in pull request #1923: [INLONG-1890] Inlong-Sort-Standalone add sort-standalone-common module.
Posted by GitBox <gi...@apache.org>.
aloyszhang commented on a change in pull request #1923:
URL: https://github.com/apache/incubator-inlong/pull/1923#discussion_r764548974
##########
File path: inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/config/pojo/type/DataType.java
##########
@@ -0,0 +1,70 @@
+/**
+ * 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.inlong.sort.standalone.config.pojo.type;
+
+/**
+ * data content type
+ */
+public enum DataType {
+
+ TEXT("text"), PB("pb"), JCE("jce"), N("n");
Review comment:
It's not a good practice for N. Better to have a meaningful name.
##########
File path: inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/config/pojo/type/SortType.java
##########
@@ -0,0 +1,72 @@
+/**
+ * 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.inlong.sort.standalone.config.pojo.type;
+
+/**
+ *
+ * SortType
+ */
+public enum SortType {
+
+ HIVE("hive"), TUBE("tube"), KAFKA("kafka"), PULSAR("pulsar"), ElasticSearch("ElasticSearch"), THTDBANK(
Review comment:
ditto
##########
File path: inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/config/pojo/type/CacheType.java
##########
@@ -0,0 +1,70 @@
+/**
+ * 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.inlong.sort.standalone.config.pojo.type;
+
+/**
+ * cache cluster type
+ */
+public enum CacheType {
+
+ TUBE("tube"), KAFKA("kafka"), PULSAR("pulsar"), N("n");
Review comment:
A meaningful name instead of N is more understandable.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] aloyszhang commented on a change in pull request #1923: [INLONG-1890] Inlong-Sort-Standalone add sort-standalone-common module.
Posted by GitBox <gi...@apache.org>.
aloyszhang commented on a change in pull request #1923:
URL: https://github.com/apache/incubator-inlong/pull/1923#discussion_r764547535
##########
File path: inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/utils/InlongLoggerFactory.java
##########
@@ -0,0 +1,85 @@
+/**
+ * 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.inlong.sort.standalone.utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * InlongLoggerFactory
+ */
+public class InlongLoggerFactory {
+
+ /**
+ * getLogger
+ *
+ * @param clazz
+ * @return
+ */
+ public static Logger getLogger(Class<?> clazz) {
+ String className = clazz.getName();
+ String namePrefix = getClassNamePrefix(className, 3);
+ return LoggerFactory.getLogger(namePrefix);
+ }
+
+ /**
+ * getClassNamePrefix
+ *
+ * @param className
+ * @param layer
+ * @return
+ */
+ public static String getClassNamePrefix(String className, int layer) {
+ int index = 0;
+ for (int i = 0; i < layer; i++) {
+ int newIndex = className.indexOf('.', index + 1);
+ if (newIndex <= 0) {
+ break;
+ }
+ index = newIndex;
+ }
+ if (index == 0) {
+ return "Inlong";
+ }
+ String namePrefix = className.substring(0, index);
+ return namePrefix;
+ }
+
+// /**
+// * main
+// * @param args
+// */
+// public static void main(String[] args) {
+// int layer = 3;
+// String className = "";
+// System.out.println(className + ":" + getClassNamePrefix(className, layer));
+// className = "ccc";
+// System.out.println(className + ":" + getClassNamePrefix(className, layer));
+// className = "org.ccc";
+// System.out.println(className + ":" + getClassNamePrefix(className, layer));
+// className = "org.apache.ccc";
+// System.out.println(className + ":" + getClassNamePrefix(className, layer));
+// className = "org.apache.inlong.ccc";
+// System.out.println(className + ":" + getClassNamePrefix(className, layer));
+// className = "org.apache.inlong.sort.ccc";
+// System.out.println(className + ":" + getClassNamePrefix(className, layer));
+// className = "org.apache.inlong.sort.standalone.ccc";
+// System.out.println(className + ":" + getClassNamePrefix(className, layer));
+// }
+}
Review comment:
remove legacy codes
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] luchunliang commented on a change in pull request #1923: [INLONG-1890] Inlong-Sort-Standalone add sort-standalone-common module.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on a change in pull request #1923:
URL: https://github.com/apache/incubator-inlong/pull/1923#discussion_r764550037
##########
File path: inlong-sort-standalone/pom.xml
##########
@@ -70,6 +77,29 @@
<artifactId>inlong-common</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>2.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito2</artifactId>
+ <version>2.0.2</version>
Review comment:
ok, abstract powermock.version
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] gosonzhang merged pull request #1923: [INLONG-1890] Inlong-Sort-Standalone add sort-standalone-common module.
Posted by GitBox <gi...@apache.org>.
gosonzhang merged pull request #1923:
URL: https://github.com/apache/incubator-inlong/pull/1923
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] aloyszhang commented on a change in pull request #1923: [INLONG-1890] Inlong-Sort-Standalone add sort-standalone-common module.
Posted by GitBox <gi...@apache.org>.
aloyszhang commented on a change in pull request #1923:
URL: https://github.com/apache/incubator-inlong/pull/1923#discussion_r764545728
##########
File path: inlong-sort-standalone/pom.xml
##########
@@ -70,6 +77,29 @@
<artifactId>inlong-common</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>2.0.2</version>
Review comment:
please abstract version to prooerties
##########
File path: inlong-sort-standalone/pom.xml
##########
@@ -70,6 +77,29 @@
<artifactId>inlong-common</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>2.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito2</artifactId>
+ <version>2.0.2</version>
Review comment:
ditto
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] aloyszhang commented on a change in pull request #1923: [INLONG-1890] Inlong-Sort-Standalone add sort-standalone-common module.
Posted by GitBox <gi...@apache.org>.
aloyszhang commented on a change in pull request #1923:
URL: https://github.com/apache/incubator-inlong/pull/1923#discussion_r764547159
##########
File path: inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/config/pojo/SortClusterResponse.java
##########
@@ -0,0 +1,215 @@
+/**
+ * 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.inlong.sort.standalone.config.pojo;
+
+/**
+ *
+ * SortClusterResponse
+ */
+public class SortClusterResponse {
+
+ public static final int SUCC = 0;
+ public static final int NOUPDATE = 1;
+ public static final int FAIL = -1;
+ public static final int REQ_PARAMS_ERROR = -101;
+
+ private boolean result;
+ private int errCode;
+ private String md5;
+ private SortClusterConfig data;
+
+ /**
+ * get result
+ *
+ * @return the result
+ */
+ public boolean isResult() {
+ return result;
+ }
+
+ /**
+ * set result
+ *
+ * @param result the result to set
+ */
+ public void setResult(boolean result) {
+ this.result = result;
+ }
+
+ /**
+ * get errCode
+ *
+ * @return the errCode
+ */
+ public int getErrCode() {
+ return errCode;
+ }
+
+ /**
+ * set errCode
+ *
+ * @param errCode the errCode to set
+ */
+ public void setErrCode(int errCode) {
+ this.errCode = errCode;
+ }
+
+ /**
+ * get md5
+ *
+ * @return the md5
+ */
+ public String getMd5() {
+ return md5;
+ }
+
+ /**
+ * set md5
+ *
+ * @param md5 the md5 to set
+ */
+ public void setMd5(String md5) {
+ this.md5 = md5;
+ }
+
+ /**
+ * get data
+ *
+ * @return the data
+ */
+ public SortClusterConfig getData() {
+ return data;
+ }
+
+ /**
+ * set data
+ *
+ * @param data the data to set
+ */
+ public void setData(SortClusterConfig data) {
+ this.data = data;
+ }
+//
+// /**
+// * generateTdbankConfig
+// *
+// * @return
+// */
+// public static SortClusterConfig generateTdbankConfig() {
+// SortClusterConfig clusterConfig = new SortClusterConfig();
+// clusterConfig.setClusterName("tdbankv3-sz-sz1");
+// //
+// List<SortTaskConfig> sortTasks = new ArrayList<>();
+// clusterConfig.setSortTasks(sortTasks);
+// SortTaskConfig taskConfig = new SortTaskConfig();
+// sortTasks.add(taskConfig);
+// taskConfig.setName("sid_tdbank_atta6th_v3");
+// taskConfig.setType(SortType.TQTDBANK);
+// //
+// Map<String, String> sinkParams = new HashMap<>();
+// taskConfig.setSinkParams(sinkParams);
+// sinkParams.put("b_pcg_venus_szrecone_124_153_utf8", "10.56.15.195:46801,10.56.15.212:46801,"
+// + "10.56.15.220:46801,10.56.15.221:46801,"
+// + "10.56.15.230:46801,10.56.16.20:46801,10.56.16.38:46801,10.56.20.21:46801,10.56.20.80:46801,"
+// + "10.56.20.85:46801,10.56.209.205:46801,10.56.21.17:46801,10.56.21.20:46801,10.56.21.79:46801,"
+// + "10.56.21.85:46801,10.56.81.205:46801,10.56.81.211:46801,10.56.82.11:46801,10.56.82.12:46801,"
+// + "10.56.82.37:46801,10.56.82.38:46801,10.56.82.40:46801,10.56.83.143:46801,10.56.83.80:46801,"
+// + "10.56.84.17:46801");
+// //
+// List<Map<String, String>> idParams = new ArrayList<>();
+// Map<String, String> idParam = new HashMap<>();
+// idParams.add(idParam);
+// taskConfig.setIdParams(idParams);
Review comment:
remove un-used code
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] luchunliang commented on a change in pull request #1923: [INLONG-1890] Inlong-Sort-Standalone add sort-standalone-common module.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on a change in pull request #1923:
URL: https://github.com/apache/incubator-inlong/pull/1923#discussion_r764550642
##########
File path: inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/config/pojo/SortClusterResponse.java
##########
@@ -0,0 +1,215 @@
+/**
+ * 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.inlong.sort.standalone.config.pojo;
+
+/**
+ *
+ * SortClusterResponse
+ */
+public class SortClusterResponse {
+
+ public static final int SUCC = 0;
+ public static final int NOUPDATE = 1;
+ public static final int FAIL = -1;
+ public static final int REQ_PARAMS_ERROR = -101;
+
+ private boolean result;
+ private int errCode;
+ private String md5;
+ private SortClusterConfig data;
+
+ /**
+ * get result
+ *
+ * @return the result
+ */
+ public boolean isResult() {
+ return result;
+ }
+
+ /**
+ * set result
+ *
+ * @param result the result to set
+ */
+ public void setResult(boolean result) {
+ this.result = result;
+ }
+
+ /**
+ * get errCode
+ *
+ * @return the errCode
+ */
+ public int getErrCode() {
+ return errCode;
+ }
+
+ /**
+ * set errCode
+ *
+ * @param errCode the errCode to set
+ */
+ public void setErrCode(int errCode) {
+ this.errCode = errCode;
+ }
+
+ /**
+ * get md5
+ *
+ * @return the md5
+ */
+ public String getMd5() {
+ return md5;
+ }
+
+ /**
+ * set md5
+ *
+ * @param md5 the md5 to set
+ */
+ public void setMd5(String md5) {
+ this.md5 = md5;
+ }
+
+ /**
+ * get data
+ *
+ * @return the data
+ */
+ public SortClusterConfig getData() {
+ return data;
+ }
+
+ /**
+ * set data
+ *
+ * @param data the data to set
+ */
+ public void setData(SortClusterConfig data) {
+ this.data = data;
+ }
+//
+// /**
+// * generateTdbankConfig
+// *
+// * @return
+// */
+// public static SortClusterConfig generateTdbankConfig() {
+// SortClusterConfig clusterConfig = new SortClusterConfig();
+// clusterConfig.setClusterName("tdbankv3-sz-sz1");
+// //
+// List<SortTaskConfig> sortTasks = new ArrayList<>();
+// clusterConfig.setSortTasks(sortTasks);
+// SortTaskConfig taskConfig = new SortTaskConfig();
+// sortTasks.add(taskConfig);
+// taskConfig.setName("sid_tdbank_atta6th_v3");
+// taskConfig.setType(SortType.TQTDBANK);
+// //
+// Map<String, String> sinkParams = new HashMap<>();
+// taskConfig.setSinkParams(sinkParams);
+// sinkParams.put("b_pcg_venus_szrecone_124_153_utf8", "10.56.15.195:46801,10.56.15.212:46801,"
+// + "10.56.15.220:46801,10.56.15.221:46801,"
+// + "10.56.15.230:46801,10.56.16.20:46801,10.56.16.38:46801,10.56.20.21:46801,10.56.20.80:46801,"
+// + "10.56.20.85:46801,10.56.209.205:46801,10.56.21.17:46801,10.56.21.20:46801,10.56.21.79:46801,"
+// + "10.56.21.85:46801,10.56.81.205:46801,10.56.81.211:46801,10.56.82.11:46801,10.56.82.12:46801,"
+// + "10.56.82.37:46801,10.56.82.38:46801,10.56.82.40:46801,10.56.83.143:46801,10.56.83.80:46801,"
+// + "10.56.84.17:46801");
+// //
+// List<Map<String, String>> idParams = new ArrayList<>();
+// Map<String, String> idParam = new HashMap<>();
+// idParams.add(idParam);
+// taskConfig.setIdParams(idParams);
Review comment:
ok, remove un-used code
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] luchunliang commented on a change in pull request #1923: [INLONG-1890] Inlong-Sort-Standalone add sort-standalone-common module.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on a change in pull request #1923:
URL: https://github.com/apache/incubator-inlong/pull/1923#discussion_r764549762
##########
File path: inlong-sort-standalone/pom.xml
##########
@@ -70,6 +77,29 @@
<artifactId>inlong-common</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>2.0.2</version>
Review comment:
okļ¼change to
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] aloyszhang commented on a change in pull request #1923: [INLONG-1890] Inlong-Sort-Standalone add sort-standalone-common module.
Posted by GitBox <gi...@apache.org>.
aloyszhang commented on a change in pull request #1923:
URL: https://github.com/apache/incubator-inlong/pull/1923#discussion_r764546462
##########
File path: inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/config/holder/SortClusterConfigHolder.java
##########
@@ -0,0 +1,154 @@
+/**
+ * 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.inlong.sort.standalone.config.holder;
+
+import static org.apache.inlong.sort.standalone.config.loader.SortClusterConfigLoader.SORT_CLUSTER_CONFIG_TYPE;
+import static org.apache.inlong.sort.standalone.utils.Constants.RELOAD_INTERVAL;
+
+import java.util.Date;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import org.apache.commons.lang.ClassUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.flume.Context;
+import org.apache.inlong.sort.standalone.config.loader.ClassResourceSortClusterConfigLoader;
+import org.apache.inlong.sort.standalone.config.loader.SortClusterConfigLoader;
+import org.apache.inlong.sort.standalone.config.pojo.SortClusterConfig;
+import org.apache.inlong.sort.standalone.config.pojo.SortTaskConfig;
+import org.apache.inlong.sort.standalone.utils.InlongLoggerFactory;
+import org.slf4j.Logger;
+
+/**
+ *
+ * SortClusterConfigHolder
+ */
+public final class SortClusterConfigHolder {
+
+ public static final Logger LOG = InlongLoggerFactory.getLogger(SortClusterConfigHolder.class);
+
+ private static SortClusterConfigHolder instance;
+
+ private long reloadInterval;
+ private Timer reloadTimer;
+ private SortClusterConfigLoader loader;
+ private SortClusterConfig config;
+
+ /**
+ * Constructor
+ */
+ private SortClusterConfigHolder() {
+
+ }
+
+ /**
+ * getInstance
+ *
+ * @return
+ */
+ private static SortClusterConfigHolder get() {
+ if (instance != null) {
+ return instance;
+ }
+ synchronized (SortClusterConfigHolder.class) {
+ instance = new SortClusterConfigHolder();
+ instance.reloadInterval = CommonPropertiesHolder.getLong(RELOAD_INTERVAL, 60000L);
+ String loaderType = CommonPropertiesHolder.getString(SORT_CLUSTER_CONFIG_TYPE,
+ ClassResourceSortClusterConfigLoader.class.getName());
+ try {
+ Class<?> loaderClass = ClassUtils.getClass(loaderType);
+ Object loaderObject = loaderClass.getDeclaredConstructor().newInstance();
+ if (loaderObject instanceof SortClusterConfigLoader) {
+ instance.loader = (SortClusterConfigLoader) loaderObject;
+ }
+ } catch (Throwable t) {
+ LOG.error("Fail to init loader,loaderType:{},error:{}", loaderType, t.getMessage());
+ LOG.error(t.getMessage(), t);
Review comment:
duplicated error print, this can be done in one single LOG.error Statement
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] luchunliang commented on a change in pull request #1923: [INLONG-1890] Inlong-Sort-Standalone add sort-standalone-common module.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on a change in pull request #1923:
URL: https://github.com/apache/incubator-inlong/pull/1923#discussion_r764551155
##########
File path: inlong-sort-standalone/sort-standalone-common/pom.xml
##########
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
Review comment:
ok, fix it
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] luchunliang commented on a change in pull request #1923: [INLONG-1890] Inlong-Sort-Standalone add sort-standalone-common module.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on a change in pull request #1923:
URL: https://github.com/apache/incubator-inlong/pull/1923#discussion_r764551998
##########
File path: inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/config/pojo/type/SortType.java
##########
@@ -0,0 +1,72 @@
+/**
+ * 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.inlong.sort.standalone.config.pojo.type;
+
+/**
+ *
+ * SortType
+ */
+public enum SortType {
+
+ HIVE("hive"), TUBE("tube"), KAFKA("kafka"), PULSAR("pulsar"), ElasticSearch("ElasticSearch"), THTDBANK(
Review comment:
ok, change to UNKNOWN
##########
File path: inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/config/pojo/type/CacheType.java
##########
@@ -0,0 +1,70 @@
+/**
+ * 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.inlong.sort.standalone.config.pojo.type;
+
+/**
+ * cache cluster type
+ */
+public enum CacheType {
+
+ TUBE("tube"), KAFKA("kafka"), PULSAR("pulsar"), N("n");
Review comment:
ok, change to UNKNOWN
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] gosonzhang commented on a change in pull request #1923: [INLONG-1890] Inlong-Sort-Standalone add sort-standalone-common module.
Posted by GitBox <gi...@apache.org>.
gosonzhang commented on a change in pull request #1923:
URL: https://github.com/apache/incubator-inlong/pull/1923#discussion_r764546423
##########
File path: inlong-sort-standalone/sort-standalone-common/pom.xml
##########
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
Review comment:
not the standard license content
##########
File path: inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/config/pojo/SortClusterResponse.java
##########
@@ -0,0 +1,215 @@
+/**
+ * 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.inlong.sort.standalone.config.pojo;
+
+/**
+ *
+ * SortClusterResponse
+ */
+public class SortClusterResponse {
+
+ public static final int SUCC = 0;
+ public static final int NOUPDATE = 1;
+ public static final int FAIL = -1;
+ public static final int REQ_PARAMS_ERROR = -101;
+
+ private boolean result;
+ private int errCode;
+ private String md5;
+ private SortClusterConfig data;
+
+ /**
+ * get result
+ *
+ * @return the result
+ */
+ public boolean isResult() {
+ return result;
+ }
+
+ /**
+ * set result
+ *
+ * @param result the result to set
+ */
+ public void setResult(boolean result) {
+ this.result = result;
+ }
+
+ /**
+ * get errCode
+ *
+ * @return the errCode
+ */
+ public int getErrCode() {
+ return errCode;
+ }
+
+ /**
+ * set errCode
+ *
+ * @param errCode the errCode to set
+ */
+ public void setErrCode(int errCode) {
+ this.errCode = errCode;
+ }
+
+ /**
+ * get md5
+ *
+ * @return the md5
+ */
+ public String getMd5() {
+ return md5;
+ }
+
+ /**
+ * set md5
+ *
+ * @param md5 the md5 to set
+ */
+ public void setMd5(String md5) {
+ this.md5 = md5;
+ }
+
+ /**
+ * get data
+ *
+ * @return the data
+ */
+ public SortClusterConfig getData() {
+ return data;
+ }
+
+ /**
+ * set data
+ *
+ * @param data the data to set
+ */
+ public void setData(SortClusterConfig data) {
+ this.data = data;
+ }
+//
+// /**
+// * generateTdbankConfig
Review comment:
Please delete specific running content
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] luchunliang commented on a change in pull request #1923: [INLONG-1890] Inlong-Sort-Standalone add sort-standalone-common module.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on a change in pull request #1923:
URL: https://github.com/apache/incubator-inlong/pull/1923#discussion_r764550564
##########
File path: inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/config/holder/SortClusterConfigHolder.java
##########
@@ -0,0 +1,154 @@
+/**
+ * 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.inlong.sort.standalone.config.holder;
+
+import static org.apache.inlong.sort.standalone.config.loader.SortClusterConfigLoader.SORT_CLUSTER_CONFIG_TYPE;
+import static org.apache.inlong.sort.standalone.utils.Constants.RELOAD_INTERVAL;
+
+import java.util.Date;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import org.apache.commons.lang.ClassUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.flume.Context;
+import org.apache.inlong.sort.standalone.config.loader.ClassResourceSortClusterConfigLoader;
+import org.apache.inlong.sort.standalone.config.loader.SortClusterConfigLoader;
+import org.apache.inlong.sort.standalone.config.pojo.SortClusterConfig;
+import org.apache.inlong.sort.standalone.config.pojo.SortTaskConfig;
+import org.apache.inlong.sort.standalone.utils.InlongLoggerFactory;
+import org.slf4j.Logger;
+
+/**
+ *
+ * SortClusterConfigHolder
+ */
+public final class SortClusterConfigHolder {
+
+ public static final Logger LOG = InlongLoggerFactory.getLogger(SortClusterConfigHolder.class);
+
+ private static SortClusterConfigHolder instance;
+
+ private long reloadInterval;
+ private Timer reloadTimer;
+ private SortClusterConfigLoader loader;
+ private SortClusterConfig config;
+
+ /**
+ * Constructor
+ */
+ private SortClusterConfigHolder() {
+
+ }
+
+ /**
+ * getInstance
+ *
+ * @return
+ */
+ private static SortClusterConfigHolder get() {
+ if (instance != null) {
+ return instance;
+ }
+ synchronized (SortClusterConfigHolder.class) {
+ instance = new SortClusterConfigHolder();
+ instance.reloadInterval = CommonPropertiesHolder.getLong(RELOAD_INTERVAL, 60000L);
+ String loaderType = CommonPropertiesHolder.getString(SORT_CLUSTER_CONFIG_TYPE,
+ ClassResourceSortClusterConfigLoader.class.getName());
+ try {
+ Class<?> loaderClass = ClassUtils.getClass(loaderType);
+ Object loaderObject = loaderClass.getDeclaredConstructor().newInstance();
+ if (loaderObject instanceof SortClusterConfigLoader) {
+ instance.loader = (SortClusterConfigLoader) loaderObject;
+ }
+ } catch (Throwable t) {
+ LOG.error("Fail to init loader,loaderType:{},error:{}", loaderType, t.getMessage());
+ LOG.error(t.getMessage(), t);
Review comment:
ok, remove "LOG.error(t.getMessage(), t);"
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] luchunliang commented on a change in pull request #1923: [INLONG-1890] Inlong-Sort-Standalone add sort-standalone-common module.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on a change in pull request #1923:
URL: https://github.com/apache/incubator-inlong/pull/1923#discussion_r764551264
##########
File path: inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/config/pojo/SortClusterResponse.java
##########
@@ -0,0 +1,215 @@
+/**
+ * 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.inlong.sort.standalone.config.pojo;
+
+/**
+ *
+ * SortClusterResponse
+ */
+public class SortClusterResponse {
+
+ public static final int SUCC = 0;
+ public static final int NOUPDATE = 1;
+ public static final int FAIL = -1;
+ public static final int REQ_PARAMS_ERROR = -101;
+
+ private boolean result;
+ private int errCode;
+ private String md5;
+ private SortClusterConfig data;
+
+ /**
+ * get result
+ *
+ * @return the result
+ */
+ public boolean isResult() {
+ return result;
+ }
+
+ /**
+ * set result
+ *
+ * @param result the result to set
+ */
+ public void setResult(boolean result) {
+ this.result = result;
+ }
+
+ /**
+ * get errCode
+ *
+ * @return the errCode
+ */
+ public int getErrCode() {
+ return errCode;
+ }
+
+ /**
+ * set errCode
+ *
+ * @param errCode the errCode to set
+ */
+ public void setErrCode(int errCode) {
+ this.errCode = errCode;
+ }
+
+ /**
+ * get md5
+ *
+ * @return the md5
+ */
+ public String getMd5() {
+ return md5;
+ }
+
+ /**
+ * set md5
+ *
+ * @param md5 the md5 to set
+ */
+ public void setMd5(String md5) {
+ this.md5 = md5;
+ }
+
+ /**
+ * get data
+ *
+ * @return the data
+ */
+ public SortClusterConfig getData() {
+ return data;
+ }
+
+ /**
+ * set data
+ *
+ * @param data the data to set
+ */
+ public void setData(SortClusterConfig data) {
+ this.data = data;
+ }
+//
+// /**
+// * generateTdbankConfig
Review comment:
ok, remove unused code.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] luchunliang commented on a change in pull request #1923: [INLONG-1890] Inlong-Sort-Standalone add sort-standalone-common module.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on a change in pull request #1923:
URL: https://github.com/apache/incubator-inlong/pull/1923#discussion_r764551893
##########
File path: inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/config/pojo/type/DataType.java
##########
@@ -0,0 +1,70 @@
+/**
+ * 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.inlong.sort.standalone.config.pojo.type;
+
+/**
+ * data content type
+ */
+public enum DataType {
+
+ TEXT("text"), PB("pb"), JCE("jce"), N("n");
Review comment:
ok, change to UNKNOWN
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org