() {
+ {
+ put("count(root.db.d1.at1)", "2");
+ }
+ }));
+ }
+
+ result.set(true);
+ for (final Thread thread : threads) {
+ thread.join();
+ }
}
private void testTopicInvalidRuntimeConfigTemplate(
@@ -600,7 +841,8 @@ private void testTopicInvalidRuntimeConfigTemplate(
} finally {
LOGGER.info("consumer exiting...");
}
- }));
+ },
+ String.format("%s - consumer", testName.getMethodName())));
// Insert some realtime data on sender
threads.add(
@@ -628,18 +870,15 @@ private void testTopicInvalidRuntimeConfigTemplate(
fail(e.getMessage());
}
dataPrepared.set(true);
- }));
+ },
+ String.format("%s - data inserter", testName.getMethodName())));
for (final Thread thread : threads) {
thread.start();
}
- Awaitility.await()
- .pollDelay(IoTDBSubscriptionITConstant.AWAITILITY_POLL_DELAY_SECOND, TimeUnit.SECONDS)
- .pollInterval(IoTDBSubscriptionITConstant.AWAITILITY_POLL_INTERVAL_SECOND, TimeUnit.SECONDS)
- .atMost(IoTDBSubscriptionITConstant.AWAITILITY_AT_MOST_SECOND, TimeUnit.SECONDS)
- // The expected SubscriptionRuntimeCriticalException was not thrown if result is false
- .untilTrue(result);
+ // The expected SubscriptionRuntimeCriticalException was not thrown if result is false
+ AWAIT.untilTrue(result);
for (final Thread thread : threads) {
thread.join();
diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/local/AbstractSubscriptionLocalIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/local/AbstractSubscriptionLocalIT.java
new file mode 100644
index 0000000000000..bb248f745d4ed
--- /dev/null
+++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/local/AbstractSubscriptionLocalIT.java
@@ -0,0 +1,45 @@
+/*
+ * 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.iotdb.subscription.it.local;
+
+import org.apache.iotdb.it.env.EnvFactory;
+import org.apache.iotdb.subscription.it.AbstractSubscriptionIT;
+
+import org.junit.After;
+import org.junit.Before;
+
+abstract class AbstractSubscriptionLocalIT extends AbstractSubscriptionIT {
+
+ @Override
+ @Before
+ public void setUp() {
+ super.setUp();
+
+ EnvFactory.getEnv().initClusterEnvironment();
+ }
+
+ @Override
+ @After
+ public void tearDown() {
+ super.tearDown();
+
+ EnvFactory.getEnv().cleanClusterEnvironment();
+ }
+}
diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/local/IoTDBSubscriptionBasicIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/local/IoTDBSubscriptionBasicIT.java
index 13a5e8abc2617..e9c97c0689672 100644
--- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/local/IoTDBSubscriptionBasicIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/local/IoTDBSubscriptionBasicIT.java
@@ -36,14 +36,16 @@
import org.apache.iotdb.session.subscription.payload.SubscriptionTsFileHandler;
import org.apache.iotdb.subscription.it.IoTDBSubscriptionITConstant;
+import org.apache.tsfile.common.conf.TSFileConfig;
+import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.read.TsFileReader;
import org.apache.tsfile.read.common.Path;
+import org.apache.tsfile.read.common.RowRecord;
import org.apache.tsfile.read.expression.QueryExpression;
import org.apache.tsfile.read.query.dataset.QueryDataSet;
-import org.awaitility.Awaitility;
-import org.junit.After;
+import org.apache.tsfile.utils.Binary;
+import org.apache.tsfile.write.record.Tablet;
import org.junit.Assert;
-import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -53,42 +55,87 @@
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.time.Duration;
+import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Properties;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.LockSupport;
import java.util.stream.Collectors;
+import static org.apache.iotdb.subscription.it.IoTDBSubscriptionITConstant.AWAIT;
import static org.junit.Assert.fail;
@RunWith(IoTDBTestRunner.class)
@Category({LocalStandaloneIT.class})
-public class IoTDBSubscriptionBasicIT {
+public class IoTDBSubscriptionBasicIT extends AbstractSubscriptionLocalIT {
private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBSubscriptionBasicIT.class);
- @Before
- public void setUp() throws Exception {
- EnvFactory.getEnv().initClusterEnvironment();
+ @Test
+ public void testSubscribeBooleanData() throws Exception {
+ testBasicSubscribeTablets(TSDataType.BOOLEAN, "true", true);
+ }
+
+ @Test
+ public void testSubscribeIntData() throws Exception {
+ testBasicSubscribeTablets(TSDataType.INT32, "1", 1);
+ }
+
+ @Test
+ public void testSubscribeLongData() throws Exception {
+ testBasicSubscribeTablets(TSDataType.INT64, "1", 1L);
+ }
+
+ @Test
+ public void testSubscribeFloatData() throws Exception {
+ testBasicSubscribeTablets(TSDataType.FLOAT, "1.0", 1.0F);
+ }
+
+ @Test
+ public void testSubscribeDoubleData() throws Exception {
+ testBasicSubscribeTablets(TSDataType.DOUBLE, "1.0", 1.0);
+ }
+
+ @Test
+ public void testSubscribeTextData() throws Exception {
+ testBasicSubscribeTablets(TSDataType.TEXT, "'a'", new Binary("a", TSFileConfig.STRING_CHARSET));
+ }
+
+ @Test
+ public void testSubscribeTimestampData() throws Exception {
+ testBasicSubscribeTablets(TSDataType.TIMESTAMP, "123", 123L);
}
- @After
- public void tearDown() throws Exception {
- EnvFactory.getEnv().cleanClusterEnvironment();
+ @Test
+ public void testSubscribeDateData() throws Exception {
+ testBasicSubscribeTablets(TSDataType.DATE, "'2011-03-01'", LocalDate.of(2011, 3, 1));
+ }
+
+ @Test
+ public void testSubscribeBlobData() throws Exception {
+ testBasicSubscribeTablets(
+ TSDataType.BLOB, "X'f013'", new Binary(new byte[] {(byte) 0xf0, 0x13}));
}
@Test
- public void testBasicSubscribeTablets() throws Exception {
+ public void testSubscribeStringData() throws Exception {
+ testBasicSubscribeTablets(
+ TSDataType.STRING, "'a'", new Binary("a", TSFileConfig.STRING_CHARSET));
+ }
+
+ private void testBasicSubscribeTablets(
+ final TSDataType type, final String valueStr, final Object expectedData) throws Exception {
// Insert some historical data
try (final ISession session = EnvFactory.getEnv().getSessionConnection()) {
+ session.executeNonQueryStatement(
+ String.format("create timeseries root.db.d1.s1 %s", type.toString()));
for (int i = 0; i < 100; ++i) {
session.executeNonQueryStatement(
- String.format("insert into root.db.d1(time, s1) values (%s, 1)", i));
+ String.format("insert into root.db.d1(time, s1) values (%s, %s)", i, valueStr));
}
session.executeNonQueryStatement("flush");
} catch (final Exception e) {
@@ -132,7 +179,12 @@ public void testBasicSubscribeTablets() throws Exception {
for (final SubscriptionSessionDataSet dataSet :
message.getSessionDataSetsHandler()) {
while (dataSet.hasNext()) {
- dataSet.next();
+ final RowRecord record = dataSet.next();
+ Assert.assertEquals(type.toString(), dataSet.getColumnTypes().get(1));
+ Assert.assertEquals(type, record.getFields().get(0).getDataType());
+ Assert.assertEquals(expectedData, getValue(type, dataSet.getTablet()));
+ Assert.assertEquals(
+ expectedData, record.getFields().get(0).getObjectValue(type));
rowCount.addAndGet(1);
}
}
@@ -146,18 +198,14 @@ public void testBasicSubscribeTablets() throws Exception {
} finally {
LOGGER.info("consumer exiting...");
}
- });
+ },
+ String.format("%s - consumer", testName.getMethodName()));
thread.start();
// Check row count
try {
// Keep retrying if there are execution failures
- Awaitility.await()
- .pollDelay(IoTDBSubscriptionITConstant.AWAITILITY_POLL_DELAY_SECOND, TimeUnit.SECONDS)
- .pollInterval(
- IoTDBSubscriptionITConstant.AWAITILITY_POLL_INTERVAL_SECOND, TimeUnit.SECONDS)
- .atMost(IoTDBSubscriptionITConstant.AWAITILITY_AT_MOST_SECOND, TimeUnit.SECONDS)
- .untilAsserted(() -> Assert.assertEquals(100, rowCount.get()));
+ AWAIT.untilAsserted(() -> Assert.assertEquals(100, rowCount.get()));
} catch (final Exception e) {
e.printStackTrace();
fail(e.getMessage());
@@ -167,6 +215,30 @@ public void testBasicSubscribeTablets() throws Exception {
}
}
+ private Object getValue(final TSDataType type, final Tablet tablet) {
+ switch (type) {
+ case BOOLEAN:
+ return ((boolean[]) tablet.values[0])[0];
+ case INT32:
+ return ((int[]) tablet.values[0])[0];
+ case INT64:
+ case TIMESTAMP:
+ return ((long[]) tablet.values[0])[0];
+ case FLOAT:
+ return ((float[]) tablet.values[0])[0];
+ case DOUBLE:
+ return ((double[]) tablet.values[0])[0];
+ case TEXT:
+ case BLOB:
+ case STRING:
+ return ((Binary[]) tablet.values[0])[0];
+ case DATE:
+ return ((LocalDate[]) tablet.values[0])[0];
+ default:
+ return null;
+ }
+ }
+
@Test
public void testBasicSubscribeTsFile() throws Exception {
// Insert some historical data
@@ -242,18 +314,14 @@ public void testBasicSubscribeTsFile() throws Exception {
} finally {
LOGGER.info("consumer exiting...");
}
- });
+ },
+ String.format("%s - consumer", testName.getMethodName()));
thread.start();
// Check row count
try {
// Keep retrying if there are execution failures
- Awaitility.await()
- .pollDelay(IoTDBSubscriptionITConstant.AWAITILITY_POLL_DELAY_SECOND, TimeUnit.SECONDS)
- .pollInterval(
- IoTDBSubscriptionITConstant.AWAITILITY_POLL_INTERVAL_SECOND, TimeUnit.SECONDS)
- .atMost(IoTDBSubscriptionITConstant.AWAITILITY_AT_MOST_SECOND, TimeUnit.SECONDS)
- .untilAsserted(() -> Assert.assertEquals(100, rowCount.get()));
+ AWAIT.untilAsserted(() -> Assert.assertEquals(100, rowCount.get()));
} catch (final Exception e) {
e.printStackTrace();
fail(e.getMessage());
@@ -379,18 +447,14 @@ public void onFailure(final Throwable e) {
} finally {
LOGGER.info("consumer exiting...");
}
- });
+ },
+ String.format("%s - consumer", testName.getMethodName()));
thread.start();
// Check row count
try {
// Keep retrying if there are execution failures
- Awaitility.await()
- .pollDelay(IoTDBSubscriptionITConstant.AWAITILITY_POLL_DELAY_SECOND, TimeUnit.SECONDS)
- .pollInterval(
- IoTDBSubscriptionITConstant.AWAITILITY_POLL_INTERVAL_SECOND, TimeUnit.SECONDS)
- .atMost(IoTDBSubscriptionITConstant.AWAITILITY_AT_MOST_SECOND, TimeUnit.SECONDS)
- .untilAsserted(() -> Assert.assertEquals(100, rowCount.get()));
+ AWAIT.untilAsserted(() -> Assert.assertEquals(100, rowCount.get()));
Assert.assertTrue(commitSuccessCount.get() > lastCommitSuccessCount.get());
Assert.assertEquals(0, commitFailureCount.get());
} catch (final Exception e) {
@@ -416,12 +480,7 @@ public void onFailure(final Throwable e) {
// Check row count
try {
// Keep retrying if there are execution failures
- Awaitility.await()
- .pollDelay(IoTDBSubscriptionITConstant.AWAITILITY_POLL_DELAY_SECOND, TimeUnit.SECONDS)
- .pollInterval(
- IoTDBSubscriptionITConstant.AWAITILITY_POLL_INTERVAL_SECOND, TimeUnit.SECONDS)
- .atMost(IoTDBSubscriptionITConstant.AWAITILITY_AT_MOST_SECOND, TimeUnit.SECONDS)
- .untilAsserted(() -> Assert.assertEquals(200, rowCount.get()));
+ AWAIT.untilAsserted(() -> Assert.assertEquals(200, rowCount.get()));
Assert.assertTrue(commitSuccessCount.get() > lastCommitSuccessCount.get());
Assert.assertEquals(0, commitFailureCount.get());
} catch (final Exception e) {
@@ -486,16 +545,11 @@ public void testBasicPushConsumer() {
consumer.subscribe(topicName);
// The push consumer should automatically poll 10 rows of data by 1 onReceive()
- Awaitility.await()
- .pollDelay(IoTDBSubscriptionITConstant.AWAITILITY_POLL_DELAY_SECOND, TimeUnit.SECONDS)
- .pollInterval(
- IoTDBSubscriptionITConstant.AWAITILITY_POLL_INTERVAL_SECOND, TimeUnit.SECONDS)
- .atMost(IoTDBSubscriptionITConstant.AWAITILITY_AT_MOST_SECOND, TimeUnit.SECONDS)
- .untilAsserted(
- () -> {
- Assert.assertEquals(10, rowCount.get());
- Assert.assertTrue(onReceiveCount.get() > lastOnReceiveCount.get());
- });
+ AWAIT.untilAsserted(
+ () -> {
+ Assert.assertEquals(10, rowCount.get());
+ Assert.assertTrue(onReceiveCount.get() > lastOnReceiveCount.get());
+ });
lastOnReceiveCount.set(onReceiveCount.get());
@@ -508,16 +562,11 @@ public void testBasicPushConsumer() {
session.executeNonQueryStatement("flush");
}
- Awaitility.await()
- .pollDelay(IoTDBSubscriptionITConstant.AWAITILITY_POLL_DELAY_SECOND, TimeUnit.SECONDS)
- .pollInterval(
- IoTDBSubscriptionITConstant.AWAITILITY_POLL_INTERVAL_SECOND, TimeUnit.SECONDS)
- .atMost(IoTDBSubscriptionITConstant.AWAITILITY_AT_MOST_SECOND, TimeUnit.SECONDS)
- .untilAsserted(
- () -> {
- Assert.assertEquals(20, rowCount.get());
- Assert.assertTrue(onReceiveCount.get() > lastOnReceiveCount.get());
- });
+ AWAIT.untilAsserted(
+ () -> {
+ Assert.assertEquals(20, rowCount.get());
+ Assert.assertTrue(onReceiveCount.get() > lastOnReceiveCount.get());
+ });
lastOnReceiveCount.set(onReceiveCount.get());
@@ -529,16 +578,11 @@ public void testBasicPushConsumer() {
session.executeNonQueryStatement("flush");
}
- Awaitility.await()
- .pollDelay(IoTDBSubscriptionITConstant.AWAITILITY_POLL_DELAY_SECOND, TimeUnit.SECONDS)
- .pollInterval(
- IoTDBSubscriptionITConstant.AWAITILITY_POLL_INTERVAL_SECOND, TimeUnit.SECONDS)
- .atMost(IoTDBSubscriptionITConstant.AWAITILITY_AT_MOST_SECOND, TimeUnit.SECONDS)
- .untilAsserted(
- () -> {
- Assert.assertEquals(30, rowCount.get());
- Assert.assertTrue(onReceiveCount.get() > lastOnReceiveCount.get());
- });
+ AWAIT.untilAsserted(
+ () -> {
+ Assert.assertEquals(30, rowCount.get());
+ Assert.assertTrue(onReceiveCount.get() > lastOnReceiveCount.get());
+ });
consumer.unsubscribe(topicName);
} catch (final Exception e) {
@@ -624,22 +668,18 @@ public void testPollUnsubscribedTopics() throws Exception {
} finally {
LOGGER.info("consumer exiting...");
}
- });
+ },
+ String.format("%s - consumer", testName.getMethodName()));
thread.start();
// Check row count
try {
// Keep retrying if there are execution failures
- Awaitility.await()
- .pollDelay(IoTDBSubscriptionITConstant.AWAITILITY_POLL_DELAY_SECOND, TimeUnit.SECONDS)
- .pollInterval(
- IoTDBSubscriptionITConstant.AWAITILITY_POLL_INTERVAL_SECOND, TimeUnit.SECONDS)
- .atMost(IoTDBSubscriptionITConstant.AWAITILITY_AT_MOST_SECOND, TimeUnit.SECONDS)
- .untilAsserted(
- () -> {
- Assert.assertEquals(100, rowCount.get());
- Assert.assertEquals((100 + 199) * 100 / 2, timestampSum.get());
- });
+ AWAIT.untilAsserted(
+ () -> {
+ Assert.assertEquals(100, rowCount.get());
+ Assert.assertEquals((100 + 199) * 100 / 2, timestampSum.get());
+ });
} catch (final Exception e) {
e.printStackTrace();
fail(e.getMessage());
diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/local/IoTDBSubscriptionIdempotentIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/local/IoTDBSubscriptionIdempotentIT.java
index b671acd6709f4..85fff437f18e6 100644
--- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/local/IoTDBSubscriptionIdempotentIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/local/IoTDBSubscriptionIdempotentIT.java
@@ -25,9 +25,7 @@
import org.apache.iotdb.session.subscription.SubscriptionSession;
import org.apache.iotdb.session.subscription.consumer.SubscriptionPullConsumer;
-import org.junit.After;
import org.junit.Assert;
-import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -38,20 +36,10 @@
@RunWith(IoTDBTestRunner.class)
@Category({LocalStandaloneIT.class})
-public class IoTDBSubscriptionIdempotentIT {
+public class IoTDBSubscriptionIdempotentIT extends AbstractSubscriptionLocalIT {
private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBSubscriptionIdempotentIT.class);
- @Before
- public void setUp() throws Exception {
- EnvFactory.getEnv().initClusterEnvironment();
- }
-
- @After
- public void tearDown() throws Exception {
- EnvFactory.getEnv().cleanClusterEnvironment();
- }
-
@Test
public void testSubscribeOrUnsubscribeNonExistedTopicTest() {
final String host = EnvFactory.getEnv().getIP();
diff --git a/integration-test/src/test/java/org/apache/iotdb/tools/it/ExportTsFileTestIT.java b/integration-test/src/test/java/org/apache/iotdb/tools/it/ExportTsFileTestIT.java
index 71a3d62a382ab..5994d4d554eea 100644
--- a/integration-test/src/test/java/org/apache/iotdb/tools/it/ExportTsFileTestIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/tools/it/ExportTsFileTestIT.java
@@ -90,7 +90,7 @@ protected void testOnWindows() throws IOException {
"root",
"-pw",
"root",
- "-td",
+ "-t",
"target",
"-q",
"select * from root.test.t2 where time > 1 and time < 1000000000000",
@@ -116,7 +116,7 @@ protected void testOnWindows() throws IOException {
"root",
"-pw",
"root",
- "-td",
+ "-t",
"target",
"-q",
"select * from root.test.t2 where time > 1 and time < 1000000000000",
@@ -143,7 +143,7 @@ protected void testOnUnix() throws IOException {
"root",
"-pw",
"root",
- "-td",
+ "-t",
"target",
"-q",
"select * from root.**");
@@ -166,7 +166,7 @@ protected void testOnUnix() throws IOException {
"root",
"-pw",
"root",
- "-td",
+ "-t",
"target",
"-q",
"select * from root.**");
diff --git a/integration-test/src/test/java/org/apache/iotdb/util/AbstractSchemaIT.java b/integration-test/src/test/java/org/apache/iotdb/util/AbstractSchemaIT.java
index deefd0cccc90e..1c3f3708ae374 100644
--- a/integration-test/src/test/java/org/apache/iotdb/util/AbstractSchemaIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/util/AbstractSchemaIT.java
@@ -100,6 +100,14 @@ protected static void clearSchema() throws Exception {
"DROP DEVICE TEMPLATE " + resultSet.getString(ColumnHeaderConstant.TEMPLATE_NAME));
}
}
+ // drop all users
+ try (ResultSet resultSet = statement.executeQuery("LIST USER")) {
+ while (resultSet.next()) {
+ if (!resultSet.getString(ColumnHeaderConstant.USER).equals("root")) {
+ statement.execute("DROP USER " + resultSet.getString(ColumnHeaderConstant.USER));
+ }
+ }
+ }
}
}
diff --git a/iotdb-api/pipe-api/src/main/java/org/apache/iotdb/pipe/api/access/Row.java b/iotdb-api/pipe-api/src/main/java/org/apache/iotdb/pipe/api/access/Row.java
index b3c1342347da1..f22ac5e026dc6 100644
--- a/iotdb-api/pipe-api/src/main/java/org/apache/iotdb/pipe/api/access/Row.java
+++ b/iotdb-api/pipe-api/src/main/java/org/apache/iotdb/pipe/api/access/Row.java
@@ -25,6 +25,7 @@
import org.apache.tsfile.read.common.Path;
+import java.time.LocalDate;
import java.util.List;
public interface Row {
@@ -44,17 +45,28 @@ public interface Row {
* @param columnIndex index of the specified column
* @return the int value at the specified column in this row
*/
- int getInt(int columnIndex);
+ int getInt(final int columnIndex);
+
+ /**
+ * Returns the localDate value at the specified column in this row.
+ *
+ * Users need to ensure that the data type of the specified column is {@code Type.DATE}.
+ *
+ * @param columnIndex index of the specified column
+ * @return the int value at the specified column in this row
+ */
+ LocalDate getDate(final int columnIndex);
/**
* Returns the long value at the specified column in this row.
*
- *
Users need to ensure that the data type of the specified column is {@code Type.INT64}.
+ *
Users need to ensure that the data type of the specified column is {@code Type.INT64} or
+ * {@code Type.TIMESTAMP}.
*
* @param columnIndex index of the specified column
* @return the long value at the specified column in this row
*/
- long getLong(int columnIndex);
+ long getLong(final int columnIndex);
/**
* Returns the float value at the specified column in this row.
@@ -64,7 +76,7 @@ public interface Row {
* @param columnIndex index of the specified column
* @return the float value at the specified column in this row
*/
- float getFloat(int columnIndex);
+ float getFloat(final int columnIndex);
/**
* Returns the double value at the specified column in this row.
@@ -74,7 +86,7 @@ public interface Row {
* @param columnIndex index of the specified column
* @return the double value at the specified column in this row
*/
- double getDouble(int columnIndex);
+ double getDouble(final int columnIndex);
/**
* Returns the boolean value at the specified column in this row.
@@ -84,35 +96,37 @@ public interface Row {
* @param columnIndex index of the specified column
* @return the boolean value at the specified column in this row
*/
- boolean getBoolean(int columnIndex);
+ boolean getBoolean(final int columnIndex);
/**
* Returns the Binary value at the specified column in this row.
*
- *
Users need to ensure that the data type of the specified column is {@code Type.TEXT}.
+ *
Users need to ensure that the data type of the specified column is {@code Type.TEXT}, {@code
+ * Type.BLOB} or {@code Type.STRING}.
*
* @param columnIndex index of the specified column
* @return the Binary value at the specified column in this row
*/
- Binary getBinary(int columnIndex);
+ Binary getBinary(final int columnIndex);
/**
* Returns the String value at the specified column in this row.
*
- *
Users need to ensure that the data type of the specified column is {@code Type.TEXT}.
+ *
Users need to ensure that the data type of the specified column is {@code Type.TEXT} or
+ * {@code Type.STRING}.
*
* @param columnIndex index of the specified column
* @return the String value at the specified column in this row
*/
- String getString(int columnIndex);
+ String getString(final int columnIndex);
/**
- * Returns the Object value at the specified column in this row.
+ * Returns the raw Object stored at the specified column in this row.
*
* @param columnIndex index of the specified column
* @return the Object value at the specified column in this row
*/
- Object getObject(int columnIndex);
+ Object getObject(final int columnIndex);
/**
* Returns the actual data type of the value at the specified column in this row.
@@ -120,7 +134,7 @@ public interface Row {
* @param columnIndex index of the specified column
* @return the actual data type of the value at the specified column in this row
*/
- Type getDataType(int columnIndex);
+ Type getDataType(final int columnIndex);
/**
* Returns {@code true} if the value of the specified column is null.
@@ -128,7 +142,7 @@ public interface Row {
* @param columnIndex index of the specified column
* @return {@code true} if the value of the specified column is null
*/
- boolean isNull(int columnIndex);
+ boolean isNull(final int columnIndex);
/**
* Returns the number of columns (excluding the timestamp column).
@@ -144,7 +158,7 @@ public interface Row {
* @return the actual column index of the given column name
* @throws PipeParameterNotValidException if the given column name is not existed in the Row
*/
- int getColumnIndex(Path columnName) throws PipeParameterNotValidException;
+ int getColumnIndex(final Path columnName) throws PipeParameterNotValidException;
/**
* Returns the actual column (measurement) name of the given column index.
@@ -152,7 +166,7 @@ public interface Row {
* @param columnIndex the column index
* @return the actual column (measurement) name of the given column index
*/
- String getColumnName(int columnIndex);
+ String getColumnName(final int columnIndex);
/**
* Returns the column data types in the Row.
diff --git a/iotdb-api/pipe-api/src/main/java/org/apache/iotdb/pipe/api/type/Type.java b/iotdb-api/pipe-api/src/main/java/org/apache/iotdb/pipe/api/type/Type.java
index 85a4390eae46e..9093133631a0e 100644
--- a/iotdb-api/pipe-api/src/main/java/org/apache/iotdb/pipe/api/type/Type.java
+++ b/iotdb-api/pipe-api/src/main/java/org/apache/iotdb/pipe/api/type/Type.java
@@ -36,7 +36,20 @@ public enum Type {
DOUBLE((byte) 4),
/* TEXT */
- TEXT((byte) 5);
+ TEXT((byte) 5),
+
+ /* TsDataType.Vector and TsDataType.UNKNOWN are inner types of TsFile-module, which should not be supported in UDF APIs. To be consistent with TsDataType, the next value starts with 8 */
+ /* TIMESTAMP */
+ TIMESTAMP((byte) 8),
+
+ /* DATE */
+ DATE((byte) 9),
+
+ /* BLOB */
+ BLOB((byte) 10),
+
+ /* STRING */
+ STRING((byte) 11);
private final byte dataType;
diff --git a/iotdb-api/udf-api/src/main/java/org/apache/iotdb/udf/api/utils/RowImpl.java b/iotdb-api/udf-api/src/main/java/org/apache/iotdb/udf/api/utils/RowImpl.java
index d7d3a88486902..533ab9574df6d 100644
--- a/iotdb-api/udf-api/src/main/java/org/apache/iotdb/udf/api/utils/RowImpl.java
+++ b/iotdb-api/udf-api/src/main/java/org/apache/iotdb/udf/api/utils/RowImpl.java
@@ -142,6 +142,14 @@ private static Type transformToUDFDataType(TSDataType tsDataType) {
return Type.DOUBLE;
case 5:
return Type.TEXT;
+ case 8:
+ return Type.TIMESTAMP;
+ case 9:
+ return Type.DATE;
+ case 10:
+ return Type.BLOB;
+ case 11:
+ return Type.STRING;
default:
throw new IllegalArgumentException("Invalid input: " + type);
}
diff --git a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/AbstractTsFileTool.java b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/AbstractTsFileTool.java
index 4a4ee1dbb11fc..fe8691ddf8b65 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/AbstractTsFileTool.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/AbstractTsFileTool.java
@@ -42,8 +42,8 @@ public abstract class AbstractTsFileTool {
protected static final String USERNAME_ARGS = "u";
protected static final String USERNAME_NAME = "username";
- protected static final String TIMEOUT_ARGS = "t";
- protected static final String TIMEOUT_NAME = "timeout";
+ protected static final String TIMEOUT_ARGS = "timeout";
+ protected static final String TIMEOUT_NAME = "queryTimeout";
protected static final int MAX_HELP_CONSOLE_WIDTH = 92;
protected static final int CODE_OK = 0;
protected static final int CODE_ERROR = 1;
@@ -109,7 +109,7 @@ protected static void createBaseOptions() {
.longOpt(HOST_NAME)
.argName(HOST_NAME)
.hasArg()
- .desc("Host Name")
+ .desc("Host Name (optional)")
.build();
options.addOption(opHost);
@@ -118,7 +118,7 @@ protected static void createBaseOptions() {
.longOpt(PORT_NAME)
.argName(PORT_NAME)
.hasArg()
- .desc("Port")
+ .desc("Port (optional)")
.build();
options.addOption(opPort);
@@ -127,7 +127,7 @@ protected static void createBaseOptions() {
.longOpt(USERNAME_NAME)
.argName(USERNAME_NAME)
.hasArg()
- .desc("Username")
+ .desc("Username (optional)")
.build();
options.addOption(opUsername);
@@ -137,7 +137,7 @@ protected static void createBaseOptions() {
.optionalArg(true)
.argName(PW_NAME)
.hasArg()
- .desc("Password")
+ .desc("Password (optional)")
.build();
options.addOption(opPassword);
}
diff --git a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java
index 3f89ec69c5296..9ab3d6b3ec65b 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java
@@ -62,13 +62,13 @@
public class ExportTsFile extends AbstractTsFileTool {
- private static final String TARGET_DIR_ARGS = "td";
+ private static final String TARGET_DIR_ARGS = "t";
private static final String TARGET_DIR_NAME = "targetDirectory";
- private static final String TARGET_FILE_ARGS = "f";
- private static final String TARGET_FILE_NAME = "targetFile";
+ private static final String TARGET_FILE_ARGS = "tfn";
+ private static final String TARGET_FILE_NAME = "targetFileName";
private static final String SQL_FILE_ARGS = "s";
- private static final String SQL_FILE_NAME = "sqlfile";
+ private static final String SQL_FILE_NAME = "sourceSqlFile";
private static final String QUERY_COMMAND_ARGS = "q";
private static final String QUERY_COMMAND_NAME = "queryCommand";
private static final String DUMP_FILE_NAME_DEFAULT = "dump";
@@ -266,7 +266,7 @@ private static void createOptions() {
Option opTimeout =
Option.builder(TIMEOUT_ARGS)
- .longOpt(TIMEOUT_NAME)
+ .argName(TIMEOUT_NAME)
.hasArg()
.desc("Timeout for session query")
.build();
diff --git a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportTsFile.java b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportTsFile.java
index 4e74dbe5f594e..320b03334df59 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportTsFile.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportTsFile.java
@@ -310,7 +310,9 @@ public static int importFromTargetPath() {
}
sessionPool =
- new SessionPool(host, Integer.parseInt(port), username, password, threadNum + 1);
+ new SessionPool(
+ host, Integer.parseInt(port), username, password, threadNum + 1, false, false);
+ sessionPool.setEnableQueryRedirection(false);
traverseAndCollectFiles(file);
addNoResourceOrModsToQueue();
diff --git a/iotdb-client/client-cpp/README.md b/iotdb-client/client-cpp/README.md
index deb6ea4e428bc..81983e06e2e4d 100644
--- a/iotdb-client/client-cpp/README.md
+++ b/iotdb-client/client-cpp/README.md
@@ -20,46 +20,79 @@
-->
# Building C++ Client
-To compile cpp client, add "-P with-cpp" option to maven build command.
-
-The compiling requires the module "compile-tools" to be built first.
-For more information, please refer to "compile-tools/README.md".
-
-Explicitly using mvnw here as the build requires maven 3.9 and the default installation is older
-
## Compile and Test:
### Compile
-`mvn clean package -P with-cpp -pl iotdb-client/client-cpp -am -DskipTests`
-### Test
-First build IoTDB server
-
-Explicitly using "install" instead of package in order to be sure we're using libs built on this machine
+#### Unix
+To compile the cpp client, use the following command:
+`mvn clean package -P with-cpp -pl iotdb-client/client-cpp -am -DskipTests`
-`mvn clean install -P with-cpp -pl distribution,iotdb-client/client-cpp -am -DskipTests`
+#### Windows
+To compile on Windows, please install Boost first and add following Maven
+settings:
+```
+-Dboost.include.dir=${your boost header folder} -Dboost.library.dir=${your boost lib (stage) folder}`
+```
-After run verify
+The thrift dependency that the cpp client uses is incompatible with MinGW, please use Visual
+Studio. It is highly recommended to use Visual Studio 2022 or later.
-`mvn clean verify -P with-cpp -pl iotdb-client/client-cpp -am`
+##### Visual Studio 2022
+If you are using Visual Studio 2022, you can compile the cpp client with the following command:
-To compile on Windows, please install Boost first and add following Maven settings:
```
--Dboost.include.dir=${your boost header folder} -Dboost.library.dir=${your boost lib (stage) folder}`
+mvn clean package -P with-cpp -pl iotdb-client/client-cpp -am -DskipTest
+-D"boost.include.dir"="D:\boost_1_75_0" -D"boost.library.dir"="D:\boost_1_75_0\stage\lib"
```
-e.g.,
+#### Visual Studio 2019 or older
+If you are using Visual Studio 2019 or older, the pre-built Thrift library is incompatible. You
+will have to compile the thrift library manually:
+
+1. Install the dependencies of Thrift:
+* flex http://gnuwin32.sourceforge.net/packages/flex.htm
+* bison http://gnuwin32.sourceforge.net/packages/bison.htm
+* openssl https://slproweb.com/products/Win32OpenSSL.html
+
+2. Clone the repository: https://github.com/apache/iotdb-bin-resources.
+
+3. Enter the "iotdb-tools-thrift" folder in the cloned repository; use the following command to
+ compile the thrift library:
+
+`mvn install`
+
+4. If you encounter a problem like "cannot find 'unistd.h'", please open the file
+"iotdb-bin-resources\iotdb-tools-thrift\target\build\compiler\cpp\thrift\thriftl.cc" and replace
+"#include " with "#include " and "#include "; then, rerun the command
+ in the third step;
+
+5. Return to the cpp client repository and compile it with:
+
```
mvn clean package -P with-cpp -pl iotdb-client/client-cpp -am -DskipTest
-D"boost.include.dir"="D:\boost_1_75_0" -D"boost.library.dir"="D:\boost_1_75_0\stage\lib"
```
-##
+
+### Test
+First build IoTDB server together with the cpp client.
+
+Explicitly using "install" instead of package in order to be sure we're using libs built on this
+machine.
+
+`mvn clean install -P with-cpp -pl distribution,iotdb-client/client-cpp -am -DskipTests`
+
+After run verify
+
+`mvn clean verify -P with-cpp -pl iotdb-client/client-cpp -am`
+
+## Package Hierarchy
If the compilation finishes successfully, the packaged zip file will be placed under
"client-cpp/target/client-cpp-${project.version}-cpp-${os}.zip".
-On Mac machines, the hierarchy of the package should look like this:
+On macOS, the hierarchy of the package should look like this:
```
.
+-- client
@@ -71,17 +104,22 @@ On Mac machines, the hierarchy of the package should look like this:
| +-- thrift
| +-- thrift_headers...
| +-- lib
-| +-- libiotdb_session.dylib
+| +-- Release
+| +-- libiotdb_session.dylib
+| +-- parser.dylib
+| +-- thriftmd.dylib
+| +-- tutorialgencpp.dylib
```
## Using C++ Client:
```
-1. Put the zip file "client-cpp-${project.version}-cpp-${os}.zip" wherever you want
+1. Put the zip file "client-cpp-${project.version}-cpp-${os}.zip" wherever you want;
-2. Unzip the archive using the following command, and then you can get the two directories mentioned above, the header file and the dynamic library
+2. Unzip the archive using the following command, and then you can get the two directories
+mentioned above, the header file and the dynamic library:
unzip client-cpp-${project.version}-cpp-${os}.zip
-3. Write C++ code to call the operation interface of cpp-client to operate IOTDB,
+3. Write C++ code to call the operation interface of the cpp client to operate IoTDB,
for detail interface information, please refer to the link: https://iotdb.apache.org/zh/UserGuide/Master/API/Programming-Cpp-Native-API.html
E.g:
diff --git a/iotdb-client/client-cpp/src/assembly/client-cpp.xml b/iotdb-client/client-cpp/src/assembly/client-cpp.xml
index 9de99eae649a9..729fdadde235a 100644
--- a/iotdb-client/client-cpp/src/assembly/client-cpp.xml
+++ b/iotdb-client/client-cpp/src/assembly/client-cpp.xml
@@ -33,13 +33,19 @@
include
- ${project.basedir}/../compile-tools/thrift/target/thrift-${thrift.version}/lib/cpp/src
+ ${project.build.directory}/thrift/include
- **/*.h
- **/*.tcc
+ **
include
+
+ ${project.build.directory}/thrift/lib
+
+ **
+
+ lib
+
${project.build.directory}/build/main
diff --git a/iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py b/iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py
index 53ef09b8e7aa3..eb859d7d30c1d 100644
--- a/iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py
+++ b/iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py
@@ -151,7 +151,7 @@ def construct_one_data_frame(self):
self.__query_data_set.time, np.dtype(np.longlong).newbyteorder(">")
)
if time_array.dtype.byteorder == ">":
- time_array = time_array.byteswap().newbyteorder("<")
+ time_array = time_array.byteswap().view(time_array.dtype.newbyteorder("<"))
result[0] = time_array
total_length = len(time_array)
for i in range(self.column_size):
@@ -205,7 +205,9 @@ def construct_one_data_frame(self):
else:
raise RuntimeError("unsupported data type {}.".format(data_type))
if data_array.dtype.byteorder == ">":
- data_array = data_array.byteswap().newbyteorder("<")
+ data_array = data_array.byteswap().view(
+ data_array.dtype.newbyteorder("<")
+ )
# self.__query_data_set.valueList[location] = None
if len(data_array) < total_length:
# INT32 or INT64 or boolean
@@ -258,7 +260,9 @@ def resultset_to_pandas(self):
self.__query_data_set.time, np.dtype(np.longlong).newbyteorder(">")
)
if time_array.dtype.byteorder == ">":
- time_array = time_array.byteswap().newbyteorder("<")
+ time_array = time_array.byteswap().view(
+ time_array.dtype.newbyteorder("<")
+ )
if self.ignore_timestamp is None or self.ignore_timestamp is False:
result[IoTDBRpcDataSet.TIMESTAMP_STR].append(time_array)
@@ -317,7 +321,9 @@ def resultset_to_pandas(self):
else:
raise RuntimeError("unsupported data type {}.".format(data_type))
if data_array.dtype.byteorder == ">":
- data_array = data_array.byteswap().newbyteorder("<")
+ data_array = data_array.byteswap().view(
+ data_array.dtype.newbyteorder("<")
+ )
self.__query_data_set.valueList[location] = None
tmp_array = []
if len(data_array) < total_length:
diff --git a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java
index 9b29f052f28b2..e48054abb1974 100644
--- a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java
+++ b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java
@@ -146,18 +146,20 @@ public static TSStatus getStatus(TSStatusCode tsStatusCode) {
public static TSStatus getStatus(List statusList) {
TSStatus status = new TSStatus(TSStatusCode.MULTIPLE_ERROR.getStatusCode());
status.setSubStatus(statusList);
- StringBuilder errMsg = new StringBuilder().append("Multiple error occur, messages: ");
- Set msgSet = new HashSet<>();
- for (TSStatus subStatus : statusList) {
- if (subStatus.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()
- && subStatus.getCode() != TSStatusCode.REDIRECTION_RECOMMEND.getStatusCode()) {
- if (!msgSet.contains(status.getMessage())) {
- errMsg.append(status.getMessage()).append("; ");
- msgSet.add(status.getMessage());
+ if (LOGGER.isDebugEnabled()) {
+ StringBuilder errMsg = new StringBuilder().append("Multiple error occur, messages: ");
+ Set msgSet = new HashSet<>();
+ for (TSStatus subStatus : statusList) {
+ if (subStatus.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()
+ && subStatus.getCode() != TSStatusCode.REDIRECTION_RECOMMEND.getStatusCode()) {
+ if (!msgSet.contains(status)) {
+ errMsg.append(status).append("; ");
+ msgSet.add(status);
+ }
}
}
+ LOGGER.debug(errMsg.toString(), new Exception(errMsg.toString()));
}
- LOGGER.warn(errMsg.toString());
return status;
}
diff --git a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java
index 2324dbbd575f2..e57365b33ea46 100644
--- a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java
+++ b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java
@@ -166,6 +166,7 @@ public enum TSStatusCode {
CAN_NOT_CONNECT_DATANODE(1007),
TRANSFER_LEADER_ERROR(1008),
GET_CLUSTER_ID_ERROR(1009),
+ CAN_NOT_CONNECT_CONFIGNODE(1010),
// Sync, Load TsFile
LOAD_FILE_ERROR(1100),
diff --git a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/config/TopicConfig.java b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/config/TopicConfig.java
index fe62ba622a965..6dc42ed634aea 100644
--- a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/config/TopicConfig.java
+++ b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/config/TopicConfig.java
@@ -28,7 +28,10 @@
import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
public class TopicConfig extends PipeParameters {
@@ -40,6 +43,25 @@ public TopicConfig(final Map attributes) {
super(attributes);
}
+ private static final Map REALTIME_BATCH_MODE_CONFIG =
+ Collections.singletonMap("realtime.mode", "batch");
+ private static final Map REALTIME_STREAM_MODE_CONFIG =
+ Collections.singletonMap("realtime.mode", "stream");
+
+ private static final Map QUERY_MODE_CONFIG =
+ Collections.singletonMap("mode", "query");
+ private static final Map SUBSCRIBE_MODE_CONFIG =
+ Collections.singletonMap("mode", "subscribe");
+
+ private static final Set LOOSE_RANGE_KEY_SET =
+ Collections.unmodifiableSet(
+ new HashSet() {
+ {
+ add("history.loose-range");
+ add("realtime.loose-range");
+ }
+ });
+
/////////////////////////////// de/ser ///////////////////////////////
public void serialize(final DataOutputStream stream) throws IOException {
@@ -84,21 +106,29 @@ public Map getAttributesWithTimeRange(final long creationTime) {
attributesWithTimeRange.put(TopicConstant.END_TIME_KEY, endTime);
}
- // enable loose range when using tsfile format
- if (TopicConstant.FORMAT_TS_FILE_HANDLER_VALUE.equals(
- attributes.getOrDefault(TopicConstant.FORMAT_KEY, TopicConstant.FORMAT_DEFAULT_VALUE))) {
- attributesWithTimeRange.put("history.loose-range", "time");
- attributesWithTimeRange.put("realtime.loose-range", "time");
- }
-
return attributesWithTimeRange;
}
public Map getAttributesWithRealtimeMode() {
return TopicConstant.FORMAT_TS_FILE_HANDLER_VALUE.equals(
attributes.getOrDefault(TopicConstant.FORMAT_KEY, TopicConstant.FORMAT_DEFAULT_VALUE))
- ? Collections.singletonMap("realtime.mode", "batch")
- : Collections.singletonMap("realtime.mode", "hybrid");
+ ? REALTIME_BATCH_MODE_CONFIG
+ : REALTIME_STREAM_MODE_CONFIG;
+ }
+
+ public Map getAttributesWithSourceMode() {
+ return TopicConstant.MODE_QUERY_VALUE.equals(
+ attributes.getOrDefault(TopicConstant.MODE_KEY, TopicConstant.MODE_DEFAULT_VALUE))
+ ? QUERY_MODE_CONFIG
+ : SUBSCRIBE_MODE_CONFIG;
+ }
+
+ public Map getAttributesWithSourceLooseRange() {
+ final String looseRangeValue =
+ attributes.getOrDefault(
+ TopicConstant.LOOSE_RANGE_KEY, TopicConstant.LOOSE_RANGE_DEFAULT_VALUE);
+ return LOOSE_RANGE_KEY_SET.stream()
+ .collect(Collectors.toMap(key -> key, key -> looseRangeValue));
}
public Map getAttributesWithProcessorPrefix() {
diff --git a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/config/TopicConstant.java b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/config/TopicConstant.java
index bd44cf1bcc95d..a3226c1d64063 100644
--- a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/config/TopicConstant.java
+++ b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/config/TopicConstant.java
@@ -30,11 +30,22 @@ public class TopicConstant {
public static final String END_TIME_KEY = "end-time";
public static final String NOW_TIME_VALUE = "now";
+ public static final String MODE_KEY = "mode";
+ public static final String MODE_SUBSCRIBE_VALUE = "subscribe";
+ public static final String MODE_QUERY_VALUE = "query";
+ public static final String MODE_DEFAULT_VALUE = MODE_SUBSCRIBE_VALUE;
+
public static final String FORMAT_KEY = "format";
public static final String FORMAT_SESSION_DATA_SETS_HANDLER_VALUE = "SessionDataSetsHandler";
public static final String FORMAT_TS_FILE_HANDLER_VALUE = "TsFileHandler";
public static final String FORMAT_DEFAULT_VALUE = FORMAT_SESSION_DATA_SETS_HANDLER_VALUE;
+ public static final String LOOSE_RANGE_KEY = "loose-range";
+ public static final String LOOSE_RANGE_TIME_VALUE = "time";
+ public static final String LOOSE_RANGE_PATH_VALUE = "path";
+ public static final String LOOSE_RANGE_TIME_AND_PATH_VALUE = "time,path";
+ public static final String LOOSE_RANGE_DEFAULT_VALUE = "";
+
private TopicConstant() {
throw new IllegalStateException("Utility class");
}
diff --git a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/exception/SubscriptionIdentifierSemanticException.java b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/exception/SubscriptionIdentifierSemanticException.java
new file mode 100644
index 0000000000000..6eb9ba6d73484
--- /dev/null
+++ b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/exception/SubscriptionIdentifierSemanticException.java
@@ -0,0 +1,42 @@
+/*
+ * 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.iotdb.rpc.subscription.exception;
+
+import java.util.Objects;
+
+public class SubscriptionIdentifierSemanticException extends SubscriptionException {
+
+ public SubscriptionIdentifierSemanticException(final String message) {
+ super(message);
+ }
+
+ public SubscriptionIdentifierSemanticException(final String message, final Throwable cause) {
+ super(message, cause);
+ }
+
+ @Override
+ public boolean equals(final Object obj) {
+ return obj instanceof SubscriptionIdentifierSemanticException
+ && Objects.equals(
+ getMessage(), ((SubscriptionIdentifierSemanticException) obj).getMessage())
+ && Objects.equals(
+ getTimeStamp(), ((SubscriptionIdentifierSemanticException) obj).getTimeStamp());
+ }
+}
diff --git a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/payload/poll/SubscriptionPollResponse.java b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/payload/poll/SubscriptionPollResponse.java
index d386903f124d0..01d173d274283 100644
--- a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/payload/poll/SubscriptionPollResponse.java
+++ b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/payload/poll/SubscriptionPollResponse.java
@@ -95,6 +95,9 @@ public static SubscriptionPollResponse deserialize(final ByteBuffer buffer) {
case ERROR:
payload = new ErrorPayload().deserialize(buffer);
break;
+ case TERMINATION:
+ payload = new TerminationPayload().deserialize(buffer);
+ break;
default:
LOGGER.warn("unexpected response type: {}, payload will be null", responseType);
break;
diff --git a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/payload/poll/SubscriptionPollResponseType.java b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/payload/poll/SubscriptionPollResponseType.java
index a22c9590c65fc..b27791b36c538 100644
--- a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/payload/poll/SubscriptionPollResponseType.java
+++ b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/payload/poll/SubscriptionPollResponseType.java
@@ -31,6 +31,8 @@ public enum SubscriptionPollResponseType {
FILE_INIT((short) 2),
FILE_PIECE((short) 3),
FILE_SEAL((short) 4),
+
+ TERMINATION((short) 5),
;
private final short type;
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/DecoratingLock.java b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/payload/poll/TerminationPayload.java
similarity index 61%
rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/DecoratingLock.java
rename to iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/payload/poll/TerminationPayload.java
index cc5d0d93e5eee..c2da3f92e6dd8 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/DecoratingLock.java
+++ b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/payload/poll/TerminationPayload.java
@@ -17,28 +17,26 @@
* under the License.
*/
-package org.apache.iotdb.commons.pipe.task;
+package org.apache.iotdb.rpc.subscription.payload.poll;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.io.DataOutputStream;
+import java.nio.ByteBuffer;
-public class DecoratingLock {
- private final AtomicBoolean isDecorating = new AtomicBoolean(false);
+public class TerminationPayload implements SubscriptionPollPayload {
- public void waitForDecorated() {
- while (isDecorating.get()) {
- try {
- Thread.sleep(10);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }
- }
+ @Override
+ public void serialize(final DataOutputStream stream) {
+ // do nothing
}
- public void markAsDecorating() {
- isDecorating.set(true);
+ @Override
+ public SubscriptionPollPayload deserialize(final ByteBuffer buffer) {
+ // do nothing
+ return null;
}
- public void markAsDecorated() {
- isDecorating.set(false);
+ @Override
+ public String toString() {
+ return "TerminationPayload";
}
}
diff --git a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/payload/response/PipeSubscribeSubscribeResp.java b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/payload/response/PipeSubscribeSubscribeResp.java
index a5540150898d2..1d1571b0122ee 100644
--- a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/payload/response/PipeSubscribeSubscribeResp.java
+++ b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/payload/response/PipeSubscribeSubscribeResp.java
@@ -22,10 +22,25 @@
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.service.rpc.thrift.TPipeSubscribeResp;
+import org.apache.tsfile.utils.PublicBAOS;
+import org.apache.tsfile.utils.ReadWriteIOUtils;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.HashSet;
import java.util.Objects;
+import java.util.Set;
public class PipeSubscribeSubscribeResp extends TPipeSubscribeResp {
+ private transient Set topicNames = new HashSet<>(); // subscribed topic names
+
+ public Set getTopicNames() {
+ return topicNames;
+ }
+
/////////////////////////////// Thrift ///////////////////////////////
/**
@@ -34,11 +49,32 @@ public class PipeSubscribeSubscribeResp extends TPipeSubscribeResp {
*/
public static PipeSubscribeSubscribeResp toTPipeSubscribeResp(final TSStatus status) {
final PipeSubscribeSubscribeResp resp = new PipeSubscribeSubscribeResp();
+ resp.status = status;
+ resp.version = PipeSubscribeResponseVersion.VERSION_1.getVersion();
+ resp.type = PipeSubscribeResponseType.ACK.getType();
+ return resp;
+ }
+
+ /**
+ * Serialize the incoming parameters into `PipeSubscribeSubscribeResp`, called by the subscription
+ * server.
+ */
+ public static PipeSubscribeSubscribeResp toTPipeSubscribeResp(
+ final TSStatus status, final Set topicNames) throws IOException {
+ final PipeSubscribeSubscribeResp resp = new PipeSubscribeSubscribeResp();
resp.status = status;
resp.version = PipeSubscribeResponseVersion.VERSION_1.getVersion();
resp.type = PipeSubscribeResponseType.ACK.getType();
+ try (final PublicBAOS byteArrayOutputStream = new PublicBAOS();
+ final DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream)) {
+ ReadWriteIOUtils.writeObjectSet(topicNames, outputStream);
+ resp.body =
+ Collections.singletonList(
+ ByteBuffer.wrap(byteArrayOutputStream.getBuf(), 0, byteArrayOutputStream.size()));
+ }
+
return resp;
}
@@ -47,11 +83,19 @@ public static PipeSubscribeSubscribeResp fromTPipeSubscribeResp(
final TPipeSubscribeResp subscribeResp) {
final PipeSubscribeSubscribeResp resp = new PipeSubscribeSubscribeResp();
+ if (Objects.nonNull(subscribeResp.body)) {
+ for (final ByteBuffer byteBuffer : subscribeResp.body) {
+ if (Objects.nonNull(byteBuffer) && byteBuffer.hasRemaining()) {
+ resp.topicNames = ReadWriteIOUtils.readObjectSet(byteBuffer);
+ break;
+ }
+ }
+ }
+
resp.status = subscribeResp.status;
resp.version = subscribeResp.version;
resp.type = subscribeResp.type;
resp.body = subscribeResp.body;
-
return resp;
}
@@ -66,7 +110,8 @@ public boolean equals(final Object obj) {
return false;
}
final PipeSubscribeSubscribeResp that = (PipeSubscribeSubscribeResp) obj;
- return Objects.equals(this.status, that.status)
+ return Objects.equals(this.topicNames, that.topicNames)
+ && Objects.equals(this.status, that.status)
&& this.version == that.version
&& this.type == that.type
&& Objects.equals(this.body, that.body);
@@ -74,6 +119,6 @@ public boolean equals(final Object obj) {
@Override
public int hashCode() {
- return Objects.hash(status, version, type, body);
+ return Objects.hash(topicNames, status, version, type, body);
}
}
diff --git a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/payload/response/PipeSubscribeUnsubscribeResp.java b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/payload/response/PipeSubscribeUnsubscribeResp.java
index a93e38013acc6..e5d8ccf69cf4b 100644
--- a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/payload/response/PipeSubscribeUnsubscribeResp.java
+++ b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/payload/response/PipeSubscribeUnsubscribeResp.java
@@ -22,10 +22,25 @@
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.service.rpc.thrift.TPipeSubscribeResp;
+import org.apache.tsfile.utils.PublicBAOS;
+import org.apache.tsfile.utils.ReadWriteIOUtils;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.HashSet;
import java.util.Objects;
+import java.util.Set;
public class PipeSubscribeUnsubscribeResp extends TPipeSubscribeResp {
+ private transient Set topicNames = new HashSet<>(); // subscribed topic names
+
+ public Set getTopicNames() {
+ return topicNames;
+ }
+
/////////////////////////////// Thrift ///////////////////////////////
/**
@@ -34,11 +49,32 @@ public class PipeSubscribeUnsubscribeResp extends TPipeSubscribeResp {
*/
public static PipeSubscribeUnsubscribeResp toTPipeSubscribeResp(final TSStatus status) {
final PipeSubscribeUnsubscribeResp resp = new PipeSubscribeUnsubscribeResp();
+ resp.status = status;
+ resp.version = PipeSubscribeResponseVersion.VERSION_1.getVersion();
+ resp.type = PipeSubscribeResponseType.ACK.getType();
+ return resp;
+ }
+
+ /**
+ * Serialize the incoming parameters into `PipeSubscribeUnsubscribeResp`, called by the
+ * subscription server.
+ */
+ public static PipeSubscribeUnsubscribeResp toTPipeSubscribeResp(
+ final TSStatus status, final Set topicNames) throws IOException {
+ final PipeSubscribeUnsubscribeResp resp = new PipeSubscribeUnsubscribeResp();
resp.status = status;
resp.version = PipeSubscribeResponseVersion.VERSION_1.getVersion();
resp.type = PipeSubscribeResponseType.ACK.getType();
+ try (final PublicBAOS byteArrayOutputStream = new PublicBAOS();
+ final DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream)) {
+ ReadWriteIOUtils.writeObjectSet(topicNames, outputStream);
+ resp.body =
+ Collections.singletonList(
+ ByteBuffer.wrap(byteArrayOutputStream.getBuf(), 0, byteArrayOutputStream.size()));
+ }
+
return resp;
}
@@ -47,11 +83,19 @@ public static PipeSubscribeUnsubscribeResp fromTPipeSubscribeResp(
final TPipeSubscribeResp unsubscribeResp) {
final PipeSubscribeUnsubscribeResp resp = new PipeSubscribeUnsubscribeResp();
+ if (Objects.nonNull(unsubscribeResp.body)) {
+ for (final ByteBuffer byteBuffer : unsubscribeResp.body) {
+ if (Objects.nonNull(byteBuffer) && byteBuffer.hasRemaining()) {
+ resp.topicNames = ReadWriteIOUtils.readObjectSet(byteBuffer);
+ break;
+ }
+ }
+ }
+
resp.status = unsubscribeResp.status;
resp.version = unsubscribeResp.version;
resp.type = unsubscribeResp.type;
resp.body = unsubscribeResp.body;
-
return resp;
}
@@ -66,7 +110,8 @@ public boolean equals(final Object obj) {
return false;
}
final PipeSubscribeUnsubscribeResp that = (PipeSubscribeUnsubscribeResp) obj;
- return Objects.equals(this.status, that.status)
+ return Objects.equals(this.topicNames, that.topicNames)
+ && Objects.equals(this.status, that.status)
&& this.version == that.version
&& this.type == that.type
&& Objects.equals(this.body, that.body);
@@ -74,6 +119,6 @@ public boolean equals(final Object obj) {
@Override
public int hashCode() {
- return Objects.hash(status, version, type, body);
+ return Objects.hash(topicNames, status, version, type, body);
}
}
diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/SubscriptionConsumer.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/SubscriptionConsumer.java
index 2bbd4a129a91b..410348c991b38 100644
--- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/SubscriptionConsumer.java
+++ b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/SubscriptionConsumer.java
@@ -40,6 +40,7 @@
import org.apache.iotdb.rpc.subscription.payload.poll.SubscriptionPollResponseType;
import org.apache.iotdb.rpc.subscription.payload.poll.TabletsPayload;
import org.apache.iotdb.session.subscription.payload.SubscriptionMessage;
+import org.apache.iotdb.session.subscription.util.IdentifierUtils;
import org.apache.iotdb.session.subscription.util.RandomStringGenerator;
import org.apache.iotdb.session.subscription.util.SubscriptionPollTimer;
import org.apache.iotdb.session.util.SessionUtils;
@@ -50,8 +51,10 @@
import java.io.File;
import java.io.IOException;
import java.io.RandomAccessFile;
+import java.net.URLEncoder;
import java.nio.file.FileAlreadyExistsException;
import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
@@ -69,6 +72,7 @@
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.LockSupport;
+import java.util.stream.Collectors;
abstract class SubscriptionConsumer implements AutoCloseable {
@@ -92,6 +96,10 @@ abstract class SubscriptionConsumer implements AutoCloseable {
private final String fileSaveDir;
private final boolean fileSaveFsync;
+ protected volatile Set subscribedTopicNames = new HashSet<>();
+
+ /////////////////////////////// getter ///////////////////////////////
+
public String getConsumerId() {
return consumerId;
}
@@ -100,6 +108,14 @@ public String getConsumerGroupId() {
return consumerGroupId;
}
+ /**
+ * @return When only subscribing to the query mode topics, if there is no new data to
+ * process, return {@code false}; otherwise, return {@code true}.
+ */
+ public boolean hasMoreData() {
+ return !subscribedTopicNames.isEmpty();
+ }
+
/////////////////////////////// ctor ///////////////////////////////
protected SubscriptionConsumer(final Builder builder) {
@@ -221,6 +237,17 @@ public void subscribe(final String... topicNames) throws SubscriptionException {
}
public void subscribe(final Set topicNames) throws SubscriptionException {
+ // parse topic names from external source
+ subscribe(topicNames, true);
+ }
+
+ private void subscribe(Set topicNames, final boolean needParse)
+ throws SubscriptionException {
+ if (needParse) {
+ topicNames =
+ topicNames.stream().map(IdentifierUtils::parseIdentifier).collect(Collectors.toSet());
+ }
+
providers.acquireReadLock();
try {
subscribeWithRedirection(topicNames);
@@ -238,6 +265,17 @@ public void unsubscribe(final String... topicNames) throws SubscriptionException
}
public void unsubscribe(final Set topicNames) throws SubscriptionException {
+ // parse topic names from external source
+ unsubscribe(topicNames, true);
+ }
+
+ private void unsubscribe(Set topicNames, final boolean needParse)
+ throws SubscriptionException {
+ if (needParse) {
+ topicNames =
+ topicNames.stream().map(IdentifierUtils::parseIdentifier).collect(Collectors.toSet());
+ }
+
providers.acquireReadLock();
try {
unsubscribeWithRedirection(topicNames);
@@ -284,33 +322,51 @@ private Path getFileDir(final String topicName) throws IOException {
return dirPath;
}
- private Path getFilePath(final String topicName, String fileName) throws SubscriptionException {
- Path filePath;
+ private Path getFilePath(
+ final String topicName,
+ final String fileName,
+ final boolean allowFileAlreadyExistsException,
+ final boolean allowInvalidPathException)
+ throws SubscriptionException {
try {
- filePath = getFileDir(topicName).resolve(fileName);
+ final Path filePath = getFileDir(topicName).resolve(fileName);
Files.createFile(filePath);
+ return filePath;
} catch (final FileAlreadyExistsException fileAlreadyExistsException) {
- fileName += "." + RandomStringGenerator.generate(16);
- try {
- filePath = getFileDir(topicName).resolve(fileName);
- Files.createFile(filePath);
- } catch (final IOException e) {
- throw new SubscriptionRuntimeNonCriticalException(e.getMessage(), e);
+ if (allowFileAlreadyExistsException) {
+ return getFilePath(
+ topicName, fileName + "." + RandomStringGenerator.generate(16), false, true);
+ }
+ throw new SubscriptionRuntimeNonCriticalException(
+ fileAlreadyExistsException.getMessage(), fileAlreadyExistsException);
+ } catch (final InvalidPathException invalidPathException) {
+ if (allowInvalidPathException) {
+ return getFilePath(URLEncoder.encode(topicName), fileName, true, false);
}
+ throw new SubscriptionRuntimeNonCriticalException(
+ invalidPathException.getMessage(), invalidPathException);
} catch (final IOException e) {
throw new SubscriptionRuntimeNonCriticalException(e.getMessage(), e);
}
- return filePath;
}
/////////////////////////////// poll ///////////////////////////////
- protected List poll(final Set topicNames, final long timeoutMs)
+ protected List poll(
+ /* @NotNull */ final Set topicNames, final long timeoutMs)
throws SubscriptionException {
final List messages = new ArrayList<>();
final SubscriptionPollTimer timer =
new SubscriptionPollTimer(System.currentTimeMillis(), timeoutMs);
+ // check topic names
+ topicNames.stream()
+ .filter(topicName -> !subscribedTopicNames.contains(topicName))
+ .forEach(
+ topicName ->
+ LOGGER.warn(
+ "SubscriptionConsumer {} does not subscribe to topic {}", this, topicName));
+
do {
try {
// poll tablets or file
@@ -336,18 +392,21 @@ protected List poll(final Set topicNames, final lon
case ERROR:
final ErrorPayload payload = (ErrorPayload) pollResponse.getPayload();
final String errorMessage = payload.getErrorMessage();
- final boolean critical = payload.isCritical();
- LOGGER.warn(
- "Error occurred when SubscriptionConsumer {} polling topics {}: {}, critical: {}",
- this,
- topicNames,
- errorMessage,
- critical);
- if (critical) {
+ if (payload.isCritical()) {
throw new SubscriptionRuntimeCriticalException(errorMessage);
} else {
throw new SubscriptionRuntimeNonCriticalException(errorMessage);
}
+ case TERMINATION:
+ final SubscriptionCommitContext commitContext = pollResponse.getCommitContext();
+ final String topicNameToUnsubscribe = commitContext.getTopicName();
+ LOGGER.info(
+ "Termination occurred when SubscriptionConsumer {} polling topics {}, unsubscribe topic {} automatically",
+ this,
+ topicNames,
+ topicNameToUnsubscribe);
+ unsubscribe(Collections.singleton(topicNameToUnsubscribe), false);
+ break;
default:
LOGGER.warn("unexpected response type: {}", responseType);
break;
@@ -398,7 +457,7 @@ private Optional pollFile(
final SubscriptionCommitContext commitContext, final String fileName)
throws SubscriptionException {
final String topicName = commitContext.getTopicName();
- final Path filePath = getFilePath(topicName, fileName);
+ final Path filePath = getFilePath(topicName, fileName, true, true);
final File file = filePath.toFile();
try (final RandomAccessFile fileWriter = new RandomAccessFile(file, "rw")) {
return Optional.of(pollFileInternal(commitContext, file, fileWriter));
@@ -576,6 +635,9 @@ private List pollInternal(final Set topicNames
try {
final SubscriptionProvider provider = providers.getNextAvailableProvider();
if (Objects.isNull(provider) || !provider.isAvailable()) {
+ if (isClosed()) {
+ return Collections.emptyList();
+ }
throw new SubscriptionConnectionException(
String.format(
"Cluster has no available subscription providers when %s poll topic %s",
@@ -601,6 +663,9 @@ private List pollFileInternal(
try {
final SubscriptionProvider provider = providers.getProvider(dataNodeId);
if (Objects.isNull(provider) || !provider.isAvailable()) {
+ if (isClosed()) {
+ return Collections.emptyList();
+ }
throw new SubscriptionConnectionException(
String.format(
"something unexpected happened when %s poll file from subscription provider with data node id %s, the subscription provider may be unavailable or not existed",
@@ -660,6 +725,9 @@ private void commitInternal(
try {
final SubscriptionProvider provider = providers.getProvider(dataNodeId);
if (Objects.isNull(provider) || !provider.isAvailable()) {
+ if (isClosed()) {
+ return;
+ }
throw new SubscriptionConnectionException(
String.format(
"something unexpected happened when %s commit (nack: %s) messages to subscription provider with data node id %s, the subscription provider may be unavailable or not existed",
@@ -775,7 +843,7 @@ private void subscribeWithRedirection(final Set topicNames) throws Subsc
}
for (final SubscriptionProvider provider : providers) {
try {
- provider.subscribe(topicNames);
+ subscribedTopicNames = provider.subscribe(topicNames);
return;
} catch (final Exception e) {
LOGGER.warn(
@@ -805,7 +873,7 @@ private void unsubscribeWithRedirection(final Set topicNames)
}
for (final SubscriptionProvider provider : providers) {
try {
- provider.unsubscribe(topicNames);
+ subscribedTopicNames = provider.unsubscribe(topicNames);
return;
} catch (final Exception e) {
LOGGER.warn(
@@ -897,12 +965,12 @@ public Builder password(final String password) {
}
public Builder consumerId(final String consumerId) {
- this.consumerId = consumerId;
+ this.consumerId = IdentifierUtils.parseIdentifier(consumerId);
return this;
}
public Builder consumerGroupId(final String consumerGroupId) {
- this.consumerGroupId = consumerGroupId;
+ this.consumerGroupId = IdentifierUtils.parseIdentifier(consumerGroupId);
return this;
}
diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/SubscriptionExecutorServiceManager.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/SubscriptionExecutorServiceManager.java
index 5a587ff96fba6..6ce5946d4fcc6 100644
--- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/SubscriptionExecutorServiceManager.java
+++ b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/SubscriptionExecutorServiceManager.java
@@ -29,12 +29,12 @@
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
-final class SubscriptionExecutorServiceManager {
+public final class SubscriptionExecutorServiceManager {
private static final Logger LOGGER =
LoggerFactory.getLogger(SubscriptionExecutorServiceManager.class);
- private static final long AWAIT_TERMINATION_TIMEOUT_MS = 10_000L;
+ private static final long AWAIT_TERMINATION_TIMEOUT_MS = 15_000L;
private static final String CONTROL_FLOW_EXECUTOR_NAME = "SubscriptionControlFlowExecutor";
private static final String UPSTREAM_DATA_FLOW_EXECUTOR_NAME =
@@ -172,9 +172,9 @@ boolean isShutdown() {
}
void setCorePoolSize(final int corePoolSize) {
- if (!isShutdown()) {
+ if (isShutdown()) {
synchronized (this) {
- if (!isShutdown()) {
+ if (isShutdown()) {
this.corePoolSize = corePoolSize;
return;
}
diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/SubscriptionProvider.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/SubscriptionProvider.java
index 70589472f8287..9bce0d6774faf 100644
--- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/SubscriptionProvider.java
+++ b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/SubscriptionProvider.java
@@ -40,6 +40,8 @@
import org.apache.iotdb.rpc.subscription.payload.request.PipeSubscribeUnsubscribeReq;
import org.apache.iotdb.rpc.subscription.payload.response.PipeSubscribeHandshakeResp;
import org.apache.iotdb.rpc.subscription.payload.response.PipeSubscribePollResp;
+import org.apache.iotdb.rpc.subscription.payload.response.PipeSubscribeSubscribeResp;
+import org.apache.iotdb.rpc.subscription.payload.response.PipeSubscribeUnsubscribeResp;
import org.apache.iotdb.service.rpc.thrift.TPipeSubscribeResp;
import org.apache.iotdb.session.subscription.SubscriptionSession;
import org.apache.iotdb.session.subscription.SubscriptionSessionConnection;
@@ -215,7 +217,7 @@ void heartbeat() throws SubscriptionException {
verifyPipeSubscribeSuccess(resp.status);
}
- void subscribe(final Set topicNames) throws SubscriptionException {
+ Set subscribe(final Set topicNames) throws SubscriptionException {
final PipeSubscribeSubscribeReq req;
try {
req = PipeSubscribeSubscribeReq.toTPipeSubscribeReq(topicNames);
@@ -241,9 +243,12 @@ void subscribe(final Set topicNames) throws SubscriptionException {
throw new SubscriptionConnectionException(e.getMessage(), e);
}
verifyPipeSubscribeSuccess(resp.status);
+ final PipeSubscribeSubscribeResp subscribeResp =
+ PipeSubscribeSubscribeResp.fromTPipeSubscribeResp(resp);
+ return subscribeResp.getTopicNames();
}
- void unsubscribe(final Set topicNames) throws SubscriptionException {
+ Set unsubscribe(final Set topicNames) throws SubscriptionException {
final PipeSubscribeUnsubscribeReq req;
try {
req = PipeSubscribeUnsubscribeReq.toTPipeSubscribeReq(topicNames);
@@ -269,6 +274,9 @@ void unsubscribe(final Set topicNames) throws SubscriptionException {
throw new SubscriptionConnectionException(e.getMessage(), e);
}
verifyPipeSubscribeSuccess(resp.status);
+ final PipeSubscribeUnsubscribeResp unsubscribeResp =
+ PipeSubscribeUnsubscribeResp.fromTPipeSubscribeResp(resp);
+ return unsubscribeResp.getTopicNames();
}
List poll(final SubscriptionPollRequest pollMessage)
diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/SubscriptionPullConsumer.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/SubscriptionPullConsumer.java
index 2306e4d05c1e2..38dfc530ee352 100644
--- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/SubscriptionPullConsumer.java
+++ b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/SubscriptionPullConsumer.java
@@ -22,6 +22,7 @@
import org.apache.iotdb.rpc.subscription.config.ConsumerConstant;
import org.apache.iotdb.rpc.subscription.exception.SubscriptionException;
import org.apache.iotdb.session.subscription.payload.SubscriptionMessage;
+import org.apache.iotdb.session.subscription.util.IdentifierUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,6 +40,7 @@
import java.util.concurrent.ConcurrentSkipListSet;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
/**
* The {@link SubscriptionPullConsumer} corresponds to the pull consumption mode in the message
@@ -150,7 +152,12 @@ public List poll(final Set topicNames, final Durati
@Override
public List poll(final Set topicNames, final long timeoutMs)
throws SubscriptionException {
- final List messages = super.poll(topicNames, timeoutMs);
+ // parse topic names from external source
+ final Set parsedTopicNames =
+ topicNames.stream().map(IdentifierUtils::parseIdentifier).collect(Collectors.toSet());
+
+ // poll messages
+ final List messages = super.poll(parsedTopicNames, timeoutMs);
// add to uncommitted messages
if (autoCommit) {
diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/SubscriptionPushConsumer.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/SubscriptionPushConsumer.java
index 7ff1dd39b15bd..7323473552caf 100644
--- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/SubscriptionPushConsumer.java
+++ b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/SubscriptionPushConsumer.java
@@ -27,7 +27,6 @@
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.Properties;
@@ -162,9 +161,12 @@ public void run() {
return;
}
+ if (subscribedTopicNames.isEmpty()) {
+ return;
+ }
+
try {
- // Poll all subscribed topics by passing an empty set
- final List messages = poll(Collections.emptySet(), autoPollTimeoutMs);
+ final List messages = poll(subscribedTopicNames, autoPollTimeoutMs);
if (ackStrategy.equals(AckStrategy.BEFORE_CONSUME)) {
ack(messages);
diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/payload/SubscriptionFileHandler.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/payload/SubscriptionFileHandler.java
index 60c269b86370c..0ec121f96992a 100644
--- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/payload/SubscriptionFileHandler.java
+++ b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/payload/SubscriptionFileHandler.java
@@ -39,14 +39,14 @@ public SubscriptionFileHandler(final String absolutePath) {
/**
* @return a new File instance of the corresponding file
*/
- public File getFile() {
+ public synchronized File getFile() {
return new File(absolutePath);
}
/**
* @return a new Path instance of the corresponding file
*/
- public Path getPath() {
+ public synchronized Path getPath() {
return Paths.get(absolutePath);
}
@@ -54,7 +54,7 @@ public Path getPath() {
* @return the path to the source file
* @throws IOException if an I/O error occurs
*/
- public Path deleteFile() throws IOException {
+ public synchronized Path deleteFile() throws IOException {
final Path sourcePath = getPath();
Files.delete(sourcePath);
return sourcePath;
@@ -65,7 +65,7 @@ public Path deleteFile() throws IOException {
* @return the path to the target file
* @throws IOException if an I/O error occurs
*/
- public Path moveFile(final String target) throws IOException {
+ public synchronized Path moveFile(final String target) throws IOException {
return this.moveFile(Paths.get(target));
}
@@ -74,7 +74,10 @@ public Path moveFile(final String target) throws IOException {
* @return the path to the target file
* @throws IOException if an I/O error occurs
*/
- public Path moveFile(final Path target) throws IOException {
+ public synchronized Path moveFile(final Path target) throws IOException {
+ if (!Files.exists(target.getParent())) {
+ Files.createDirectories(target.getParent());
+ }
return Files.move(getPath(), target, StandardCopyOption.REPLACE_EXISTING);
}
@@ -83,7 +86,7 @@ public Path moveFile(final Path target) throws IOException {
* @return the path to the target file
* @throws IOException if an I/O error occurs
*/
- public Path copyFile(final String target) throws IOException {
+ public synchronized Path copyFile(final String target) throws IOException {
return this.copyFile(Paths.get(target));
}
@@ -92,7 +95,10 @@ public Path copyFile(final String target) throws IOException {
* @return the path to the target file
* @throws IOException if an I/O error occurs
*/
- public Path copyFile(final Path target) throws IOException {
+ public synchronized Path copyFile(final Path target) throws IOException {
+ if (!Files.exists(target.getParent())) {
+ Files.createDirectories(target.getParent());
+ }
return Files.copy(
getPath(), target, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
}
diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/payload/SubscriptionSessionDataSet.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/payload/SubscriptionSessionDataSet.java
index 8b5b244950459..ee2beafdd9619 100644
--- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/payload/SubscriptionSessionDataSet.java
+++ b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/payload/SubscriptionSessionDataSet.java
@@ -25,10 +25,12 @@
import org.apache.tsfile.read.common.Field;
import org.apache.tsfile.read.common.RowRecord;
import org.apache.tsfile.utils.Binary;
+import org.apache.tsfile.utils.DateUtils;
import org.apache.tsfile.write.UnSupportedDataTypeException;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
+import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -84,7 +86,7 @@ public List getColumnTypes() {
List schemas = tablet.getSchemas();
columnTypeList.addAll(
- schemas.stream().map((schema) -> schema.getType().toString()).collect(Collectors.toList()));
+ schemas.stream().map(schema -> schema.getType().toString()).collect(Collectors.toList()));
return columnTypeList;
}
@@ -149,10 +151,13 @@ private static Field generateFieldFromTabletValue(
field.setBoolV(booleanValue);
break;
case INT32:
- case DATE:
final int intValue = ((int[]) value)[index];
field.setIntV(intValue);
break;
+ case DATE:
+ final LocalDate dateValue = ((LocalDate[]) value)[index];
+ field.setIntV(DateUtils.parseDateExpressionToInt(dateValue));
+ break;
case INT64:
case TIMESTAMP:
final long longValue = ((long[]) value)[index];
diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/util/IdentifierUtils.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/util/IdentifierUtils.java
new file mode 100644
index 0000000000000..9f6d09ef44e0f
--- /dev/null
+++ b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/util/IdentifierUtils.java
@@ -0,0 +1,51 @@
+/*
+ * 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.iotdb.session.subscription.util;
+
+import org.apache.iotdb.rpc.subscription.exception.SubscriptionIdentifierSemanticException;
+
+import org.apache.tsfile.common.constant.TsFileConstant;
+import org.apache.tsfile.read.common.parser.PathVisitor;
+
+public class IdentifierUtils {
+
+ /**
+ * refer org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor#parseIdentifier(java.lang.String)
+ */
+ public static String parseIdentifier(final String src) {
+ if (src.startsWith(TsFileConstant.BACK_QUOTE_STRING)
+ && src.endsWith(TsFileConstant.BACK_QUOTE_STRING)) {
+ return src.substring(1, src.length() - 1)
+ .replace(TsFileConstant.DOUBLE_BACK_QUOTE_STRING, TsFileConstant.BACK_QUOTE_STRING);
+ }
+ checkIdentifier(src);
+ return src;
+ }
+
+ private static void checkIdentifier(final String src) {
+ if (!TsFileConstant.IDENTIFIER_PATTERN.matcher(src).matches()
+ || PathVisitor.isRealNumber(src)) {
+ throw new SubscriptionIdentifierSemanticException(
+ String.format(
+ "%s is illegal, identifier not enclosed with backticks can only consist of digits, characters and underscore.",
+ src));
+ }
+ }
+}
diff --git a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4 b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4
index 29c36e881e7dc..c9cfc400dcee7 100644
--- a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4
+++ b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4
@@ -63,6 +63,7 @@ keyWords
| CONDITION
| CONFIGNODES
| CONFIGURATION
+ | CONNECTION
| CONNECTOR
| CONTAIN
| CONTAINS
diff --git a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
index 6d3ffe0b837d8..4cff4e12b8cb6 100644
--- a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
+++ b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
@@ -47,7 +47,7 @@ ddlStatement
| setSchemaTemplate | unsetSchemaTemplate
| alterSchemaTemplate
// TTL
- | setTTL | unsetTTL | showAllTTL
+ | setTTL | unsetTTL | showTTL | showAllTTL
// Function
| createFunction | dropFunction | showFunctions
// Trigger
@@ -64,7 +64,7 @@ ddlStatement
| createContinuousQuery | dropContinuousQuery | showContinuousQueries
// Cluster
| showVariables | showCluster | showRegions | showDataNodes | showConfigNodes | showClusterId
- | getRegionId | getTimeSlotList | countTimeSlotList | getSeriesSlotList | migrateRegion
+ | getRegionId | getTimeSlotList | countTimeSlotList | getSeriesSlotList | migrateRegion | verifyConnection
// Quota
| setSpaceQuota | showSpaceQuota | setThrottleQuota | showThrottleQuota
// View
@@ -325,6 +325,11 @@ unsetTTL
: UNSET TTL TO path=prefixPath
;
+// ---- Show TTL
+showTTL
+ : SHOW TTL ON prefixPath (COMMA prefixPath)*
+ ;
+
// ---- Show All TTL
showAllTTL
: SHOW ALL TTL
@@ -524,6 +529,10 @@ migrateRegion
: MIGRATE REGION regionId=INTEGER_LITERAL FROM fromId=INTEGER_LITERAL TO toId=INTEGER_LITERAL
;
+verifyConnection
+ : VERIFY CONNECTION (DETAILS)?
+ ;
+
// Pipe Task =========================================================================================
createPipe
: CREATE PIPE pipeName=identifier
diff --git a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4
index 29cbcdcd17dfe..d1865a1e20486 100644
--- a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4
+++ b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4
@@ -165,6 +165,10 @@ CONFIGURATION
: C O N F I G U R A T I O N
;
+CONNECTION
+ : C O N N E C T I O N
+ ;
+
CONNECTOR
: C O N N E C T O R
;
diff --git a/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.sh b/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.sh
index 5604afd3d32fa..5b2ccef01a514 100644
--- a/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.sh
+++ b/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.sh
@@ -18,6 +18,7 @@
# under the License.
#
+source "$(dirname "$0")/iotdb-common.sh"
CONFIGNODE_CONF="$(dirname "$0")/../conf"
if [ -f "${CONFIGNODE_CONF}/iotdb-system.properties" ]; then
@@ -26,6 +27,7 @@ else
cn_internal_port=$(sed '/^cn_internal_port=/!d;s/.*=//' "${CONFIGNODE_CONF}"/iotdb-confignode.properties)
fi
+check_config_unique "cn_internal_port" "$cn_internal_port"
echo Check whether the internal_port is used..., port is "$cn_internal_port"
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/ConfigNodeRequestType.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/CnToCnNodeRequestType.java
similarity index 92%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/ConfigNodeRequestType.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/CnToCnNodeRequestType.java
index 5f3064b4eed73..3864f26cbc8e1 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/ConfigNodeRequestType.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/CnToCnNodeRequestType.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.confignode.client;
-public enum ConfigNodeRequestType {
+public enum CnToCnNodeRequestType {
ADD_CONSENSUS_GROUP,
NOTIFY_REGISTER_SUCCESS,
REGISTER_CONFIG_NODE,
@@ -30,4 +30,6 @@ public enum ConfigNodeRequestType {
STOP_CONFIG_NODE,
SET_CONFIGURATION,
SHOW_CONFIGURATION,
+ SUBMIT_TEST_CONNECTION_TASK,
+ TEST_CONNECTION,
}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/DataNodeRequestType.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/CnToDnRequestType.java
similarity index 97%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/DataNodeRequestType.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/CnToDnRequestType.java
index b53035b29d5a6..82e5974f3c80e 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/DataNodeRequestType.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/CnToDnRequestType.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.confignode.client;
-public enum DataNodeRequestType {
+public enum CnToDnRequestType {
// Node Maintenance
DISABLE_DATA_NODE,
@@ -35,6 +35,9 @@ public enum DataNodeRequestType {
SET_CONFIGURATION,
SHOW_CONFIGURATION,
+ SUBMIT_TEST_CONNECTION_TASK,
+ TEST_CONNECTION,
+
// Region Maintenance
CREATE_DATA_REGION,
CREATE_SCHEMA_REGION,
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/AsyncConfigNodeHeartbeatClientPool.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/AsyncConfigNodeHeartbeatClientPool.java
index fdcd3b0d1e299..7b6bca5d0d9e7 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/AsyncConfigNodeHeartbeatClientPool.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/AsyncConfigNodeHeartbeatClientPool.java
@@ -22,17 +22,17 @@
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.client.ClientPoolFactory;
import org.apache.iotdb.commons.client.IClientManager;
-import org.apache.iotdb.commons.client.async.AsyncConfigNodeIServiceClient;
+import org.apache.iotdb.commons.client.async.AsyncConfigNodeInternalServiceClient;
import org.apache.iotdb.confignode.client.async.handlers.heartbeat.ConfigNodeHeartbeatHandler;
import org.apache.iotdb.confignode.rpc.thrift.TConfigNodeHeartbeatReq;
public class AsyncConfigNodeHeartbeatClientPool {
- private final IClientManager clientManager;
+ private final IClientManager clientManager;
private AsyncConfigNodeHeartbeatClientPool() {
clientManager =
- new IClientManager.Factory()
+ new IClientManager.Factory()
.createClientManager(
new ClientPoolFactory.AsyncConfigNodeHeartbeatServiceClientPoolFactory());
}
@@ -53,7 +53,6 @@ public void getConfigNodeHeartBeat(
}
}
- // TODO: Is the ClientPool must be a singleton?
private static class AsyncConfigNodeHeartbeatClientPoolHolder {
private static final AsyncConfigNodeHeartbeatClientPool INSTANCE =
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/AsyncDataNodeClientPool.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/AsyncDataNodeClientPool.java
deleted file mode 100644
index 31bc4074701c6..0000000000000
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/AsyncDataNodeClientPool.java
+++ /dev/null
@@ -1,559 +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 org.apache.iotdb.confignode.client.async;
-
-import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
-import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
-import org.apache.iotdb.common.rpc.thrift.TEndPoint;
-import org.apache.iotdb.common.rpc.thrift.TFlushReq;
-import org.apache.iotdb.common.rpc.thrift.TSetConfigurationReq;
-import org.apache.iotdb.common.rpc.thrift.TSetSpaceQuotaReq;
-import org.apache.iotdb.common.rpc.thrift.TSetTTLReq;
-import org.apache.iotdb.common.rpc.thrift.TSetThrottleQuotaReq;
-import org.apache.iotdb.commons.client.ClientPoolFactory;
-import org.apache.iotdb.commons.client.IClientManager;
-import org.apache.iotdb.commons.client.async.AsyncDataNodeInternalServiceClient;
-import org.apache.iotdb.commons.client.exception.ClientManagerException;
-import org.apache.iotdb.confignode.client.DataNodeRequestType;
-import org.apache.iotdb.confignode.client.async.handlers.AsyncClientHandler;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.AsyncTSStatusRPCHandler;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.CheckTimeSeriesExistenceRPCHandler;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.CountPathsUsingTemplateRPCHandler;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.FetchSchemaBlackListRPCHandler;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.PipeHeartbeatRPCHandler;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.PipePushMetaRPCHandler;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.SchemaUpdateRPCHandler;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.TransferLeaderRPCHandler;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.subscription.CheckSchemaRegionUsingTemplateRPCHandler;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.subscription.ConsumerGroupPushMetaRPCHandler;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.subscription.TopicPushMetaRPCHandler;
-import org.apache.iotdb.mpp.rpc.thrift.TActiveTriggerInstanceReq;
-import org.apache.iotdb.mpp.rpc.thrift.TAlterViewReq;
-import org.apache.iotdb.mpp.rpc.thrift.TCheckSchemaRegionUsingTemplateReq;
-import org.apache.iotdb.mpp.rpc.thrift.TCheckTimeSeriesExistenceReq;
-import org.apache.iotdb.mpp.rpc.thrift.TConstructSchemaBlackListReq;
-import org.apache.iotdb.mpp.rpc.thrift.TConstructSchemaBlackListWithTemplateReq;
-import org.apache.iotdb.mpp.rpc.thrift.TConstructViewSchemaBlackListReq;
-import org.apache.iotdb.mpp.rpc.thrift.TCountPathsUsingTemplateReq;
-import org.apache.iotdb.mpp.rpc.thrift.TCreateDataRegionReq;
-import org.apache.iotdb.mpp.rpc.thrift.TCreateFunctionInstanceReq;
-import org.apache.iotdb.mpp.rpc.thrift.TCreatePipePluginInstanceReq;
-import org.apache.iotdb.mpp.rpc.thrift.TCreateSchemaRegionReq;
-import org.apache.iotdb.mpp.rpc.thrift.TCreateTriggerInstanceReq;
-import org.apache.iotdb.mpp.rpc.thrift.TDeactivateTemplateReq;
-import org.apache.iotdb.mpp.rpc.thrift.TDeleteDataForDeleteSchemaReq;
-import org.apache.iotdb.mpp.rpc.thrift.TDeleteTimeSeriesReq;
-import org.apache.iotdb.mpp.rpc.thrift.TDeleteViewSchemaReq;
-import org.apache.iotdb.mpp.rpc.thrift.TDropFunctionInstanceReq;
-import org.apache.iotdb.mpp.rpc.thrift.TDropPipePluginInstanceReq;
-import org.apache.iotdb.mpp.rpc.thrift.TDropTriggerInstanceReq;
-import org.apache.iotdb.mpp.rpc.thrift.TFetchSchemaBlackListReq;
-import org.apache.iotdb.mpp.rpc.thrift.TInactiveTriggerInstanceReq;
-import org.apache.iotdb.mpp.rpc.thrift.TInvalidateMatchedSchemaCacheReq;
-import org.apache.iotdb.mpp.rpc.thrift.TPipeHeartbeatReq;
-import org.apache.iotdb.mpp.rpc.thrift.TPushConsumerGroupMetaReq;
-import org.apache.iotdb.mpp.rpc.thrift.TPushMultiPipeMetaReq;
-import org.apache.iotdb.mpp.rpc.thrift.TPushMultiTopicMetaReq;
-import org.apache.iotdb.mpp.rpc.thrift.TPushPipeMetaReq;
-import org.apache.iotdb.mpp.rpc.thrift.TPushSingleConsumerGroupMetaReq;
-import org.apache.iotdb.mpp.rpc.thrift.TPushSinglePipeMetaReq;
-import org.apache.iotdb.mpp.rpc.thrift.TPushSingleTopicMetaReq;
-import org.apache.iotdb.mpp.rpc.thrift.TPushTopicMetaReq;
-import org.apache.iotdb.mpp.rpc.thrift.TRegionLeaderChangeReq;
-import org.apache.iotdb.mpp.rpc.thrift.TRegionRouteReq;
-import org.apache.iotdb.mpp.rpc.thrift.TResetPeerListReq;
-import org.apache.iotdb.mpp.rpc.thrift.TRollbackSchemaBlackListReq;
-import org.apache.iotdb.mpp.rpc.thrift.TRollbackSchemaBlackListWithTemplateReq;
-import org.apache.iotdb.mpp.rpc.thrift.TRollbackViewSchemaBlackListReq;
-import org.apache.iotdb.mpp.rpc.thrift.TUpdateTableReq;
-import org.apache.iotdb.mpp.rpc.thrift.TUpdateTemplateReq;
-import org.apache.iotdb.mpp.rpc.thrift.TUpdateTriggerLocationReq;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.TimeUnit;
-
-/** Asynchronously send RPC requests to DataNodes. See queryengine.thrift for more details. */
-public class AsyncDataNodeClientPool {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(AsyncDataNodeClientPool.class);
-
- private final IClientManager clientManager;
-
- private static final int MAX_RETRY_NUM = 6;
-
- private AsyncDataNodeClientPool() {
- clientManager =
- new IClientManager.Factory()
- .createClientManager(
- new ClientPoolFactory.AsyncDataNodeInternalServiceClientPoolFactory());
- }
-
- /**
- * Send asynchronous requests to the specified DataNodes with default retry num
- *
- * Notice: The DataNodes that failed to receive the requests will be reconnected
- *
- * @param clientHandler which will also contain the result
- * @param timeoutInMs timeout in milliseconds
- */
- public void sendAsyncRequestToDataNodeWithRetryAndTimeoutInMs(
- AsyncClientHandler clientHandler, long timeoutInMs) {
- sendAsyncRequest(clientHandler, MAX_RETRY_NUM, timeoutInMs);
- }
-
- /**
- * Send asynchronous requests to the specified DataNodes with default retry num
- *
- * Notice: The DataNodes that failed to receive the requests will be reconnected
- *
- * @param clientHandler which will also contain the result
- */
- public void sendAsyncRequestToDataNodeWithRetry(AsyncClientHandler clientHandler) {
- sendAsyncRequest(clientHandler, MAX_RETRY_NUM, null);
- }
-
- public void sendAsyncRequestToDataNode(AsyncClientHandler clientHandler) {
- sendAsyncRequest(clientHandler, 1, null);
- }
-
- private void sendAsyncRequest(
- AsyncClientHandler clientHandler, int retryNum, Long timeoutInMs) {
- if (clientHandler.getRequestIndices().isEmpty()) {
- return;
- }
-
- DataNodeRequestType requestType = clientHandler.getRequestType();
- for (int retry = 0; retry < retryNum; retry++) {
- // Always Reset CountDownLatch first
- clientHandler.resetCountDownLatch();
-
- // Send requests to all targetDataNodes
- for (int requestId : clientHandler.getRequestIndices()) {
- TDataNodeLocation targetDataNode = clientHandler.getDataNodeLocation(requestId);
- sendAsyncRequestToDataNode(clientHandler, requestId, targetDataNode, retry);
- }
-
- // Wait for this batch of asynchronous RPC requests finish
- try {
- if (timeoutInMs == null) {
- clientHandler.getCountDownLatch().await();
- } else {
- if (!clientHandler.getCountDownLatch().await(timeoutInMs, TimeUnit.MILLISECONDS)) {
- LOGGER.warn(
- "Timeout during {} on ConfigNode. Retry: {}/{}", requestType, retry, retryNum);
- }
- }
- } catch (InterruptedException e) {
- LOGGER.error(
- "Interrupted during {} on ConfigNode. Retry: {}/{}", requestType, retry, retryNum);
- Thread.currentThread().interrupt();
- }
-
- // Check if there is a DataNode that fails to execute the request, and retry if there exists
- if (clientHandler.getRequestIndices().isEmpty()) {
- return;
- }
- }
-
- if (!clientHandler.getRequestIndices().isEmpty()) {
- LOGGER.warn(
- "Failed to {} on ConfigNode after {} retries, requestIndices: {}",
- requestType,
- retryNum,
- clientHandler.getRequestIndices());
- }
- }
-
- private void sendAsyncRequestToDataNode(
- AsyncClientHandler clientHandler,
- int requestId,
- TDataNodeLocation targetDataNode,
- int retryCount) {
-
- try {
- AsyncDataNodeInternalServiceClient client;
- client = clientManager.borrowClient(targetDataNode.getInternalEndPoint());
-
- switch (clientHandler.getRequestType()) {
- case SET_TTL:
- client.setTTL(
- (TSetTTLReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case CREATE_DATA_REGION:
- client.createDataRegion(
- (TCreateDataRegionReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case DELETE_REGION:
- client.deleteRegion(
- (TConsensusGroupId) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case CREATE_SCHEMA_REGION:
- client.createSchemaRegion(
- (TCreateSchemaRegionReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case CREATE_FUNCTION:
- client.createFunction(
- (TCreateFunctionInstanceReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case DROP_FUNCTION:
- client.dropFunction(
- (TDropFunctionInstanceReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case CREATE_TRIGGER_INSTANCE:
- client.createTriggerInstance(
- (TCreateTriggerInstanceReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case DROP_TRIGGER_INSTANCE:
- client.dropTriggerInstance(
- (TDropTriggerInstanceReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case ACTIVE_TRIGGER_INSTANCE:
- client.activeTriggerInstance(
- (TActiveTriggerInstanceReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case INACTIVE_TRIGGER_INSTANCE:
- client.inactiveTriggerInstance(
- (TInactiveTriggerInstanceReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case UPDATE_TRIGGER_LOCATION:
- client.updateTriggerLocation(
- (TUpdateTriggerLocationReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case CREATE_PIPE_PLUGIN:
- client.createPipePlugin(
- (TCreatePipePluginInstanceReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case DROP_PIPE_PLUGIN:
- client.dropPipePlugin(
- (TDropPipePluginInstanceReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case PIPE_PUSH_ALL_META:
- client.pushPipeMeta(
- (TPushPipeMetaReq) clientHandler.getRequest(requestId),
- (PipePushMetaRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case PIPE_PUSH_SINGLE_META:
- client.pushSinglePipeMeta(
- (TPushSinglePipeMetaReq) clientHandler.getRequest(requestId),
- (PipePushMetaRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case PIPE_PUSH_MULTI_META:
- client.pushMultiPipeMeta(
- (TPushMultiPipeMetaReq) clientHandler.getRequest(requestId),
- (PipePushMetaRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case TOPIC_PUSH_ALL_META:
- client.pushTopicMeta(
- (TPushTopicMetaReq) clientHandler.getRequest(requestId),
- (TopicPushMetaRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case TOPIC_PUSH_SINGLE_META:
- client.pushSingleTopicMeta(
- (TPushSingleTopicMetaReq) clientHandler.getRequest(requestId),
- (TopicPushMetaRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case TOPIC_PUSH_MULTI_META:
- client.pushMultiTopicMeta(
- (TPushMultiTopicMetaReq) clientHandler.getRequest(requestId),
- (TopicPushMetaRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case CONSUMER_GROUP_PUSH_ALL_META:
- client.pushConsumerGroupMeta(
- (TPushConsumerGroupMetaReq) clientHandler.getRequest(requestId),
- (ConsumerGroupPushMetaRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case CONSUMER_GROUP_PUSH_SINGLE_META:
- client.pushSingleConsumerGroupMeta(
- (TPushSingleConsumerGroupMetaReq) clientHandler.getRequest(requestId),
- (ConsumerGroupPushMetaRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case PIPE_HEARTBEAT:
- client.pipeHeartbeat(
- (TPipeHeartbeatReq) clientHandler.getRequest(requestId),
- (PipeHeartbeatRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case MERGE:
- case FULL_MERGE:
- client.merge(
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case FLUSH:
- client.flush(
- (TFlushReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case CLEAR_CACHE:
- client.clearCache(
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case SET_CONFIGURATION:
- client.setConfiguration(
- (TSetConfigurationReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case START_REPAIR_DATA:
- client.startRepairData(
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case STOP_REPAIR_DATA:
- client.stopRepairData(
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case LOAD_CONFIGURATION:
- client.loadConfiguration(
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case SET_SYSTEM_STATUS:
- client.setSystemStatus(
- (String) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case UPDATE_REGION_ROUTE_MAP:
- client.updateRegionCache(
- (TRegionRouteReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case CHANGE_REGION_LEADER:
- client.changeRegionLeader(
- (TRegionLeaderChangeReq) clientHandler.getRequest(requestId),
- (TransferLeaderRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case CONSTRUCT_SCHEMA_BLACK_LIST:
- client.constructSchemaBlackList(
- (TConstructSchemaBlackListReq) clientHandler.getRequest(requestId),
- (SchemaUpdateRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case ROLLBACK_SCHEMA_BLACK_LIST:
- client.rollbackSchemaBlackList(
- (TRollbackSchemaBlackListReq) clientHandler.getRequest(requestId),
- (SchemaUpdateRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case FETCH_SCHEMA_BLACK_LIST:
- client.fetchSchemaBlackList(
- (TFetchSchemaBlackListReq) clientHandler.getRequest(requestId),
- (FetchSchemaBlackListRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case INVALIDATE_MATCHED_SCHEMA_CACHE:
- client.invalidateMatchedSchemaCache(
- (TInvalidateMatchedSchemaCacheReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case DELETE_DATA_FOR_DELETE_SCHEMA:
- client.deleteDataForDeleteSchema(
- (TDeleteDataForDeleteSchemaReq) clientHandler.getRequest(requestId),
- (SchemaUpdateRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case DELETE_TIMESERIES:
- client.deleteTimeSeries(
- (TDeleteTimeSeriesReq) clientHandler.getRequest(requestId),
- (SchemaUpdateRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case CONSTRUCT_SCHEMA_BLACK_LIST_WITH_TEMPLATE:
- client.constructSchemaBlackListWithTemplate(
- (TConstructSchemaBlackListWithTemplateReq) clientHandler.getRequest(requestId),
- (SchemaUpdateRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case ROLLBACK_SCHEMA_BLACK_LIST_WITH_TEMPLATE:
- client.rollbackSchemaBlackListWithTemplate(
- (TRollbackSchemaBlackListWithTemplateReq) clientHandler.getRequest(requestId),
- (SchemaUpdateRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case DEACTIVATE_TEMPLATE:
- client.deactivateTemplate(
- (TDeactivateTemplateReq) clientHandler.getRequest(requestId),
- (SchemaUpdateRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case UPDATE_TEMPLATE:
- client.updateTemplate(
- (TUpdateTemplateReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case COUNT_PATHS_USING_TEMPLATE:
- client.countPathsUsingTemplate(
- (TCountPathsUsingTemplateReq) clientHandler.getRequest(requestId),
- (CountPathsUsingTemplateRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case CHECK_SCHEMA_REGION_USING_TEMPLATE:
- client.checkSchemaRegionUsingTemplate(
- (TCheckSchemaRegionUsingTemplateReq) clientHandler.getRequest(requestId),
- (CheckSchemaRegionUsingTemplateRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case CHECK_TIMESERIES_EXISTENCE:
- client.checkTimeSeriesExistence(
- (TCheckTimeSeriesExistenceReq) clientHandler.getRequest(requestId),
- (CheckTimeSeriesExistenceRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case CONSTRUCT_VIEW_SCHEMA_BLACK_LIST:
- client.constructViewSchemaBlackList(
- (TConstructViewSchemaBlackListReq) clientHandler.getRequest(requestId),
- (SchemaUpdateRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case ROLLBACK_VIEW_SCHEMA_BLACK_LIST:
- client.rollbackViewSchemaBlackList(
- (TRollbackViewSchemaBlackListReq) clientHandler.getRequest(requestId),
- (SchemaUpdateRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case DELETE_VIEW:
- client.deleteViewSchema(
- (TDeleteViewSchemaReq) clientHandler.getRequest(requestId),
- (SchemaUpdateRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case ALTER_VIEW:
- client.alterView(
- (TAlterViewReq) clientHandler.getRequest(requestId),
- (SchemaUpdateRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case KILL_QUERY_INSTANCE:
- client.killQueryInstance(
- (String) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case SET_SPACE_QUOTA:
- client.setSpaceQuota(
- (TSetSpaceQuotaReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case SET_THROTTLE_QUOTA:
- client.setThrottleQuota(
- (TSetThrottleQuotaReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case RESET_PEER_LIST:
- client.resetPeerList(
- (TResetPeerListReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- case UPDATE_TABLE:
- client.updateTable(
- (TUpdateTableReq) clientHandler.getRequest(requestId),
- (AsyncTSStatusRPCHandler)
- clientHandler.createAsyncRPCHandler(requestId, targetDataNode));
- break;
- default:
- LOGGER.error(
- "Unexpected DataNode Request Type: {} when sendAsyncRequestToDataNode",
- clientHandler.getRequestType());
- }
- } catch (Exception e) {
- LOGGER.warn(
- "{} failed on DataNode {}, because {}, retrying {}...",
- clientHandler.getRequestType(),
- targetDataNode.getInternalEndPoint(),
- e.getMessage(),
- retryCount);
- }
- }
-
- /**
- * Always call this interface when a DataNode is restarted or removed.
- *
- * @param endPoint The specific DataNode
- */
- public void resetClient(TEndPoint endPoint) {
- clientManager.clear(endPoint);
- }
-
- public AsyncDataNodeInternalServiceClient getAsyncClient(TDataNodeLocation targetDataNode)
- throws ClientManagerException {
- return clientManager.borrowClient(targetDataNode.getInternalEndPoint());
- }
-
- // TODO: Is the ClientPool must be a singleton?
- private static class ClientPoolHolder {
-
- private static final AsyncDataNodeClientPool INSTANCE = new AsyncDataNodeClientPool();
-
- private ClientPoolHolder() {
- // Empty constructor
- }
- }
-
- public static AsyncDataNodeClientPool getInstance() {
- return ClientPoolHolder.INSTANCE;
- }
-}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/CnToCnInternalServiceAsyncRequestManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/CnToCnInternalServiceAsyncRequestManager.java
new file mode 100644
index 0000000000000..bd5ee3fe4995f
--- /dev/null
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/CnToCnInternalServiceAsyncRequestManager.java
@@ -0,0 +1,74 @@
+/*
+ * 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.iotdb.confignode.client.async;
+
+import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation;
+import org.apache.iotdb.common.rpc.thrift.TNodeLocations;
+import org.apache.iotdb.commons.client.request.AsyncRequestContext;
+import org.apache.iotdb.commons.client.request.AsyncRequestRPCHandler;
+import org.apache.iotdb.commons.client.request.ConfigNodeInternalServiceAsyncRequestManager;
+import org.apache.iotdb.confignode.client.CnToCnNodeRequestType;
+import org.apache.iotdb.confignode.client.async.handlers.rpc.ConfigNodeAsyncRequestRPCHandler;
+import org.apache.iotdb.confignode.client.async.handlers.rpc.ConfigNodeTSStatusRPCHandler;
+import org.apache.iotdb.confignode.client.async.handlers.rpc.SubmitTestConnectionTaskToConfigNodeRPCHandler;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CnToCnInternalServiceAsyncRequestManager
+ extends ConfigNodeInternalServiceAsyncRequestManager {
+
+ private static final Logger LOGGER =
+ LoggerFactory.getLogger(CnToCnInternalServiceAsyncRequestManager.class);
+
+ @Override
+ protected void initActionMapBuilder() {
+ actionMapBuilder.put(
+ CnToCnNodeRequestType.SUBMIT_TEST_CONNECTION_TASK,
+ (req, client, handler) ->
+ client.submitTestConnectionTask(
+ (TNodeLocations) req, (SubmitTestConnectionTaskToConfigNodeRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToCnNodeRequestType.TEST_CONNECTION,
+ (req, client, handler) ->
+ client.testConnectionEmptyRPC((ConfigNodeTSStatusRPCHandler) handler));
+ }
+
+ @Override
+ protected AsyncRequestRPCHandler buildHandler(
+ AsyncRequestContext requestContext,
+ int requestId,
+ TConfigNodeLocation targetNode) {
+ return ConfigNodeAsyncRequestRPCHandler.buildHandler(requestContext, requestId, targetNode);
+ }
+
+ private static class ClientPoolHolder {
+ private static final CnToCnInternalServiceAsyncRequestManager INSTANCE =
+ new CnToCnInternalServiceAsyncRequestManager();
+
+ private ClientPoolHolder() {
+ // Empty constructor
+ }
+ }
+
+ public static CnToCnInternalServiceAsyncRequestManager getInstance() {
+ return ClientPoolHolder.INSTANCE;
+ }
+}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/CnToDnInternalServiceAsyncRequestManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/CnToDnInternalServiceAsyncRequestManager.java
new file mode 100644
index 0000000000000..8f3e7c720fc63
--- /dev/null
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/CnToDnInternalServiceAsyncRequestManager.java
@@ -0,0 +1,376 @@
+/*
+ * 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.iotdb.confignode.client.async;
+
+import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
+import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
+import org.apache.iotdb.common.rpc.thrift.TFlushReq;
+import org.apache.iotdb.common.rpc.thrift.TNodeLocations;
+import org.apache.iotdb.common.rpc.thrift.TSetConfigurationReq;
+import org.apache.iotdb.common.rpc.thrift.TSetSpaceQuotaReq;
+import org.apache.iotdb.common.rpc.thrift.TSetTTLReq;
+import org.apache.iotdb.common.rpc.thrift.TSetThrottleQuotaReq;
+import org.apache.iotdb.commons.client.request.AsyncRequestContext;
+import org.apache.iotdb.commons.client.request.AsyncRequestRPCHandler;
+import org.apache.iotdb.commons.client.request.DataNodeInternalServiceRequestManager;
+import org.apache.iotdb.confignode.client.CnToDnRequestType;
+import org.apache.iotdb.confignode.client.async.handlers.rpc.CheckTimeSeriesExistenceRPCHandler;
+import org.apache.iotdb.confignode.client.async.handlers.rpc.CountPathsUsingTemplateRPCHandler;
+import org.apache.iotdb.confignode.client.async.handlers.rpc.DataNodeAsyncRequestRPCHandler;
+import org.apache.iotdb.confignode.client.async.handlers.rpc.DataNodeTSStatusRPCHandler;
+import org.apache.iotdb.confignode.client.async.handlers.rpc.FetchSchemaBlackListRPCHandler;
+import org.apache.iotdb.confignode.client.async.handlers.rpc.PipeHeartbeatRPCHandler;
+import org.apache.iotdb.confignode.client.async.handlers.rpc.PipePushMetaRPCHandler;
+import org.apache.iotdb.confignode.client.async.handlers.rpc.SchemaUpdateRPCHandler;
+import org.apache.iotdb.confignode.client.async.handlers.rpc.SubmitTestConnectionTaskRPCHandler;
+import org.apache.iotdb.confignode.client.async.handlers.rpc.TransferLeaderRPCHandler;
+import org.apache.iotdb.confignode.client.async.handlers.rpc.subscription.CheckSchemaRegionUsingTemplateRPCHandler;
+import org.apache.iotdb.confignode.client.async.handlers.rpc.subscription.ConsumerGroupPushMetaRPCHandler;
+import org.apache.iotdb.confignode.client.async.handlers.rpc.subscription.TopicPushMetaRPCHandler;
+import org.apache.iotdb.mpp.rpc.thrift.TActiveTriggerInstanceReq;
+import org.apache.iotdb.mpp.rpc.thrift.TAlterViewReq;
+import org.apache.iotdb.mpp.rpc.thrift.TCheckSchemaRegionUsingTemplateReq;
+import org.apache.iotdb.mpp.rpc.thrift.TCheckTimeSeriesExistenceReq;
+import org.apache.iotdb.mpp.rpc.thrift.TConstructSchemaBlackListReq;
+import org.apache.iotdb.mpp.rpc.thrift.TConstructSchemaBlackListWithTemplateReq;
+import org.apache.iotdb.mpp.rpc.thrift.TConstructViewSchemaBlackListReq;
+import org.apache.iotdb.mpp.rpc.thrift.TCountPathsUsingTemplateReq;
+import org.apache.iotdb.mpp.rpc.thrift.TCreateDataRegionReq;
+import org.apache.iotdb.mpp.rpc.thrift.TCreateFunctionInstanceReq;
+import org.apache.iotdb.mpp.rpc.thrift.TCreatePipePluginInstanceReq;
+import org.apache.iotdb.mpp.rpc.thrift.TCreateSchemaRegionReq;
+import org.apache.iotdb.mpp.rpc.thrift.TCreateTriggerInstanceReq;
+import org.apache.iotdb.mpp.rpc.thrift.TDeactivateTemplateReq;
+import org.apache.iotdb.mpp.rpc.thrift.TDeleteDataForDeleteSchemaReq;
+import org.apache.iotdb.mpp.rpc.thrift.TDeleteTimeSeriesReq;
+import org.apache.iotdb.mpp.rpc.thrift.TDeleteViewSchemaReq;
+import org.apache.iotdb.mpp.rpc.thrift.TDropFunctionInstanceReq;
+import org.apache.iotdb.mpp.rpc.thrift.TDropPipePluginInstanceReq;
+import org.apache.iotdb.mpp.rpc.thrift.TDropTriggerInstanceReq;
+import org.apache.iotdb.mpp.rpc.thrift.TFetchSchemaBlackListReq;
+import org.apache.iotdb.mpp.rpc.thrift.TInactiveTriggerInstanceReq;
+import org.apache.iotdb.mpp.rpc.thrift.TInvalidateMatchedSchemaCacheReq;
+import org.apache.iotdb.mpp.rpc.thrift.TPipeHeartbeatReq;
+import org.apache.iotdb.mpp.rpc.thrift.TPushConsumerGroupMetaReq;
+import org.apache.iotdb.mpp.rpc.thrift.TPushMultiPipeMetaReq;
+import org.apache.iotdb.mpp.rpc.thrift.TPushMultiTopicMetaReq;
+import org.apache.iotdb.mpp.rpc.thrift.TPushPipeMetaReq;
+import org.apache.iotdb.mpp.rpc.thrift.TPushSingleConsumerGroupMetaReq;
+import org.apache.iotdb.mpp.rpc.thrift.TPushSinglePipeMetaReq;
+import org.apache.iotdb.mpp.rpc.thrift.TPushSingleTopicMetaReq;
+import org.apache.iotdb.mpp.rpc.thrift.TPushTopicMetaReq;
+import org.apache.iotdb.mpp.rpc.thrift.TRegionLeaderChangeReq;
+import org.apache.iotdb.mpp.rpc.thrift.TRegionRouteReq;
+import org.apache.iotdb.mpp.rpc.thrift.TResetPeerListReq;
+import org.apache.iotdb.mpp.rpc.thrift.TRollbackSchemaBlackListReq;
+import org.apache.iotdb.mpp.rpc.thrift.TRollbackSchemaBlackListWithTemplateReq;
+import org.apache.iotdb.mpp.rpc.thrift.TRollbackViewSchemaBlackListReq;
+import org.apache.iotdb.mpp.rpc.thrift.TUpdateTemplateReq;
+import org.apache.iotdb.mpp.rpc.thrift.TUpdateTriggerLocationReq;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** Asynchronously send RPC requests to DataNodes. See queryengine.thrift for more details. */
+public class CnToDnInternalServiceAsyncRequestManager
+ extends DataNodeInternalServiceRequestManager {
+
+ private static final Logger LOGGER =
+ LoggerFactory.getLogger(CnToDnInternalServiceAsyncRequestManager.class);
+
+ @Override
+ protected void initActionMapBuilder() {
+ actionMapBuilder.put(
+ CnToDnRequestType.SET_TTL,
+ (req, client, handler) ->
+ client.setTTL((TSetTTLReq) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.CREATE_DATA_REGION,
+ (req, client, handler) ->
+ client.createDataRegion(
+ (TCreateDataRegionReq) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.DELETE_REGION,
+ (req, client, handler) ->
+ client.deleteRegion((TConsensusGroupId) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.CREATE_SCHEMA_REGION,
+ (req, client, handler) ->
+ client.createSchemaRegion(
+ (TCreateSchemaRegionReq) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.CREATE_FUNCTION,
+ (req, client, handler) ->
+ client.createFunction(
+ (TCreateFunctionInstanceReq) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.DROP_FUNCTION,
+ (req, client, handler) ->
+ client.dropFunction(
+ (TDropFunctionInstanceReq) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.CREATE_TRIGGER_INSTANCE,
+ (req, client, handler) ->
+ client.createTriggerInstance(
+ (TCreateTriggerInstanceReq) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.DROP_TRIGGER_INSTANCE,
+ (req, client, handler) ->
+ client.dropTriggerInstance(
+ (TDropTriggerInstanceReq) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.ACTIVE_TRIGGER_INSTANCE,
+ (req, client, handler) ->
+ client.activeTriggerInstance(
+ (TActiveTriggerInstanceReq) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.INACTIVE_TRIGGER_INSTANCE,
+ (req, client, handler) ->
+ client.inactiveTriggerInstance(
+ (TInactiveTriggerInstanceReq) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.UPDATE_TRIGGER_LOCATION,
+ (req, client, handler) ->
+ client.updateTriggerLocation(
+ (TUpdateTriggerLocationReq) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.CREATE_PIPE_PLUGIN,
+ (req, client, handler) ->
+ client.createPipePlugin(
+ (TCreatePipePluginInstanceReq) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.DROP_PIPE_PLUGIN,
+ (req, client, handler) ->
+ client.dropPipePlugin(
+ (TDropPipePluginInstanceReq) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.PIPE_PUSH_ALL_META,
+ (req, client, handler) ->
+ client.pushPipeMeta((TPushPipeMetaReq) req, (PipePushMetaRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.PIPE_PUSH_SINGLE_META,
+ (req, client, handler) ->
+ client.pushSinglePipeMeta(
+ (TPushSinglePipeMetaReq) req, (PipePushMetaRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.PIPE_PUSH_MULTI_META,
+ (req, client, handler) ->
+ client.pushMultiPipeMeta(
+ (TPushMultiPipeMetaReq) req, (PipePushMetaRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.TOPIC_PUSH_ALL_META,
+ (req, client, handler) ->
+ client.pushTopicMeta((TPushTopicMetaReq) req, (TopicPushMetaRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.TOPIC_PUSH_SINGLE_META,
+ (req, client, handler) ->
+ client.pushSingleTopicMeta(
+ (TPushSingleTopicMetaReq) req, (TopicPushMetaRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.TOPIC_PUSH_MULTI_META,
+ (req, client, handler) ->
+ client.pushMultiTopicMeta(
+ (TPushMultiTopicMetaReq) req, (TopicPushMetaRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.CONSUMER_GROUP_PUSH_ALL_META,
+ (req, client, handler) ->
+ client.pushConsumerGroupMeta(
+ (TPushConsumerGroupMetaReq) req, (ConsumerGroupPushMetaRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.CONSUMER_GROUP_PUSH_SINGLE_META,
+ (req, client, handler) ->
+ client.pushSingleConsumerGroupMeta(
+ (TPushSingleConsumerGroupMetaReq) req, (ConsumerGroupPushMetaRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.PIPE_HEARTBEAT,
+ (req, client, handler) ->
+ client.pipeHeartbeat((TPipeHeartbeatReq) req, (PipeHeartbeatRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.MERGE,
+ (req, client, handler) -> client.merge((DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.FULL_MERGE,
+ (req, client, handler) -> client.merge((DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.FLUSH,
+ (req, client, handler) ->
+ client.flush((TFlushReq) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.CLEAR_CACHE,
+ (req, client, handler) -> client.clearCache((DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.START_REPAIR_DATA,
+ (req, client, handler) -> client.startRepairData((DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.STOP_REPAIR_DATA,
+ (req, client, handler) -> client.stopRepairData((DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.LOAD_CONFIGURATION,
+ (req, client, handler) -> client.loadConfiguration((DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.SET_SYSTEM_STATUS,
+ (req, client, handler) ->
+ client.setSystemStatus((String) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.SET_CONFIGURATION,
+ (req, client, handler) ->
+ client.setConfiguration(
+ (TSetConfigurationReq) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.UPDATE_REGION_ROUTE_MAP,
+ (req, client, handler) ->
+ client.updateRegionCache((TRegionRouteReq) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.CHANGE_REGION_LEADER,
+ (req, client, handler) ->
+ client.changeRegionLeader(
+ (TRegionLeaderChangeReq) req, (TransferLeaderRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.CONSTRUCT_SCHEMA_BLACK_LIST,
+ (req, client, handler) ->
+ client.constructSchemaBlackList(
+ (TConstructSchemaBlackListReq) req, (SchemaUpdateRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.ROLLBACK_SCHEMA_BLACK_LIST,
+ (req, client, handler) ->
+ client.rollbackSchemaBlackList(
+ (TRollbackSchemaBlackListReq) req, (SchemaUpdateRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.FETCH_SCHEMA_BLACK_LIST,
+ (req, client, handler) ->
+ client.fetchSchemaBlackList(
+ (TFetchSchemaBlackListReq) req, (FetchSchemaBlackListRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.INVALIDATE_MATCHED_SCHEMA_CACHE,
+ (req, client, handler) ->
+ client.invalidateMatchedSchemaCache(
+ (TInvalidateMatchedSchemaCacheReq) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.DELETE_DATA_FOR_DELETE_SCHEMA,
+ (req, client, handler) ->
+ client.deleteDataForDeleteSchema(
+ (TDeleteDataForDeleteSchemaReq) req, (SchemaUpdateRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.DELETE_TIMESERIES,
+ (req, client, handler) ->
+ client.deleteTimeSeries((TDeleteTimeSeriesReq) req, (SchemaUpdateRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.CONSTRUCT_SCHEMA_BLACK_LIST_WITH_TEMPLATE,
+ (req, client, handler) ->
+ client.constructSchemaBlackListWithTemplate(
+ (TConstructSchemaBlackListWithTemplateReq) req, (SchemaUpdateRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.ROLLBACK_SCHEMA_BLACK_LIST_WITH_TEMPLATE,
+ (req, client, handler) ->
+ client.rollbackSchemaBlackListWithTemplate(
+ (TRollbackSchemaBlackListWithTemplateReq) req, (SchemaUpdateRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.DEACTIVATE_TEMPLATE,
+ (req, client, handler) ->
+ client.deactivateTemplate(
+ (TDeactivateTemplateReq) req, (SchemaUpdateRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.UPDATE_TEMPLATE,
+ (req, client, handler) ->
+ client.updateTemplate((TUpdateTemplateReq) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.COUNT_PATHS_USING_TEMPLATE,
+ (req, client, handler) ->
+ client.countPathsUsingTemplate(
+ (TCountPathsUsingTemplateReq) req, (CountPathsUsingTemplateRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.CHECK_SCHEMA_REGION_USING_TEMPLATE,
+ (req, client, handler) ->
+ client.checkSchemaRegionUsingTemplate(
+ (TCheckSchemaRegionUsingTemplateReq) req,
+ (CheckSchemaRegionUsingTemplateRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.CHECK_TIMESERIES_EXISTENCE,
+ (req, client, handler) ->
+ client.checkTimeSeriesExistence(
+ (TCheckTimeSeriesExistenceReq) req, (CheckTimeSeriesExistenceRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.CONSTRUCT_VIEW_SCHEMA_BLACK_LIST,
+ (req, client, handler) ->
+ client.constructViewSchemaBlackList(
+ (TConstructViewSchemaBlackListReq) req, (SchemaUpdateRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.ROLLBACK_VIEW_SCHEMA_BLACK_LIST,
+ (req, client, handler) ->
+ client.rollbackViewSchemaBlackList(
+ (TRollbackViewSchemaBlackListReq) req, (SchemaUpdateRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.DELETE_VIEW,
+ (req, client, handler) ->
+ client.deleteViewSchema((TDeleteViewSchemaReq) req, (SchemaUpdateRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.ALTER_VIEW,
+ (req, client, handler) ->
+ client.alterView((TAlterViewReq) req, (SchemaUpdateRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.KILL_QUERY_INSTANCE,
+ (req, client, handler) ->
+ client.killQueryInstance((String) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.SET_SPACE_QUOTA,
+ (req, client, handler) ->
+ client.setSpaceQuota((TSetSpaceQuotaReq) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.SET_THROTTLE_QUOTA,
+ (req, client, handler) ->
+ client.setThrottleQuota(
+ (TSetThrottleQuotaReq) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.RESET_PEER_LIST,
+ (req, client, handler) ->
+ client.resetPeerList((TResetPeerListReq) req, (DataNodeTSStatusRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.SUBMIT_TEST_CONNECTION_TASK,
+ (req, client, handler) ->
+ client.submitTestConnectionTask(
+ (TNodeLocations) req, (SubmitTestConnectionTaskRPCHandler) handler));
+ actionMapBuilder.put(
+ CnToDnRequestType.TEST_CONNECTION,
+ (req, client, handler) ->
+ client.testConnectionEmptyRPC((DataNodeTSStatusRPCHandler) handler));
+ }
+
+ @Override
+ protected AsyncRequestRPCHandler buildHandler(
+ AsyncRequestContext requestContext,
+ int requestId,
+ TDataNodeLocation targetNode) {
+ return DataNodeAsyncRequestRPCHandler.buildHandler(requestContext, requestId, targetNode);
+ }
+
+ private static class ClientPoolHolder {
+
+ private static final CnToDnInternalServiceAsyncRequestManager INSTANCE =
+ new CnToDnInternalServiceAsyncRequestManager();
+
+ private ClientPoolHolder() {
+ // Empty constructor
+ }
+ }
+
+ public static CnToDnInternalServiceAsyncRequestManager getInstance() {
+ return ClientPoolHolder.INSTANCE;
+ }
+}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/ConfigNodeAsyncRequestContext.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/ConfigNodeAsyncRequestContext.java
new file mode 100644
index 0000000000000..cde2cf1c8ec2f
--- /dev/null
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/ConfigNodeAsyncRequestContext.java
@@ -0,0 +1,43 @@
+/*
+ * 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.iotdb.confignode.client.async.handlers;
+
+import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation;
+import org.apache.iotdb.commons.client.request.AsyncRequestContext;
+import org.apache.iotdb.confignode.client.CnToCnNodeRequestType;
+
+import java.util.Map;
+
+/**
+ * Asynchronous Client handler.
+ *
+ * @param ClassName of RPC request
+ * @param ClassName of RPC response
+ */
+public class ConfigNodeAsyncRequestContext
+ extends AsyncRequestContext {
+
+ public ConfigNodeAsyncRequestContext(
+ CnToCnNodeRequestType configNodeRequestType,
+ Q q,
+ Map integerTConfigNodeLocationMap) {
+ super(configNodeRequestType, q, integerTConfigNodeLocationMap);
+ }
+}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/DataNodeAsyncRequestContext.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/DataNodeAsyncRequestContext.java
new file mode 100644
index 0000000000000..2b813c081d7e7
--- /dev/null
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/DataNodeAsyncRequestContext.java
@@ -0,0 +1,50 @@
+/*
+ * 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.iotdb.confignode.client.async.handlers;
+
+import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
+import org.apache.iotdb.commons.client.request.AsyncRequestContext;
+import org.apache.iotdb.confignode.client.CnToDnRequestType;
+
+import java.util.Map;
+
+/**
+ * Asynchronous Client handler.
+ *
+ * @param ClassName of RPC request
+ * @param ClassName of RPC response
+ */
+public class DataNodeAsyncRequestContext
+ extends AsyncRequestContext {
+
+ public DataNodeAsyncRequestContext(CnToDnRequestType requestType) {
+ super(requestType);
+ }
+
+ public DataNodeAsyncRequestContext(
+ CnToDnRequestType requestType, Map dataNodeLocationMap) {
+ super(requestType, dataNodeLocationMap);
+ }
+
+ public DataNodeAsyncRequestContext(
+ CnToDnRequestType requestType, Q q, Map dataNodeLocationMap) {
+ super(requestType, q, dataNodeLocationMap);
+ }
+}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/CheckTimeSeriesExistenceRPCHandler.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/CheckTimeSeriesExistenceRPCHandler.java
index 150947f1b97b1..b12ba289f1c2a 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/CheckTimeSeriesExistenceRPCHandler.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/CheckTimeSeriesExistenceRPCHandler.java
@@ -21,7 +21,7 @@
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
-import org.apache.iotdb.confignode.client.DataNodeRequestType;
+import org.apache.iotdb.confignode.client.CnToDnRequestType;
import org.apache.iotdb.mpp.rpc.thrift.TCheckTimeSeriesExistenceResp;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -33,13 +33,13 @@
import java.util.concurrent.CountDownLatch;
public class CheckTimeSeriesExistenceRPCHandler
- extends AbstractAsyncRPCHandler {
+ extends DataNodeAsyncRequestRPCHandler {
private static final Logger LOGGER =
LoggerFactory.getLogger(CheckTimeSeriesExistenceRPCHandler.class);
public CheckTimeSeriesExistenceRPCHandler(
- DataNodeRequestType requestType,
+ CnToDnRequestType requestType,
int requestId,
TDataNodeLocation targetDataNode,
Map dataNodeLocationMap,
@@ -53,15 +53,13 @@ public void onComplete(TCheckTimeSeriesExistenceResp response) {
TSStatus tsStatus = response.getStatus();
responseMap.put(requestId, response);
if (tsStatus.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- dataNodeLocationMap.remove(requestId);
- LOGGER.info("Successfully check timeseries existence on DataNode: {}", targetDataNode);
+ nodeLocationMap.remove(requestId);
+ LOGGER.info("Successfully check timeseries existence on DataNode: {}", targetNode);
} else if (tsStatus.getCode() == TSStatusCode.MULTIPLE_ERROR.getStatusCode()) {
- dataNodeLocationMap.remove(requestId);
- LOGGER.error(
- "Failed to check timeseries existence on DataNode {}, {}", targetDataNode, tsStatus);
+ nodeLocationMap.remove(requestId);
+ LOGGER.error("Failed to check timeseries existence on DataNode {}, {}", targetNode, tsStatus);
} else {
- LOGGER.error(
- "Failed to check timeseries existence on DataNode {}, {}", targetDataNode, tsStatus);
+ LOGGER.error("Failed to check timeseries existence on DataNode {}, {}", targetNode, tsStatus);
}
countDownLatch.countDown();
}
@@ -70,9 +68,9 @@ public void onComplete(TCheckTimeSeriesExistenceResp response) {
public void onError(Exception e) {
String errorMsg =
"Check timeseries existence error on DataNode: {id="
- + targetDataNode.getDataNodeId()
+ + targetNode.getDataNodeId()
+ ", internalEndPoint="
- + targetDataNode.getInternalEndPoint()
+ + targetNode.getInternalEndPoint()
+ "}"
+ e.getMessage();
LOGGER.error(errorMsg);
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/ConfigNodeAsyncRequestRPCHandler.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/ConfigNodeAsyncRequestRPCHandler.java
new file mode 100644
index 0000000000000..4825629ee5591
--- /dev/null
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/ConfigNodeAsyncRequestRPCHandler.java
@@ -0,0 +1,88 @@
+/*
+ * 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.iotdb.confignode.client.async.handlers.rpc;
+
+import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation;
+import org.apache.iotdb.common.rpc.thrift.TSStatus;
+import org.apache.iotdb.common.rpc.thrift.TTestConnectionResp;
+import org.apache.iotdb.commons.client.request.AsyncRequestContext;
+import org.apache.iotdb.commons.client.request.AsyncRequestRPCHandler;
+import org.apache.iotdb.confignode.client.CnToCnNodeRequestType;
+
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+
+public abstract class ConfigNodeAsyncRequestRPCHandler
+ extends AsyncRequestRPCHandler {
+
+ protected ConfigNodeAsyncRequestRPCHandler(
+ CnToCnNodeRequestType configNodeRequestType,
+ int requestId,
+ TConfigNodeLocation targetNode,
+ Map integerTConfigNodeLocationMap,
+ Map integerResponseMap,
+ CountDownLatch countDownLatch) {
+ super(
+ configNodeRequestType,
+ requestId,
+ targetNode,
+ integerTConfigNodeLocationMap,
+ integerResponseMap,
+ countDownLatch);
+ }
+
+ @Override
+ protected String generateFormattedTargetLocation(TConfigNodeLocation configNodeLocation) {
+ return "{id="
+ + targetNode.getConfigNodeId()
+ + ", internalEndPoint="
+ + targetNode.getInternalEndPoint()
+ + "}";
+ }
+
+ public static ConfigNodeAsyncRequestRPCHandler buildHandler(
+ AsyncRequestContext context,
+ int requestId,
+ TConfigNodeLocation targetConfigNode) {
+ CnToCnNodeRequestType requestType = context.getRequestType();
+ Map nodeLocationMap = context.getNodeLocationMap();
+ Map responseMap = context.getResponseMap();
+ CountDownLatch countDownLatch = context.getCountDownLatch();
+ switch (requestType) {
+ case SUBMIT_TEST_CONNECTION_TASK:
+ return new SubmitTestConnectionTaskToConfigNodeRPCHandler(
+ requestType,
+ requestId,
+ targetConfigNode,
+ nodeLocationMap,
+ (Map) responseMap,
+ countDownLatch);
+ case TEST_CONNECTION:
+ default:
+ return new ConfigNodeTSStatusRPCHandler(
+ requestType,
+ requestId,
+ targetConfigNode,
+ nodeLocationMap,
+ (Map) responseMap,
+ countDownLatch);
+ }
+ }
+}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/ConfigNodeTSStatusRPCHandler.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/ConfigNodeTSStatusRPCHandler.java
new file mode 100644
index 0000000000000..a28acb3496267
--- /dev/null
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/ConfigNodeTSStatusRPCHandler.java
@@ -0,0 +1,95 @@
+/*
+ * 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.iotdb.confignode.client.async.handlers.rpc;
+
+import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation;
+import org.apache.iotdb.common.rpc.thrift.TSStatus;
+import org.apache.iotdb.confignode.client.CnToCnNodeRequestType;
+import org.apache.iotdb.rpc.RpcUtils;
+import org.apache.iotdb.rpc.TSStatusCode;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+
+/** General RPC handler for TSStatus response type. */
+public class ConfigNodeTSStatusRPCHandler extends ConfigNodeAsyncRequestRPCHandler {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(ConfigNodeTSStatusRPCHandler.class);
+
+ public ConfigNodeTSStatusRPCHandler(
+ CnToCnNodeRequestType requestType,
+ int requestId,
+ TConfigNodeLocation targetConfigNode,
+ Map configNodeLocationMap,
+ Map responseMap,
+ CountDownLatch countDownLatch) {
+ super(
+ requestType,
+ requestId,
+ targetConfigNode,
+ configNodeLocationMap,
+ responseMap,
+ countDownLatch);
+ }
+
+ @Override
+ public void onComplete(TSStatus response) {
+ // Put response
+ responseMap.put(requestId, response);
+
+ if (response.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
+ // Remove only if success
+ nodeLocationMap.remove(requestId);
+ LOGGER.info("Successfully {} on ConfigNode: {}", requestType, formattedTargetLocation);
+ } else {
+ LOGGER.error(
+ "Failed to {} on ConfigNode: {}, response: {}",
+ requestType,
+ formattedTargetLocation,
+ response);
+ }
+
+ // Always CountDown
+ countDownLatch.countDown();
+ }
+
+ @Override
+ public void onError(Exception e) {
+ String errorMsg =
+ "Failed to "
+ + requestType
+ + " on ConfigNode: "
+ + formattedTargetLocation
+ + ", exception: "
+ + e.getMessage();
+ LOGGER.error(errorMsg);
+
+ responseMap.put(
+ requestId,
+ new TSStatus(
+ RpcUtils.getStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR.getStatusCode(), errorMsg)));
+
+ // Always CountDown
+ countDownLatch.countDown();
+ }
+}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/CountPathsUsingTemplateRPCHandler.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/CountPathsUsingTemplateRPCHandler.java
index 168208d86b976..f2ed0cc425c57 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/CountPathsUsingTemplateRPCHandler.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/CountPathsUsingTemplateRPCHandler.java
@@ -21,7 +21,7 @@
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
-import org.apache.iotdb.confignode.client.DataNodeRequestType;
+import org.apache.iotdb.confignode.client.CnToDnRequestType;
import org.apache.iotdb.mpp.rpc.thrift.TCountPathsUsingTemplateResp;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -33,13 +33,13 @@
import java.util.concurrent.CountDownLatch;
public class CountPathsUsingTemplateRPCHandler
- extends AbstractAsyncRPCHandler {
+ extends DataNodeAsyncRequestRPCHandler {
private static final Logger LOGGER =
LoggerFactory.getLogger(CountPathsUsingTemplateRPCHandler.class);
public CountPathsUsingTemplateRPCHandler(
- DataNodeRequestType requestType,
+ CnToDnRequestType requestType,
int requestId,
TDataNodeLocation targetDataNode,
Map dataNodeLocationMap,
@@ -53,15 +53,13 @@ public void onComplete(TCountPathsUsingTemplateResp response) {
TSStatus tsStatus = response.getStatus();
responseMap.put(requestId, response);
if (tsStatus.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- dataNodeLocationMap.remove(requestId);
- LOGGER.info("Successfully count paths using template on DataNode: {}", targetDataNode);
+ nodeLocationMap.remove(requestId);
+ LOGGER.info("Successfully count paths using template on DataNode: {}", targetNode);
} else if (tsStatus.getCode() == TSStatusCode.MULTIPLE_ERROR.getStatusCode()) {
- dataNodeLocationMap.remove(requestId);
- LOGGER.error(
- "Failed to count paths using template on DataNode {}, {}", targetDataNode, tsStatus);
+ nodeLocationMap.remove(requestId);
+ LOGGER.error("Failed to count paths using template on DataNode {}, {}", targetNode, tsStatus);
} else {
- LOGGER.error(
- "Failed to count paths using template on DataNode {}, {}", targetDataNode, tsStatus);
+ LOGGER.error("Failed to count paths using template on DataNode {}, {}", targetNode, tsStatus);
}
countDownLatch.countDown();
}
@@ -70,9 +68,9 @@ public void onComplete(TCountPathsUsingTemplateResp response) {
public void onError(Exception e) {
String errorMsg =
"Count paths using template error on DataNode: {id="
- + targetDataNode.getDataNodeId()
+ + targetNode.getDataNodeId()
+ ", internalEndPoint="
- + targetDataNode.getInternalEndPoint()
+ + targetNode.getInternalEndPoint()
+ "}"
+ e.getMessage();
LOGGER.error(errorMsg);
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/AsyncClientHandler.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/DataNodeAsyncRequestRPCHandler.java
similarity index 58%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/AsyncClientHandler.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/DataNodeAsyncRequestRPCHandler.java
index 1d5183fed5d59..5b26f4800b1e7 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/AsyncClientHandler.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/DataNodeAsyncRequestRPCHandler.java
@@ -17,20 +17,14 @@
* under the License.
*/
-package org.apache.iotdb.confignode.client.async.handlers;
+package org.apache.iotdb.confignode.client.async.handlers.rpc;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
-import org.apache.iotdb.confignode.client.DataNodeRequestType;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.AbstractAsyncRPCHandler;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.AsyncTSStatusRPCHandler;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.CheckTimeSeriesExistenceRPCHandler;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.CountPathsUsingTemplateRPCHandler;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.FetchSchemaBlackListRPCHandler;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.PipeHeartbeatRPCHandler;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.PipePushMetaRPCHandler;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.SchemaUpdateRPCHandler;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.TransferLeaderRPCHandler;
+import org.apache.iotdb.common.rpc.thrift.TTestConnectionResp;
+import org.apache.iotdb.commons.client.request.AsyncRequestContext;
+import org.apache.iotdb.commons.client.request.AsyncRequestRPCHandler;
+import org.apache.iotdb.confignode.client.CnToDnRequestType;
import org.apache.iotdb.confignode.client.async.handlers.rpc.subscription.CheckSchemaRegionUsingTemplateRPCHandler;
import org.apache.iotdb.confignode.client.async.handlers.rpc.subscription.ConsumerGroupPushMetaRPCHandler;
import org.apache.iotdb.confignode.client.async.handlers.rpc.subscription.TopicPushMetaRPCHandler;
@@ -44,129 +38,45 @@
import org.apache.iotdb.mpp.rpc.thrift.TPushTopicMetaResp;
import org.apache.iotdb.mpp.rpc.thrift.TRegionLeaderChangeResp;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
-/**
- * Asynchronous Client handler.
- *
- * @param ClassName of RPC request
- * @param ClassName of RPC response
- */
-public class AsyncClientHandler {
-
- // Type of RPC request
- protected final DataNodeRequestType requestType;
-
- /**
- * Map key: The indices of asynchronous RPC requests.
- *
- * Map value: The corresponding RPC request
- */
- private final Map requestMap;
-
- /**
- * Map key: The indices of asynchronous RPC requests.
- *
- * Map value: The target DataNodes of corresponding indices
- *
- *
All kinds of AsyncHandler will remove its targetDataNode from the dataNodeLocationMap only
- * if its corresponding RPC request success
- */
- private final Map dataNodeLocationMap;
-
- /**
- * Map key: The indices(targetDataNode's ID) of asynchronous RPC requests.
- *
- * Map value: The response of corresponding indices
- *
- *
All kinds of AsyncHandler will add response to the responseMap after its corresponding RPC
- * request finished
- */
- private final Map responseMap;
-
- private CountDownLatch countDownLatch;
-
- /** Custom constructor. */
- public AsyncClientHandler(DataNodeRequestType requestType) {
- this.requestType = requestType;
- this.requestMap = new ConcurrentHashMap<>();
- this.dataNodeLocationMap = new ConcurrentHashMap<>();
- this.responseMap = new ConcurrentHashMap<>();
- }
-
- public void putRequest(int requestId, Q request) {
- requestMap.put(requestId, request);
- }
-
- public void putDataNodeLocation(int requestId, TDataNodeLocation dataNodeLocation) {
- dataNodeLocationMap.put(requestId, dataNodeLocation);
- }
-
- /** Constructor for null requests. */
- public AsyncClientHandler(
- DataNodeRequestType requestType, Map dataNodeLocationMap) {
- this.requestType = requestType;
- this.dataNodeLocationMap = dataNodeLocationMap;
-
- this.requestMap = new ConcurrentHashMap<>();
- this.responseMap = new ConcurrentHashMap<>();
- }
-
- /** Constructor for unique request. */
- public AsyncClientHandler(
- DataNodeRequestType requestType,
- Q request,
- Map dataNodeLocationMap) {
- this.requestType = requestType;
- this.dataNodeLocationMap = dataNodeLocationMap;
-
- this.requestMap = new ConcurrentHashMap<>();
- this.dataNodeLocationMap
- .keySet()
- .forEach(dataNodeId -> this.requestMap.put(dataNodeId, request));
-
- this.responseMap = new ConcurrentHashMap<>();
+public abstract class DataNodeAsyncRequestRPCHandler
+ extends AsyncRequestRPCHandler {
+
+ protected DataNodeAsyncRequestRPCHandler(
+ CnToDnRequestType requestType,
+ int requestId,
+ TDataNodeLocation targetNode,
+ Map dataNodeLocationMap,
+ Map integerResponseMap,
+ CountDownLatch countDownLatch) {
+ super(
+ requestType,
+ requestId,
+ targetNode,
+ dataNodeLocationMap,
+ integerResponseMap,
+ countDownLatch);
}
- public DataNodeRequestType getRequestType() {
- return requestType;
+ @Override
+ protected String generateFormattedTargetLocation(TDataNodeLocation dataNodeLocation) {
+ return "{id="
+ + targetNode.getDataNodeId()
+ + ", internalEndPoint="
+ + targetNode.getInternalEndPoint()
+ + "}";
}
- public List getRequestIndices() {
- return new ArrayList<>(dataNodeLocationMap.keySet());
- }
-
- public Q getRequest(int requestId) {
- return requestMap.get(requestId);
- }
-
- public TDataNodeLocation getDataNodeLocation(int requestId) {
- return dataNodeLocationMap.get(requestId);
- }
-
- public List getResponseList() {
- return new ArrayList<>(responseMap.values());
- }
-
- public Map getResponseMap() {
- return responseMap;
- }
-
- /** Always reset CountDownLatch before retry. */
- public void resetCountDownLatch() {
- countDownLatch = new CountDownLatch(dataNodeLocationMap.size());
- }
-
- public CountDownLatch getCountDownLatch() {
- return countDownLatch;
- }
-
- public AbstractAsyncRPCHandler createAsyncRPCHandler(
- int requestId, TDataNodeLocation targetDataNode) {
+ public static DataNodeAsyncRequestRPCHandler buildHandler(
+ AsyncRequestContext context,
+ int requestId,
+ TDataNodeLocation targetDataNode) {
+ CnToDnRequestType requestType = context.getRequestType();
+ Map dataNodeLocationMap = context.getNodeLocationMap();
+ Map responseMap = context.getResponseMap();
+ CountDownLatch countDownLatch = context.getCountDownLatch();
switch (requestType) {
case CONSTRUCT_SCHEMA_BLACK_LIST:
case ROLLBACK_SCHEMA_BLACK_LIST:
@@ -263,6 +173,14 @@ public AbstractAsyncRPCHandler createAsyncRPCHandler(
dataNodeLocationMap,
(Map) responseMap,
countDownLatch);
+ case SUBMIT_TEST_CONNECTION_TASK:
+ return new SubmitTestConnectionTaskRPCHandler(
+ requestType,
+ requestId,
+ targetDataNode,
+ dataNodeLocationMap,
+ (Map) responseMap,
+ countDownLatch);
case SET_TTL:
case CREATE_DATA_REGION:
case CREATE_SCHEMA_REGION:
@@ -287,8 +205,9 @@ public AbstractAsyncRPCHandler createAsyncRPCHandler(
case UPDATE_TABLE:
case KILL_QUERY_INSTANCE:
case RESET_PEER_LIST:
+ case TEST_CONNECTION:
default:
- return new AsyncTSStatusRPCHandler(
+ return new DataNodeTSStatusRPCHandler(
requestType,
requestId,
targetDataNode,
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/DataNodeTSStatusRPCHandler.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/DataNodeTSStatusRPCHandler.java
new file mode 100644
index 0000000000000..19d451eb671fb
--- /dev/null
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/DataNodeTSStatusRPCHandler.java
@@ -0,0 +1,89 @@
+/*
+ * 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.iotdb.confignode.client.async.handlers.rpc;
+
+import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
+import org.apache.iotdb.common.rpc.thrift.TSStatus;
+import org.apache.iotdb.confignode.client.CnToDnRequestType;
+import org.apache.iotdb.rpc.RpcUtils;
+import org.apache.iotdb.rpc.TSStatusCode;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+
+/** General RPC handler for TSStatus response type. */
+public class DataNodeTSStatusRPCHandler extends DataNodeAsyncRequestRPCHandler {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(DataNodeTSStatusRPCHandler.class);
+
+ public DataNodeTSStatusRPCHandler(
+ CnToDnRequestType requestType,
+ int requestId,
+ TDataNodeLocation targetDataNode,
+ Map dataNodeLocationMap,
+ Map responseMap,
+ CountDownLatch countDownLatch) {
+ super(requestType, requestId, targetDataNode, dataNodeLocationMap, responseMap, countDownLatch);
+ }
+
+ @Override
+ public void onComplete(TSStatus response) {
+ // Put response
+ responseMap.put(requestId, response);
+
+ if (response.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
+ // Remove only if success
+ nodeLocationMap.remove(requestId);
+ LOGGER.info("Successfully {} on DataNode: {}", requestType, formattedTargetLocation);
+ } else {
+ LOGGER.error(
+ "Failed to {} on DataNode: {}, response: {}",
+ requestType,
+ formattedTargetLocation,
+ response);
+ }
+
+ // Always CountDown
+ countDownLatch.countDown();
+ }
+
+ @Override
+ public void onError(Exception e) {
+ String errorMsg =
+ "Failed to "
+ + requestType
+ + " on DataNode: "
+ + formattedTargetLocation
+ + ", exception: "
+ + e.getMessage();
+ LOGGER.error(errorMsg);
+
+ responseMap.put(
+ requestId,
+ new TSStatus(
+ RpcUtils.getStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR.getStatusCode(), errorMsg)));
+
+ // Always CountDown
+ countDownLatch.countDown();
+ }
+}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/FetchSchemaBlackListRPCHandler.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/FetchSchemaBlackListRPCHandler.java
index e73e41322065f..45c659298ca30 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/FetchSchemaBlackListRPCHandler.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/FetchSchemaBlackListRPCHandler.java
@@ -21,7 +21,7 @@
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
-import org.apache.iotdb.confignode.client.DataNodeRequestType;
+import org.apache.iotdb.confignode.client.CnToDnRequestType;
import org.apache.iotdb.mpp.rpc.thrift.TFetchSchemaBlackListResp;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -33,13 +33,13 @@
import java.util.concurrent.CountDownLatch;
public class FetchSchemaBlackListRPCHandler
- extends AbstractAsyncRPCHandler {
+ extends DataNodeAsyncRequestRPCHandler {
private static final Logger LOGGER =
LoggerFactory.getLogger(FetchSchemaBlackListRPCHandler.class);
public FetchSchemaBlackListRPCHandler(
- DataNodeRequestType requestType,
+ CnToDnRequestType requestType,
int requestId,
TDataNodeLocation targetDataNode,
Map dataNodeLocationMap,
@@ -53,15 +53,15 @@ public void onComplete(TFetchSchemaBlackListResp tFetchSchemaBlackListResp) {
TSStatus tsStatus = tFetchSchemaBlackListResp.getStatus();
responseMap.put(requestId, tFetchSchemaBlackListResp);
if (tsStatus.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- dataNodeLocationMap.remove(requestId);
- LOGGER.info("Successfully fetch schemaengine black list on DataNode: {}", targetDataNode);
+ nodeLocationMap.remove(requestId);
+ LOGGER.info("Successfully fetch schemaengine black list on DataNode: {}", targetNode);
} else if (tsStatus.getCode() == TSStatusCode.MULTIPLE_ERROR.getStatusCode()) {
- dataNodeLocationMap.remove(requestId);
+ nodeLocationMap.remove(requestId);
LOGGER.error(
- "Failed to fetch schemaengine black list on DataNode {}, {}", targetDataNode, tsStatus);
+ "Failed to fetch schemaengine black list on DataNode {}, {}", targetNode, tsStatus);
} else {
LOGGER.error(
- "Failed to fetch schemaengine black list on DataNode {}, {}", targetDataNode, tsStatus);
+ "Failed to fetch schemaengine black list on DataNode {}, {}", targetNode, tsStatus);
}
countDownLatch.countDown();
}
@@ -70,9 +70,9 @@ public void onComplete(TFetchSchemaBlackListResp tFetchSchemaBlackListResp) {
public void onError(Exception e) {
String errorMsg =
"Fetch schemaengine black list error on DataNode: {id="
- + targetDataNode.getDataNodeId()
+ + targetNode.getDataNodeId()
+ ", internalEndPoint="
- + targetDataNode.getInternalEndPoint()
+ + targetNode.getInternalEndPoint()
+ "}"
+ e.getMessage();
LOGGER.error(errorMsg);
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/PipeHeartbeatRPCHandler.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/PipeHeartbeatRPCHandler.java
index ff235a38bd084..ec4968cfa06dd 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/PipeHeartbeatRPCHandler.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/PipeHeartbeatRPCHandler.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.confignode.client.async.handlers.rpc;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
-import org.apache.iotdb.confignode.client.DataNodeRequestType;
+import org.apache.iotdb.confignode.client.CnToDnRequestType;
import org.apache.iotdb.mpp.rpc.thrift.TPipeHeartbeatResp;
import org.slf4j.Logger;
@@ -29,12 +29,12 @@
import java.util.Map;
import java.util.concurrent.CountDownLatch;
-public class PipeHeartbeatRPCHandler extends AbstractAsyncRPCHandler {
+public class PipeHeartbeatRPCHandler extends DataNodeAsyncRequestRPCHandler {
private static final Logger LOGGER = LoggerFactory.getLogger(PipeHeartbeatRPCHandler.class);
public PipeHeartbeatRPCHandler(
- DataNodeRequestType requestType,
+ CnToDnRequestType requestType,
int requestId,
TDataNodeLocation targetDataNode,
Map dataNodeLocationMap,
@@ -47,7 +47,7 @@ public PipeHeartbeatRPCHandler(
public void onComplete(TPipeHeartbeatResp response) {
// Put response
responseMap.put(requestId, response);
- dataNodeLocationMap.remove(requestId);
+ nodeLocationMap.remove(requestId);
LOGGER.info("Successfully {} on DataNode: {}", requestType, formattedTargetLocation);
// Always CountDown
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/PipePushMetaRPCHandler.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/PipePushMetaRPCHandler.java
index 774e914de367e..3517bbeb93ea3 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/PipePushMetaRPCHandler.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/PipePushMetaRPCHandler.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.confignode.client.async.handlers.rpc;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
-import org.apache.iotdb.confignode.client.DataNodeRequestType;
+import org.apache.iotdb.confignode.client.CnToDnRequestType;
import org.apache.iotdb.mpp.rpc.thrift.TPushPipeMetaResp;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -31,11 +31,11 @@
import java.util.Map;
import java.util.concurrent.CountDownLatch;
-public class PipePushMetaRPCHandler extends AbstractAsyncRPCHandler {
+public class PipePushMetaRPCHandler extends DataNodeAsyncRequestRPCHandler {
private static final Logger LOGGER = LoggerFactory.getLogger(PipePushMetaRPCHandler.class);
public PipePushMetaRPCHandler(
- DataNodeRequestType requestType,
+ CnToDnRequestType requestType,
int requestId,
TDataNodeLocation targetDataNode,
Map dataNodeLocationMap,
@@ -60,7 +60,7 @@ public void onComplete(TPushPipeMetaResp response) {
}
// Always remove to avoid retrying
- dataNodeLocationMap.remove(requestId);
+ nodeLocationMap.remove(requestId);
// Always CountDown
countDownLatch.countDown();
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/SchemaUpdateRPCHandler.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/SchemaUpdateRPCHandler.java
index 3980e6e0c1b52..db8458a948ce3 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/SchemaUpdateRPCHandler.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/SchemaUpdateRPCHandler.java
@@ -21,7 +21,7 @@
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
-import org.apache.iotdb.confignode.client.DataNodeRequestType;
+import org.apache.iotdb.confignode.client.CnToDnRequestType;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -31,12 +31,12 @@
import java.util.Map;
import java.util.concurrent.CountDownLatch;
-public class SchemaUpdateRPCHandler extends AsyncTSStatusRPCHandler {
+public class SchemaUpdateRPCHandler extends DataNodeTSStatusRPCHandler {
private static final Logger LOGGER = LoggerFactory.getLogger(SchemaUpdateRPCHandler.class);
public SchemaUpdateRPCHandler(
- DataNodeRequestType requestType,
+ CnToDnRequestType requestType,
int requestId,
TDataNodeLocation targetDataNode,
Map dataNodeLocationMap,
@@ -50,10 +50,10 @@ public void onComplete(TSStatus tsStatus) {
responseMap.put(requestId, tsStatus);
LOGGER.info("{} for {} receives: {}", requestType, requestId, tsStatus);
if (tsStatus.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- dataNodeLocationMap.remove(requestId);
+ nodeLocationMap.remove(requestId);
LOGGER.info("Successfully {} on DataNode: {}", requestType, formattedTargetLocation);
} else if (tsStatus.getCode() == TSStatusCode.MULTIPLE_ERROR.getStatusCode()) {
- dataNodeLocationMap.remove(requestId);
+ nodeLocationMap.remove(requestId);
LOGGER.warn(
"Failed to {} on DataNode {}, {}", requestType, formattedTargetLocation, tsStatus);
} else {
@@ -68,9 +68,9 @@ public void onError(Exception e) {
String errorMsg =
requestType
+ " error on DataNode: {id="
- + targetDataNode.getDataNodeId()
+ + targetNode.getDataNodeId()
+ ", internalEndPoint="
- + targetDataNode.getInternalEndPoint()
+ + targetNode.getInternalEndPoint()
+ "}"
+ e.getMessage();
LOGGER.warn(errorMsg);
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/SubmitTestConnectionTaskRPCHandler.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/SubmitTestConnectionTaskRPCHandler.java
new file mode 100644
index 0000000000000..4abf0a0eca114
--- /dev/null
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/SubmitTestConnectionTaskRPCHandler.java
@@ -0,0 +1,68 @@
+/*
+ * 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.iotdb.confignode.client.async.handlers.rpc;
+
+import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
+import org.apache.iotdb.common.rpc.thrift.TSStatus;
+import org.apache.iotdb.common.rpc.thrift.TTestConnectionResp;
+import org.apache.iotdb.confignode.client.CnToDnRequestType;
+import org.apache.iotdb.rpc.TSStatusCode;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+
+public class SubmitTestConnectionTaskRPCHandler
+ extends DataNodeAsyncRequestRPCHandler {
+
+ private static final Logger LOGGER =
+ LoggerFactory.getLogger(SubmitTestConnectionTaskRPCHandler.class);
+
+ public SubmitTestConnectionTaskRPCHandler(
+ CnToDnRequestType requestType,
+ int requestId,
+ TDataNodeLocation targetDataNode,
+ Map dataNodeLocationMap,
+ Map responseMap,
+ CountDownLatch countDownLatch) {
+ super(requestType, requestId, targetDataNode, dataNodeLocationMap, responseMap, countDownLatch);
+ }
+
+ @Override
+ public void onComplete(TTestConnectionResp resp) {
+ responseMap.put(requestId, resp);
+ nodeLocationMap.remove(requestId);
+ countDownLatch.countDown();
+ }
+
+ @Override
+ public void onError(Exception e) {
+ responseMap.put(
+ requestId,
+ new TTestConnectionResp()
+ .setStatus(
+ new TSStatus(TSStatusCode.CAN_NOT_CONNECT_DATANODE.getStatusCode())
+ .setMessage(e.getMessage())));
+ nodeLocationMap.remove(requestId);
+ countDownLatch.countDown();
+ }
+}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/SubmitTestConnectionTaskToConfigNodeRPCHandler.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/SubmitTestConnectionTaskToConfigNodeRPCHandler.java
new file mode 100644
index 0000000000000..d26984fd0a70d
--- /dev/null
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/SubmitTestConnectionTaskToConfigNodeRPCHandler.java
@@ -0,0 +1,74 @@
+/*
+ * 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.iotdb.confignode.client.async.handlers.rpc;
+
+import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation;
+import org.apache.iotdb.common.rpc.thrift.TSStatus;
+import org.apache.iotdb.common.rpc.thrift.TTestConnectionResp;
+import org.apache.iotdb.confignode.client.CnToCnNodeRequestType;
+import org.apache.iotdb.rpc.TSStatusCode;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+
+public class SubmitTestConnectionTaskToConfigNodeRPCHandler
+ extends ConfigNodeAsyncRequestRPCHandler {
+
+ private static final Logger LOGGER =
+ LoggerFactory.getLogger(SubmitTestConnectionTaskToConfigNodeRPCHandler.class);
+
+ public SubmitTestConnectionTaskToConfigNodeRPCHandler(
+ CnToCnNodeRequestType requestType,
+ int requestId,
+ TConfigNodeLocation targetConfigNode,
+ Map configNodeLocationMap,
+ Map responseMap,
+ CountDownLatch countDownLatch) {
+ super(
+ requestType,
+ requestId,
+ targetConfigNode,
+ configNodeLocationMap,
+ responseMap,
+ countDownLatch);
+ }
+
+ @Override
+ public void onComplete(TTestConnectionResp resp) {
+ responseMap.put(requestId, resp);
+ nodeLocationMap.remove(requestId);
+ countDownLatch.countDown();
+ }
+
+ @Override
+ public void onError(Exception e) {
+ responseMap.put(
+ requestId,
+ new TTestConnectionResp()
+ .setStatus(
+ new TSStatus(TSStatusCode.CAN_NOT_CONNECT_CONFIGNODE.getStatusCode())
+ .setMessage(e.getMessage())));
+ nodeLocationMap.remove(requestId);
+ countDownLatch.countDown();
+ }
+}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/TransferLeaderRPCHandler.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/TransferLeaderRPCHandler.java
index d5107e315cf19..352cc0694e2bf 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/TransferLeaderRPCHandler.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/TransferLeaderRPCHandler.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.confignode.client.async.handlers.rpc;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
-import org.apache.iotdb.confignode.client.DataNodeRequestType;
+import org.apache.iotdb.confignode.client.CnToDnRequestType;
import org.apache.iotdb.mpp.rpc.thrift.TRegionLeaderChangeResp;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -31,12 +31,13 @@
import java.util.Map;
import java.util.concurrent.CountDownLatch;
-public class TransferLeaderRPCHandler extends AbstractAsyncRPCHandler {
+public class TransferLeaderRPCHandler
+ extends DataNodeAsyncRequestRPCHandler {
private static final Logger LOGGER = LoggerFactory.getLogger(TransferLeaderRPCHandler.class);
public TransferLeaderRPCHandler(
- DataNodeRequestType requestType,
+ CnToDnRequestType requestType,
int requestId,
TDataNodeLocation targetDataNode,
Map dataNodeLocationMap,
@@ -52,7 +53,7 @@ public void onComplete(TRegionLeaderChangeResp response) {
if (response.getStatus().getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
// Remove only if success
- dataNodeLocationMap.remove(requestId);
+ nodeLocationMap.remove(requestId);
LOGGER.info("Successfully {} on DataNode: {}", requestType, formattedTargetLocation);
} else {
LOGGER.error(
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/subscription/CheckSchemaRegionUsingTemplateRPCHandler.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/subscription/CheckSchemaRegionUsingTemplateRPCHandler.java
index ad69516299219..14898dcdc6c9c 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/subscription/CheckSchemaRegionUsingTemplateRPCHandler.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/subscription/CheckSchemaRegionUsingTemplateRPCHandler.java
@@ -21,8 +21,8 @@
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
-import org.apache.iotdb.confignode.client.DataNodeRequestType;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.AbstractAsyncRPCHandler;
+import org.apache.iotdb.confignode.client.CnToDnRequestType;
+import org.apache.iotdb.confignode.client.async.handlers.rpc.DataNodeAsyncRequestRPCHandler;
import org.apache.iotdb.mpp.rpc.thrift.TCheckSchemaRegionUsingTemplateResp;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -34,13 +34,13 @@
import java.util.concurrent.CountDownLatch;
public class CheckSchemaRegionUsingTemplateRPCHandler
- extends AbstractAsyncRPCHandler {
+ extends DataNodeAsyncRequestRPCHandler {
private static final Logger LOGGER =
LoggerFactory.getLogger(CheckSchemaRegionUsingTemplateRPCHandler.class);
public CheckSchemaRegionUsingTemplateRPCHandler(
- DataNodeRequestType requestType,
+ CnToDnRequestType requestType,
int requestId,
TDataNodeLocation targetDataNode,
Map dataNodeLocationMap,
@@ -54,20 +54,15 @@ public void onComplete(TCheckSchemaRegionUsingTemplateResp response) {
TSStatus tsStatus = response.getStatus();
responseMap.put(requestId, response);
if (tsStatus.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- dataNodeLocationMap.remove(requestId);
- LOGGER.info(
- "Successfully check schema region using template on DataNode: {}", targetDataNode);
+ nodeLocationMap.remove(requestId);
+ LOGGER.info("Successfully check schema region using template on DataNode: {}", targetNode);
} else if (tsStatus.getCode() == TSStatusCode.MULTIPLE_ERROR.getStatusCode()) {
- dataNodeLocationMap.remove(requestId);
+ nodeLocationMap.remove(requestId);
LOGGER.error(
- "Failed to check schema region using template on DataNode {}, {}",
- targetDataNode,
- tsStatus);
+ "Failed to check schema region using template on DataNode {}, {}", targetNode, tsStatus);
} else {
LOGGER.error(
- "Failed to check schema region using template on DataNode {}, {}",
- targetDataNode,
- tsStatus);
+ "Failed to check schema region using template on DataNode {}, {}", targetNode, tsStatus);
}
countDownLatch.countDown();
}
@@ -76,9 +71,9 @@ public void onComplete(TCheckSchemaRegionUsingTemplateResp response) {
public void onError(Exception e) {
String errorMsg =
"Count paths using template error on DataNode: {id="
- + targetDataNode.getDataNodeId()
+ + targetNode.getDataNodeId()
+ ", internalEndPoint="
- + targetDataNode.getInternalEndPoint()
+ + targetNode.getInternalEndPoint()
+ "}"
+ e.getMessage();
LOGGER.error(errorMsg);
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/subscription/ConsumerGroupPushMetaRPCHandler.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/subscription/ConsumerGroupPushMetaRPCHandler.java
index 52f5063101f2d..ee3c11eeb427b 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/subscription/ConsumerGroupPushMetaRPCHandler.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/subscription/ConsumerGroupPushMetaRPCHandler.java
@@ -20,8 +20,8 @@
package org.apache.iotdb.confignode.client.async.handlers.rpc.subscription;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
-import org.apache.iotdb.confignode.client.DataNodeRequestType;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.AbstractAsyncRPCHandler;
+import org.apache.iotdb.confignode.client.CnToDnRequestType;
+import org.apache.iotdb.confignode.client.async.handlers.rpc.DataNodeAsyncRequestRPCHandler;
import org.apache.iotdb.mpp.rpc.thrift.TPushConsumerGroupMetaResp;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -33,12 +33,12 @@
import java.util.concurrent.CountDownLatch;
public class ConsumerGroupPushMetaRPCHandler
- extends AbstractAsyncRPCHandler {
+ extends DataNodeAsyncRequestRPCHandler {
private static final Logger LOGGER =
LoggerFactory.getLogger(ConsumerGroupPushMetaRPCHandler.class);
public ConsumerGroupPushMetaRPCHandler(
- DataNodeRequestType requestType,
+ CnToDnRequestType requestType,
int requestId,
TDataNodeLocation targetDataNode,
Map dataNodeLocationMap,
@@ -63,7 +63,7 @@ public void onComplete(TPushConsumerGroupMetaResp response) {
}
// Always remove to avoid retrying
- dataNodeLocationMap.remove(requestId);
+ nodeLocationMap.remove(requestId);
// Always CountDown
countDownLatch.countDown();
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/subscription/TopicPushMetaRPCHandler.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/subscription/TopicPushMetaRPCHandler.java
index 39cb9cd23e975..cf8451feaacad 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/subscription/TopicPushMetaRPCHandler.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/rpc/subscription/TopicPushMetaRPCHandler.java
@@ -20,8 +20,8 @@
package org.apache.iotdb.confignode.client.async.handlers.rpc.subscription;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
-import org.apache.iotdb.confignode.client.DataNodeRequestType;
-import org.apache.iotdb.confignode.client.async.handlers.rpc.AbstractAsyncRPCHandler;
+import org.apache.iotdb.confignode.client.CnToDnRequestType;
+import org.apache.iotdb.confignode.client.async.handlers.rpc.DataNodeAsyncRequestRPCHandler;
import org.apache.iotdb.mpp.rpc.thrift.TPushTopicMetaResp;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -32,12 +32,12 @@
import java.util.Map;
import java.util.concurrent.CountDownLatch;
-public class TopicPushMetaRPCHandler extends AbstractAsyncRPCHandler {
+public class TopicPushMetaRPCHandler extends DataNodeAsyncRequestRPCHandler {
private static final Logger LOGGER = LoggerFactory.getLogger(TopicPushMetaRPCHandler.class);
public TopicPushMetaRPCHandler(
- DataNodeRequestType requestType,
+ CnToDnRequestType requestType,
int requestId,
TDataNodeLocation targetDataNode,
Map dataNodeLocationMap,
@@ -62,7 +62,7 @@ public void onComplete(TPushTopicMetaResp response) {
}
// Always remove to avoid retrying
- dataNodeLocationMap.remove(requestId);
+ nodeLocationMap.remove(requestId);
// Always CountDown
countDownLatch.countDown();
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncConfigNodeClientPool.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncConfigNodeClientPool.java
index ab85a9badcb9e..cc26be000a8eb 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncConfigNodeClientPool.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncConfigNodeClientPool.java
@@ -21,13 +21,14 @@
import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
+import org.apache.iotdb.common.rpc.thrift.TNodeLocations;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.common.rpc.thrift.TSetConfigurationReq;
import org.apache.iotdb.commons.client.ClientPoolFactory;
import org.apache.iotdb.commons.client.IClientManager;
import org.apache.iotdb.commons.client.exception.ClientManagerException;
import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
-import org.apache.iotdb.confignode.client.ConfigNodeRequestType;
+import org.apache.iotdb.confignode.client.CnToCnNodeRequestType;
import org.apache.iotdb.confignode.rpc.thrift.TAddConsensusGroupReq;
import org.apache.iotdb.confignode.rpc.thrift.TConfigNodeRegisterReq;
import org.apache.iotdb.rpc.RpcUtils;
@@ -66,7 +67,7 @@ private void updateConfigNodeLeader(TSStatus status) {
}
public Object sendSyncRequestToConfigNodeWithRetry(
- TEndPoint endPoint, Object req, ConfigNodeRequestType requestType) {
+ TEndPoint endPoint, Object req, CnToCnNodeRequestType requestType) {
Throwable lastException = null;
for (int retry = 0; retry < MAX_RETRY_NUM; retry++) {
@@ -91,6 +92,12 @@ public Object sendSyncRequestToConfigNodeWithRetry(
return client.stopConfigNode((TConfigNodeLocation) req);
case SET_CONFIGURATION:
return client.setConfiguration((TSetConfigurationReq) req);
+ case SHOW_CONFIGURATION:
+ return client.showConfiguration((int) req);
+ case SUBMIT_TEST_CONNECTION_TASK:
+ return client.submitTestConnectionTask((TNodeLocations) req);
+ case TEST_CONNECTION:
+ return client.testConnectionEmptyRPC();
default:
return RpcUtils.getStatus(
TSStatusCode.EXECUTE_STATEMENT_ERROR, "Unknown request type: " + requestType);
@@ -145,7 +152,6 @@ private void doRetryWait(int retryNum) {
}
}
- // TODO: Is the ClientPool must be a singleton?
private static class SyncConfigNodeClientPoolHolder {
private static final SyncConfigNodeClientPool INSTANCE = new SyncConfigNodeClientPool();
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncDataNodeClientPool.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncDataNodeClientPool.java
index 86afa20d6acc2..be366b5772bc4 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncDataNodeClientPool.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncDataNodeClientPool.java
@@ -27,7 +27,7 @@
import org.apache.iotdb.commons.client.IClientManager;
import org.apache.iotdb.commons.client.exception.ClientManagerException;
import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient;
-import org.apache.iotdb.confignode.client.DataNodeRequestType;
+import org.apache.iotdb.confignode.client.CnToDnRequestType;
import org.apache.iotdb.mpp.rpc.thrift.TCreateDataRegionReq;
import org.apache.iotdb.mpp.rpc.thrift.TCreatePeerReq;
import org.apache.iotdb.mpp.rpc.thrift.TCreateSchemaRegionReq;
@@ -66,7 +66,7 @@ private SyncDataNodeClientPool() {
}
public Object sendSyncRequestToDataNodeWithRetry(
- TEndPoint endPoint, Object req, DataNodeRequestType requestType) {
+ TEndPoint endPoint, Object req, CnToDnRequestType requestType) {
Throwable lastException = new TException();
for (int retry = 0; retry < DEFAULT_RETRY_NUM; retry++) {
try (SyncDataNodeInternalServiceClient client = clientManager.borrowClient(endPoint)) {
@@ -85,7 +85,7 @@ public Object sendSyncRequestToDataNodeWithRetry(
}
public Object sendSyncRequestToDataNodeWithGivenRetry(
- TEndPoint endPoint, Object req, DataNodeRequestType requestType, int retryNum) {
+ TEndPoint endPoint, Object req, CnToDnRequestType requestType, int retryNum) {
Throwable lastException = new TException();
for (int retry = 0; retry < retryNum; retry++) {
try (SyncDataNodeInternalServiceClient client = clientManager.borrowClient(endPoint)) {
@@ -104,7 +104,7 @@ public Object sendSyncRequestToDataNodeWithGivenRetry(
}
private Object executeSyncRequest(
- DataNodeRequestType requestType, SyncDataNodeInternalServiceClient client, Object req)
+ CnToDnRequestType requestType, SyncDataNodeInternalServiceClient client, Object req)
throws TException {
switch (requestType) {
case INVALIDATE_PARTITION_CACHE:
@@ -192,7 +192,6 @@ public TRegionLeaderChangeResp changeRegionLeader(
return new TRegionLeaderChangeResp(status, -1L);
}
- // TODO: Is the ClientPool must be a singleton?
private static class ClientPoolHolder {
private static final SyncDataNodeClientPool INSTANCE = new SyncDataNodeClientPool();
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
index 99017b4f10c8d..603892e368114 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.confignode.conf;
+import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.client.property.ClientPoolProperty.DefaultProperty;
import org.apache.iotdb.commons.conf.IoTDBConstant;
@@ -1196,4 +1197,18 @@ public void setDataRegionRatisPeriodicSnapshotInterval(
long dataRegionRatisPeriodicSnapshotInterval) {
this.dataRegionRatisPeriodicSnapshotInterval = dataRegionRatisPeriodicSnapshotInterval;
}
+
+ public TConfigNodeLocation generateLocalConfigNodeLocationWithSpecifiedNodeId(int configNodeId) {
+ return new TConfigNodeLocation(
+ configNodeId,
+ new TEndPoint(getInternalAddress(), getInternalPort()),
+ new TEndPoint(getInternalAddress(), getConsensusPort()));
+ }
+
+ public TConfigNodeLocation generateLocalConfigNodeLocation() {
+ return new TConfigNodeLocation(
+ getConfigNodeId(),
+ new TEndPoint(getInternalAddress(), getInternalPort()),
+ new TEndPoint(getInternalAddress(), getConsensusPort()));
+ }
}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
index bdbbdc43c7a96..9c4c480b02cea 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
@@ -25,7 +25,7 @@
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.exception.BadNodeUrlException;
import org.apache.iotdb.commons.utils.NodeUrlUtils;
-import org.apache.iotdb.confignode.client.ConfigNodeRequestType;
+import org.apache.iotdb.confignode.client.CnToCnNodeRequestType;
import org.apache.iotdb.confignode.client.sync.SyncConfigNodeClientPool;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -112,7 +112,7 @@ public void removeConfigNode(TConfigNodeLocation removedNode)
.sendSyncRequestToConfigNodeWithRetry(
configNodeLocation.getInternalEndPoint(),
removedNode,
- ConfigNodeRequestType.REMOVE_CONFIG_NODE);
+ CnToCnNodeRequestType.REMOVE_CONFIG_NODE);
if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
break;
}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java
index 88be42eb417f0..9a42264ed937e 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java
@@ -146,7 +146,7 @@ private void checkGlobalConfig() throws ConfigurationException {
// When the schemaengine region consensus protocol is set to PipeConsensus,
// we should report an error
if (CONF.getSchemaRegionConsensusProtocolClass().equals(ConsensusFactory.FAST_IOT_CONSENSUS)
- || CONF.getSchemaRegionConsensusProtocolClass().equals(ConsensusFactory.IOTV2_CONSENSUS)) {
+ || CONF.getSchemaRegionConsensusProtocolClass().equals(ConsensusFactory.IOT_CONSENSUS_V2)) {
throw new ConfigurationException(
"schema_region_consensus_protocol_class",
String.valueOf(CONF.getSchemaRegionConsensusProtocolClass()),
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeSystemPropertiesHandler.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeSystemPropertiesHandler.java
new file mode 100644
index 0000000000000..b92e2e57e05d6
--- /dev/null
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeSystemPropertiesHandler.java
@@ -0,0 +1,50 @@
+/*
+ * 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.iotdb.confignode.conf;
+
+import org.apache.iotdb.commons.file.SystemPropertiesHandler;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+
+public class ConfigNodeSystemPropertiesHandler extends SystemPropertiesHandler {
+ private static final Logger LOGGER =
+ LoggerFactory.getLogger(ConfigNodeSystemPropertiesHandler.class);
+
+ private static ConfigNodeSystemPropertiesHandler INSTANCE;
+
+ private ConfigNodeSystemPropertiesHandler(String filePath) {
+ super(filePath);
+ }
+
+ public static synchronized SystemPropertiesHandler getInstance() {
+ if (INSTANCE == null) {
+ INSTANCE =
+ new ConfigNodeSystemPropertiesHandler(
+ ConfigNodeDescriptor.getInstance().getConf().getSystemDir()
+ + File.separator
+ + ConfigNodeConstant.SYSTEM_FILE_NAME);
+ INSTANCE.recover();
+ }
+ return INSTANCE;
+ }
+}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java
index ba9d74a641cd4..a56f4a63f7296 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java
@@ -24,18 +24,14 @@
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.exception.BadNodeUrlException;
+import org.apache.iotdb.commons.file.SystemPropertiesHandler;
import org.apache.iotdb.commons.utils.NodeUrlUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -48,11 +44,8 @@ public class SystemPropertiesUtils {
private static final Logger LOGGER = LoggerFactory.getLogger(SystemPropertiesUtils.class);
- private static File systemPropertiesFile =
- new File(
- ConfigNodeDescriptor.getInstance().getConf().getSystemDir()
- + File.separator
- + ConfigNodeConstant.SYSTEM_FILE_NAME);
+ private static SystemPropertiesHandler systemPropertiesHandler =
+ ConfigNodeSystemPropertiesHandler.getInstance();
private static final ConfigNodeConfig conf = ConfigNodeDescriptor.getInstance().getConf();
private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
@@ -74,11 +67,10 @@ private SystemPropertiesUtils() {
// TODO: This needs removal of statics ...
public static void reinitializeStatics() {
- systemPropertiesFile =
- new File(
- ConfigNodeDescriptor.getInstance().getConf().getSystemDir()
- + File.separator
- + ConfigNodeConstant.SYSTEM_FILE_NAME);
+ systemPropertiesHandler.resetFilePath(
+ ConfigNodeDescriptor.getInstance().getConf().getSystemDir()
+ + File.separator
+ + ConfigNodeConstant.SYSTEM_FILE_NAME);
}
/**
@@ -87,7 +79,7 @@ public static void reinitializeStatics() {
* @return True if confignode-system.properties file exist.
*/
public static boolean isRestarted() {
- return systemPropertiesFile.exists();
+ return !systemPropertiesHandler.isFirstStart();
}
/**
@@ -97,7 +89,7 @@ public static boolean isRestarted() {
* @throws IOException When read the confignode-system.properties file failed
*/
public static void checkSystemProperties() throws IOException {
- Properties systemProperties = getSystemProperties();
+ Properties systemProperties = systemPropertiesHandler.read();
boolean needReWrite = false;
final String format =
"[SystemProperties] The parameter \"{}\" can't be modified after first startup."
@@ -234,11 +226,6 @@ public static void checkSystemProperties() throws IOException {
COMMON_CONFIG.setTimePartitionInterval(timePartitionInterval);
}
}
-
- if (needReWrite) {
- // Re-write special parameters if necessary
- storeSystemParameters();
- }
}
/**
@@ -251,7 +238,7 @@ public static void checkSystemProperties() throws IOException {
*/
public static List loadConfigNodeList()
throws IOException, BadNodeUrlException {
- Properties systemProperties = getSystemProperties();
+ Properties systemProperties = systemPropertiesHandler.read();
String addresses = systemProperties.getProperty("config_node_list", null);
if (addresses != null && !addresses.isEmpty()) {
@@ -265,10 +252,10 @@ public static List loadConfigNodeList()
* The system parameters can't be changed after the ConfigNode first started. Therefore, store
* them in confignode-system.properties during the first startup.
*
- * @throws IOException getSystemProperties()
+ * @throws IOException systemPropertiesHandler.read()
*/
public static void storeSystemParameters() throws IOException {
- Properties systemProperties = getSystemProperties();
+ Properties systemProperties = systemPropertiesHandler.read();
systemProperties.setProperty("iotdb_version", IoTDBConstant.VERSION);
systemProperties.setProperty("commit_id", IoTDBConstant.BUILD_INFO);
@@ -311,7 +298,7 @@ public static void storeSystemParameters() throws IOException {
systemProperties.setProperty(
"tag_attribute_total_size", String.valueOf(COMMON_CONFIG.getTagAttributeTotalSize()));
- storeSystemProperties(systemProperties);
+ systemPropertiesHandler.overwrite(systemProperties);
}
/**
@@ -321,7 +308,7 @@ public static void storeSystemParameters() throws IOException {
* @throws IOException When store confignode-system.properties file failed
*/
public static void storeConfigNodeList(List configNodes) throws IOException {
- if (!systemPropertiesFile.exists()) {
+ if (!systemPropertiesHandler.fileExist()) {
// Avoid creating confignode-system.properties files during
// synchronizing the ApplyConfigNode logs from the ConsensusLayer.
// 1. For the Non-Seed-ConfigNode, We don't need to create confignode-system.properties file
@@ -330,12 +317,8 @@ public static void storeConfigNodeList(List configNodes) th
// in which case the latest config_node_list will be updated.
return;
}
-
- Properties systemProperties = getSystemProperties();
- systemProperties.setProperty(
+ systemPropertiesHandler.put(
"config_node_list", NodeUrlUtils.convertTConfigNodeUrls(configNodes));
-
- storeSystemProperties(systemProperties);
}
/**
@@ -346,7 +329,7 @@ public static void storeConfigNodeList(List configNodes) th
* @throws IOException When load confignode-system.properties file failed
*/
public static String loadClusterNameWhenRestarted() throws IOException {
- Properties systemProperties = getSystemProperties();
+ Properties systemProperties = systemPropertiesHandler.read();
String clusterName = systemProperties.getProperty(CLUSTER_NAME, null);
if (clusterName == null) {
LOGGER.warn(
@@ -366,7 +349,7 @@ public static String loadClusterNameWhenRestarted() throws IOException {
* @throws IOException When load confignode-system.properties file failed
*/
public static int loadConfigNodeIdWhenRestarted() throws IOException {
- Properties systemProperties = getSystemProperties();
+ Properties systemProperties = systemPropertiesHandler.read();
try {
return Integer.parseInt(systemProperties.getProperty("config_node_id", null));
} catch (NumberFormatException e) {
@@ -387,7 +370,7 @@ public static int loadConfigNodeIdWhenRestarted() throws IOException {
*/
public static boolean isSeedConfigNode() {
try {
- Properties systemProperties = getSystemProperties();
+ Properties systemProperties = systemPropertiesHandler.read();
boolean isSeedConfigNode =
Boolean.parseBoolean(systemProperties.getProperty("is_seed_config_node", null));
if (isSeedConfigNode) {
@@ -399,37 +382,4 @@ public static boolean isSeedConfigNode() {
return false;
}
}
-
- private static synchronized Properties getSystemProperties() throws IOException {
- // Create confignode-system.properties file if necessary
- if (!systemPropertiesFile.exists()) {
- if (systemPropertiesFile.createNewFile()) {
- LOGGER.info(
- "System properties file {} for ConfigNode is created.",
- systemPropertiesFile.getAbsolutePath());
- } else {
- LOGGER.error(
- "Can't create the system properties file {} for ConfigNode. "
- + "IoTDB-ConfigNode is shutdown.",
- systemPropertiesFile.getAbsolutePath());
- throw new IOException("Can't create system properties file");
- }
- }
-
- Properties systemProperties = new Properties();
- try (FileInputStream inputStream = new FileInputStream(systemPropertiesFile)) {
- systemProperties.load(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
- }
- return systemProperties;
- }
-
- private static synchronized void storeSystemProperties(Properties systemProperties)
- throws IOException {
- try (FileOutputStream fileOutputStream = new FileOutputStream(systemPropertiesFile)) {
- systemProperties.store(
- new OutputStreamWriter(fileOutputStream, StandardCharsets.UTF_8),
- " THIS FILE IS AUTOMATICALLY GENERATED. PLEASE DO NOT MODIFY THIS FILE !!!");
- fileOutputStream.getFD().sync();
- }
- }
}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/ttl/ShowTTLPlan.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/ttl/ShowTTLPlan.java
index c37c93a907659..9dd9eded31eb8 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/ttl/ShowTTLPlan.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/ttl/ShowTTLPlan.java
@@ -20,14 +20,27 @@
import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan;
import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType;
+import org.apache.iotdb.db.utils.constant.SqlConstant;
import java.io.DataOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
public class ShowTTLPlan extends ConfigPhysicalPlan {
+ private String[] pathPattern;
+
+ public String[] getPathPattern() {
+ return pathPattern;
+ }
+
public ShowTTLPlan() {
super(ConfigPhysicalPlanType.ShowTTL);
+ this.pathPattern = SqlConstant.getSingleRootArray();
+ }
+
+ public ShowTTLPlan(String[] pathPattern) {
+ super(ConfigPhysicalPlanType.ShowTTL);
+ this.pathPattern = pathPattern;
}
@Override
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/datanode/DataNodeRegisterResp.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/datanode/DataNodeRegisterResp.java
index ef7d4f212b261..2cbcb15a90129 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/datanode/DataNodeRegisterResp.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/datanode/DataNodeRegisterResp.java
@@ -32,13 +32,13 @@
import java.io.IOException;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
public class DataNodeRegisterResp implements DataSet {
private TSStatus status;
private List configNodeList;
private Integer dataNodeId;
-
private TRuntimeConfiguration runtimeConfiguration;
public DataNodeRegisterResp() {
@@ -85,8 +85,8 @@ public TDataNodeRegisterResp convertToRpcDataNodeRegisterResp() {
resp.setConfigNodeList(configNodeList);
if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- resp.setDataNodeId(dataNodeId);
- resp.setRuntimeConfiguration(runtimeConfiguration);
+ Optional.ofNullable(dataNodeId).ifPresent(resp::setDataNodeId);
+ Optional.ofNullable(runtimeConfiguration).ifPresent(resp::setRuntimeConfiguration);
}
return resp;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterManager.java
index 9781f77c02448..808112cff4cd4 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterManager.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterManager.java
@@ -19,14 +19,41 @@
package org.apache.iotdb.confignode.manager;
+import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation;
+import org.apache.iotdb.common.rpc.thrift.TDataNodeConfiguration;
+import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
+import org.apache.iotdb.common.rpc.thrift.TEndPoint;
+import org.apache.iotdb.common.rpc.thrift.TNodeLocations;
+import org.apache.iotdb.common.rpc.thrift.TSStatus;
+import org.apache.iotdb.common.rpc.thrift.TSender;
+import org.apache.iotdb.common.rpc.thrift.TServiceProvider;
+import org.apache.iotdb.common.rpc.thrift.TServiceType;
+import org.apache.iotdb.common.rpc.thrift.TTestConnectionResp;
+import org.apache.iotdb.common.rpc.thrift.TTestConnectionResult;
+import org.apache.iotdb.commons.client.request.AsyncRequestContext;
+import org.apache.iotdb.commons.client.request.Utils;
+import org.apache.iotdb.confignode.client.CnToCnNodeRequestType;
+import org.apache.iotdb.confignode.client.CnToDnRequestType;
+import org.apache.iotdb.confignode.client.async.CnToCnInternalServiceAsyncRequestManager;
+import org.apache.iotdb.confignode.client.async.CnToDnInternalServiceAsyncRequestManager;
+import org.apache.iotdb.confignode.client.async.handlers.ConfigNodeAsyncRequestContext;
+import org.apache.iotdb.confignode.client.async.handlers.DataNodeAsyncRequestContext;
+import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
import org.apache.iotdb.confignode.consensus.request.write.confignode.UpdateClusterIdPlan;
import org.apache.iotdb.confignode.persistence.ClusterInfo;
import org.apache.iotdb.consensus.exception.ConsensusException;
+import org.apache.iotdb.rpc.TSStatusCode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
public class ClusterManager {
@@ -79,4 +106,198 @@ private void generateClusterId() {
LOGGER.warn(CONSENSUS_WRITE_ERROR, e);
}
}
+
+ // TODO: Parallel test ConfigNode and DataNode
+ public TTestConnectionResp submitTestConnectionTaskToEveryNode() {
+ TTestConnectionResp resp = new TTestConnectionResp();
+ resp.resultList = new ArrayList<>();
+ resp.setStatus(new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode()));
+ TNodeLocations nodeLocations = new TNodeLocations();
+ nodeLocations.setConfigNodeLocations(configManager.getNodeManager().getRegisteredConfigNodes());
+ nodeLocations.setDataNodeLocations(
+ configManager.getNodeManager().getRegisteredDataNodes().stream()
+ .map(TDataNodeConfiguration::getLocation)
+ .collect(Collectors.toList()));
+ // For ConfigNode
+ Map configNodeLocationMap =
+ configManager.getNodeManager().getRegisteredConfigNodes().stream()
+ .collect(Collectors.toMap(TConfigNodeLocation::getConfigNodeId, location -> location));
+ ConfigNodeAsyncRequestContext
+ configNodeAsyncRequestContext =
+ new ConfigNodeAsyncRequestContext<>(
+ CnToCnNodeRequestType.SUBMIT_TEST_CONNECTION_TASK,
+ nodeLocations,
+ configNodeLocationMap);
+ CnToCnInternalServiceAsyncRequestManager.getInstance()
+ .sendAsyncRequest(configNodeAsyncRequestContext);
+ Map anotherConfigNodeLocationMap =
+ configManager.getNodeManager().getRegisteredConfigNodes().stream()
+ .collect(Collectors.toMap(TConfigNodeLocation::getConfigNodeId, location -> location));
+ configNodeAsyncRequestContext
+ .getResponseMap()
+ .forEach(
+ (nodeId, configNodeResp) -> {
+ if (configNodeResp.isSetResultList()) {
+ resp.getResultList().addAll(configNodeResp.getResultList());
+ } else {
+ resp.getResultList()
+ .addAll(
+ badConfigNodeConnectionResult(
+ configNodeResp.getStatus(),
+ anotherConfigNodeLocationMap.get(nodeId),
+ nodeLocations));
+ }
+ });
+ // For DataNode
+ Map dataNodeLocationMap =
+ configManager.getNodeManager().getRegisteredDataNodes().stream()
+ .map(TDataNodeConfiguration::getLocation)
+ .collect(Collectors.toMap(TDataNodeLocation::getDataNodeId, location -> location));
+ DataNodeAsyncRequestContext dataNodeAsyncRequestContext =
+ new DataNodeAsyncRequestContext<>(
+ CnToDnRequestType.SUBMIT_TEST_CONNECTION_TASK, nodeLocations, dataNodeLocationMap);
+ CnToDnInternalServiceAsyncRequestManager.getInstance()
+ .sendAsyncRequest(dataNodeAsyncRequestContext);
+ Map anotherDataNodeLocationMap =
+ configManager.getNodeManager().getRegisteredDataNodes().stream()
+ .map(TDataNodeConfiguration::getLocation)
+ .collect(Collectors.toMap(TDataNodeLocation::getDataNodeId, location -> location));
+ dataNodeAsyncRequestContext
+ .getResponseMap()
+ .forEach(
+ (nodeId, dataNodeResp) -> {
+ if (dataNodeResp.isSetResultList()) {
+ resp.getResultList().addAll(dataNodeResp.getResultList());
+ } else {
+ resp.getResultList()
+ .addAll(
+ badDataNodeConnectionResult(
+ dataNodeResp.getStatus(),
+ anotherDataNodeLocationMap.get(nodeId),
+ nodeLocations));
+ }
+ });
+ return resp;
+ }
+
+ public TTestConnectionResp doConnectionTest(TNodeLocations nodeLocations) {
+ return new TTestConnectionResp(
+ new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode()),
+ Stream.of(
+ testAllConfigNodeConnection(nodeLocations.getConfigNodeLocations()),
+ testAllDataNodeConnection(nodeLocations.getDataNodeLocations()))
+ .flatMap(Collection::stream)
+ .collect(Collectors.toList()));
+ }
+
+ private List testAllConfigNodeConnection(
+ List configNodeLocations) {
+ final TSender sender =
+ new TSender()
+ .setConfigNodeLocation(
+ ConfigNodeDescriptor.getInstance().getConf().generateLocalConfigNodeLocation());
+ return Utils.testConnectionsImpl(
+ configNodeLocations,
+ sender,
+ TConfigNodeLocation::getConfigNodeId,
+ TConfigNodeLocation::getInternalEndPoint,
+ TServiceType.ConfigNodeInternalService,
+ CnToCnNodeRequestType.TEST_CONNECTION,
+ (AsyncRequestContext
+ handler) ->
+ CnToCnInternalServiceAsyncRequestManager.getInstance()
+ .sendAsyncRequestWithRetry(handler));
+ }
+
+ private List badConfigNodeConnectionResult(
+ TSStatus badStatus, TConfigNodeLocation sourceConfigNode, TNodeLocations nodeLocations) {
+ final TSender sender = new TSender().setConfigNodeLocation(sourceConfigNode);
+ return badNodeConnectionResult(badStatus, nodeLocations, sender);
+ }
+
+ private List testAllDataNodeConnection(
+ List dataNodeLocations) {
+ final TSender sender =
+ new TSender()
+ .setConfigNodeLocation(
+ ConfigNodeDescriptor.getInstance().getConf().generateLocalConfigNodeLocation());
+ return Utils.testConnectionsImpl(
+ dataNodeLocations,
+ sender,
+ TDataNodeLocation::getDataNodeId,
+ TDataNodeLocation::getInternalEndPoint,
+ TServiceType.DataNodeInternalService,
+ CnToDnRequestType.TEST_CONNECTION,
+ (AsyncRequestContext handler) ->
+ CnToDnInternalServiceAsyncRequestManager.getInstance()
+ .sendAsyncRequestWithRetry(handler));
+ }
+
+ private List badDataNodeConnectionResult(
+ TSStatus badStatus, TDataNodeLocation sourceDataNode, TNodeLocations nodeLocations) {
+ final TSender sender = new TSender().setDataNodeLocation(sourceDataNode);
+ return badNodeConnectionResult(badStatus, nodeLocations, sender);
+ }
+
+ private List badNodeConnectionResult(
+ TSStatus badStatus, TNodeLocations nodeLocations, TSender sender) {
+ final String errorMessage =
+ "ConfigNode leader cannot connect to the sender: " + badStatus.getMessage();
+ List results = new ArrayList<>();
+ nodeLocations
+ .getConfigNodeLocations()
+ .forEach(
+ location -> {
+ TEndPoint endPoint = location.getInternalEndPoint();
+ TServiceProvider serviceProvider =
+ new TServiceProvider(endPoint, TServiceType.ConfigNodeInternalService);
+ TTestConnectionResult result =
+ new TTestConnectionResult().setServiceProvider(serviceProvider).setSender(sender);
+ result.setSuccess(false).setReason(errorMessage);
+ results.add(result);
+ });
+ nodeLocations
+ .getDataNodeLocations()
+ .forEach(
+ location -> {
+ TEndPoint endPoint = location.getInternalEndPoint();
+ TServiceProvider serviceProvider =
+ new TServiceProvider(endPoint, TServiceType.DataNodeInternalService);
+ TTestConnectionResult result =
+ new TTestConnectionResult().setServiceProvider(serviceProvider).setSender(sender);
+ result.setSuccess(false).setReason(errorMessage);
+ results.add(result);
+ });
+ if (sender.isSetDataNodeLocation()) {
+ nodeLocations
+ .getDataNodeLocations()
+ .forEach(
+ location -> {
+ TEndPoint endPoint = location.getMPPDataExchangeEndPoint();
+ TServiceProvider serviceProvider =
+ new TServiceProvider(endPoint, TServiceType.DataNodeMPPService);
+ TTestConnectionResult result =
+ new TTestConnectionResult()
+ .setServiceProvider(serviceProvider)
+ .setSender(sender);
+ result.setSuccess(false).setReason(errorMessage);
+ results.add(result);
+ });
+ nodeLocations
+ .getDataNodeLocations()
+ .forEach(
+ location -> {
+ TEndPoint endPoint = location.getClientRpcEndPoint();
+ TServiceProvider serviceProvider =
+ new TServiceProvider(endPoint, TServiceType.DataNodeExternalService);
+ TTestConnectionResult result =
+ new TTestConnectionResult()
+ .setServiceProvider(serviceProvider)
+ .setSender(sender);
+ result.setSuccess(false).setReason(errorMessage);
+ results.add(result);
+ });
+ }
+ return results;
+ }
}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterQuotaManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterQuotaManager.java
index 0c00005fc1b34..b0150b349d80e 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterQuotaManager.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterQuotaManager.java
@@ -26,9 +26,9 @@
import org.apache.iotdb.common.rpc.thrift.TSpaceQuota;
import org.apache.iotdb.common.rpc.thrift.TThrottleQuota;
import org.apache.iotdb.commons.conf.IoTDBConstant;
-import org.apache.iotdb.confignode.client.DataNodeRequestType;
-import org.apache.iotdb.confignode.client.async.AsyncDataNodeClientPool;
-import org.apache.iotdb.confignode.client.async.handlers.AsyncClientHandler;
+import org.apache.iotdb.confignode.client.CnToDnRequestType;
+import org.apache.iotdb.confignode.client.async.CnToDnInternalServiceAsyncRequestManager;
+import org.apache.iotdb.confignode.client.async.handlers.DataNodeAsyncRequestContext;
import org.apache.iotdb.confignode.consensus.request.write.quota.SetSpaceQuotaPlan;
import org.apache.iotdb.confignode.consensus.request.write.quota.SetThrottleQuotaPlan;
import org.apache.iotdb.confignode.manager.partition.PartitionManager;
@@ -87,9 +87,11 @@ public TSStatus setSpaceQuota(TSetSpaceQuotaReq req) {
if (response.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
Map dataNodeLocationMap =
configManager.getNodeManager().getRegisteredDataNodeLocations();
- AsyncClientHandler clientHandler =
- new AsyncClientHandler<>(DataNodeRequestType.SET_SPACE_QUOTA, req, dataNodeLocationMap);
- AsyncDataNodeClientPool.getInstance().sendAsyncRequestToDataNodeWithRetry(clientHandler);
+ DataNodeAsyncRequestContext clientHandler =
+ new DataNodeAsyncRequestContext<>(
+ CnToDnRequestType.SET_SPACE_QUOTA, req, dataNodeLocationMap);
+ CnToDnInternalServiceAsyncRequestManager.getInstance()
+ .sendAsyncRequestWithRetry(clientHandler);
return RpcUtils.squashResponseStatusList(clientHandler.getResponseList());
}
return response;
@@ -192,10 +194,11 @@ public TSStatus setThrottleQuota(TSetThrottleQuotaReq req) {
if (response.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
Map dataNodeLocationMap =
configManager.getNodeManager().getRegisteredDataNodeLocations();
- AsyncClientHandler clientHandler =
- new AsyncClientHandler<>(
- DataNodeRequestType.SET_THROTTLE_QUOTA, req, dataNodeLocationMap);
- AsyncDataNodeClientPool.getInstance().sendAsyncRequestToDataNodeWithRetry(clientHandler);
+ DataNodeAsyncRequestContext clientHandler =
+ new DataNodeAsyncRequestContext<>(
+ CnToDnRequestType.SET_THROTTLE_QUOTA, req, dataNodeLocationMap);
+ CnToDnInternalServiceAsyncRequestManager.getInstance()
+ .sendAsyncRequestWithRetry(clientHandler);
return RpcUtils.squashResponseStatusList(clientHandler.getResponseList());
}
return response;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
index f87fa380e2593..fddc92e40e935 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
@@ -406,13 +406,8 @@ public DataSet getSystemConfiguration() {
public DataSet registerDataNode(TDataNodeRegisterReq req) {
TSStatus status = confirmLeader();
if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- status =
- ClusterNodeStartUtils.confirmNodeRegistration(
- NodeType.DataNode,
- req.getClusterName(),
- req.getDataNodeConfiguration().getLocation(),
- this);
- if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
+ status = ClusterNodeStartUtils.confirmDataNodeRegistration(req, this);
+ if (!req.isPreCheck() && status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
return nodeManager.registerDataNode(req);
}
}
@@ -631,10 +626,10 @@ public DataSet getMatchedDatabaseSchemas(GetDatabasePlan getDatabaseReq) {
}
@Override
- public DataSet showAllTTL(ShowTTLPlan showTTLPlan) {
+ public DataSet showTTL(ShowTTLPlan showTTLPlan) {
TSStatus status = confirmLeader();
if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- return ttlManager.showAllTTL(showTTLPlan);
+ return ttlManager.showTTL(showTTLPlan);
} else {
ShowTTLResp resp = new ShowTTLResp();
resp.setStatus(status);
@@ -1216,12 +1211,7 @@ public TConfigNodeRegisterResp registerConfigNode(TConfigNodeRegisterReq req) {
// Make sure the global configurations are consist
status = checkConfigNodeGlobalConfig(req);
if (status == null) {
- status =
- ClusterNodeStartUtils.confirmNodeRegistration(
- NodeType.ConfigNode,
- req.getClusterParameters().getClusterName(),
- req.getConfigNodeLocation(),
- this);
+ status = ClusterNodeStartUtils.confirmConfigNodeRegistration(req, this);
if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
return nodeManager.registerConfigNode(req);
}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java
index 919e876bac213..98695d1eb7ba7 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java
@@ -304,7 +304,7 @@ public interface IManager {
TSStatus setTTL(SetTTLPlan configRequest);
- DataSet showAllTTL(ShowTTLPlan showTTLPlan);
+ DataSet showTTL(ShowTTLPlan showTTLPlan);
TSStatus setSchemaReplicationFactor(SetSchemaReplicationFactorPlan configPhysicalPlan);
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/TTLManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/TTLManager.java
index af4fb49a0cb09..6bebe7c686474 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/TTLManager.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/TTLManager.java
@@ -119,7 +119,7 @@ public TSStatus unsetTTL(SetTTLPlan setTTLPlan, final boolean isGeneratedByPipe)
return configManager.getProcedureManager().setTTL(setTTLPlan, isGeneratedByPipe);
}
- public DataSet showAllTTL(ShowTTLPlan showTTLPlan) {
+ public DataSet showTTL(ShowTTLPlan showTTLPlan) {
try {
return configManager.getConsensusManager().read(showTTLPlan);
} catch (ConsensusException e) {
@@ -133,7 +133,7 @@ public DataSet showAllTTL(ShowTTLPlan showTTLPlan) {
}
public Map getAllTTL() {
- return ((ShowTTLResp) showAllTTL(new ShowTTLPlan())).getPathTTLMap();
+ return ((ShowTTLResp) showTTL(new ShowTTLPlan())).getPathTTLMap();
}
public int getTTLCount() {
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/TriggerManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/TriggerManager.java
index 0b4bb73102f9b..b1a96d029af2a 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/TriggerManager.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/TriggerManager.java
@@ -24,9 +24,9 @@
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathDeserializeUtil;
import org.apache.iotdb.commons.trigger.TriggerInformation;
-import org.apache.iotdb.confignode.client.DataNodeRequestType;
-import org.apache.iotdb.confignode.client.async.AsyncDataNodeClientPool;
-import org.apache.iotdb.confignode.client.async.handlers.AsyncClientHandler;
+import org.apache.iotdb.confignode.client.CnToDnRequestType;
+import org.apache.iotdb.confignode.client.async.CnToDnInternalServiceAsyncRequestManager;
+import org.apache.iotdb.confignode.client.async.handlers.DataNodeAsyncRequestContext;
import org.apache.iotdb.confignode.consensus.request.read.trigger.GetTransferringTriggersPlan;
import org.apache.iotdb.confignode.consensus.request.read.trigger.GetTriggerJarPlan;
import org.apache.iotdb.confignode.consensus.request.read.trigger.GetTriggerLocationPlan;
@@ -248,10 +248,10 @@ public List updateTriggerLocation(
final TUpdateTriggerLocationReq request =
new TUpdateTriggerLocationReq(triggerName, dataNodeLocation);
- AsyncClientHandler clientHandler =
- new AsyncClientHandler<>(
- DataNodeRequestType.UPDATE_TRIGGER_LOCATION, request, dataNodeLocationMap);
- AsyncDataNodeClientPool.getInstance().sendAsyncRequestToDataNodeWithRetry(clientHandler);
+ DataNodeAsyncRequestContext