This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch rel/1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.2 by this push:
new 4c42eea9446 [To rel/1.2] Pipe: Improved the pipe performance (#11005)
4c42eea9446 is described below
commit 4c42eea9446844370b75cf22fbb1ab44ca6f4a78
Author: Caideyipi <[email protected]>
AuthorDate: Thu Aug 31 13:04:16 2023 +0800
[To rel/1.2] Pipe: Improved the pipe performance (#11005)
* Feature improvement
* Improvement 2
---
.../config/constant/PipeExtractorConstant.java | 4 ----
.../realtime/PipeRealtimeDataRegionExtractor.java | 6 +----
.../connector/PipeConnectorSubtaskManager.java | 4 ----
.../resources/conf/iotdb-common.properties | 7 ------
.../pipe/plugin/builtin/BuiltinPipePlugin.java | 2 --
.../builtin/connector/IoTDBAirGapConnector.java | 28 ----------------------
6 files changed, 1 insertion(+), 50 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/config/constant/PipeExtractorConstant.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/config/constant/PipeExtractorConstant.java
index 6a7c095c148..b92b502ae19 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/config/constant/PipeExtractorConstant.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/config/constant/PipeExtractorConstant.java
@@ -26,10 +26,6 @@ public class PipeExtractorConstant {
public static final String EXTRACTOR_PATTERN_KEY = "extractor.pattern";
public static final String EXTRACTOR_PATTERN_DEFAULT_VALUE = "root";
- public static final String EXTRACTOR_FORWARDING_PIPE_REQUESTS_KEY =
- "extractor.forwarding-pipe-requests";
- public static final boolean EXTRACTOR_FORWARDING_PIPE_REQUESTS_DEFAULT_VALUE
= true;
-
public static final String EXTRACTOR_HISTORY_ENABLE_KEY =
"extractor.history.enable";
public static final String EXTRACTOR_HISTORY_START_TIME =
"extractor.history.start-time";
public static final String EXTRACTOR_HISTORY_END_TIME =
"extractor.history.end-time";
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/realtime/PipeRealtimeDataRegionExtractor.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/realtime/PipeRealtimeDataRegionExtractor.java
index a393662ed7f..d81315ed776 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/realtime/PipeRealtimeDataRegionExtractor.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/realtime/PipeRealtimeDataRegionExtractor.java
@@ -32,7 +32,7 @@ import
org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters;
public abstract class PipeRealtimeDataRegionExtractor implements PipeExtractor
{
protected String pattern;
- protected boolean isForwardingPipeRequests;
+ protected boolean isForwardingPipeRequests = true;
protected String pipeName;
protected String dataRegionId;
@@ -54,10 +54,6 @@ public abstract class PipeRealtimeDataRegionExtractor
implements PipeExtractor {
parameters.getStringOrDefault(
PipeExtractorConstant.EXTRACTOR_PATTERN_KEY,
PipeExtractorConstant.EXTRACTOR_PATTERN_DEFAULT_VALUE);
- isForwardingPipeRequests =
- parameters.getBooleanOrDefault(
- PipeExtractorConstant.EXTRACTOR_FORWARDING_PIPE_REQUESTS_KEY,
-
PipeExtractorConstant.EXTRACTOR_FORWARDING_PIPE_REQUESTS_DEFAULT_VALUE);
final PipeTaskExtractorRuntimeEnvironment environment =
(PipeTaskExtractorRuntimeEnvironment)
configuration.getRuntimeEnvironment();
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/connector/PipeConnectorSubtaskManager.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/connector/PipeConnectorSubtaskManager.java
index bc956afe58c..2be1966e514 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/connector/PipeConnectorSubtaskManager.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/connector/PipeConnectorSubtaskManager.java
@@ -24,7 +24,6 @@ import
org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin;
import org.apache.iotdb.db.pipe.agent.PipeAgent;
import org.apache.iotdb.db.pipe.config.constant.PipeConnectorConstant;
import
org.apache.iotdb.db.pipe.config.plugin.configuraion.PipeTaskRuntimeConfiguration;
-import org.apache.iotdb.db.pipe.connector.protocol.airgap.IoTDBAirGapConnector;
import
org.apache.iotdb.db.pipe.connector.protocol.legacy.IoTDBLegacyPipeConnector;
import
org.apache.iotdb.db.pipe.connector.protocol.thrift.async.IoTDBThriftAsyncConnector;
import
org.apache.iotdb.db.pipe.connector.protocol.thrift.sync.IoTDBThriftSyncConnector;
@@ -76,9 +75,6 @@ public class PipeConnectorSubtaskManager {
} else if (connectorKey.equals(
BuiltinPipePlugin.IOTDB_LEGACY_PIPE_CONNECTOR.getPipePluginName())) {
pipeConnector = new IoTDBLegacyPipeConnector();
- } else if (connectorKey.equals(
- BuiltinPipePlugin.IOTDB_AIR_GAP_CONNECTOR.getPipePluginName())) {
- pipeConnector = new IoTDBAirGapConnector();
} else if
(connectorKey.equals(BuiltinPipePlugin.WEBSOCKET_CONNECTOR.getPipePluginName()))
{
pipeConnector = new WebsocketConnector();
} else {
diff --git
a/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-common.properties
b/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-common.properties
index fb9fe905b14..b1df0dbe678 100644
---
a/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-common.properties
+++
b/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-common.properties
@@ -948,13 +948,6 @@ cluster_name=defaultCluster
# The maximum number of clients that can be used in the async connector.
# pipe_async_connector_max_client_number=16
-# Whether to enable receiving pipe data through air gap.
-# The receiver can only return 0 or 1 in tcp mode to indicate whether the data
is received successfully.
-# pipe_air_gap_receiver_enabled=false
-
-# The port for the server to receive pipe data through air gap.
-# pipe_air_gap_receiver_port=9780
-
####################
### RatisConsensus Configuration
####################
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/BuiltinPipePlugin.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/BuiltinPipePlugin.java
index f625e41cf72..f7e33633071 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/BuiltinPipePlugin.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/BuiltinPipePlugin.java
@@ -20,7 +20,6 @@
package org.apache.iotdb.commons.pipe.plugin.builtin;
import
org.apache.iotdb.commons.pipe.plugin.builtin.connector.DoNothingConnector;
-import
org.apache.iotdb.commons.pipe.plugin.builtin.connector.IoTDBAirGapConnector;
import
org.apache.iotdb.commons.pipe.plugin.builtin.connector.IoTDBLegacyPipeConnector;
import
org.apache.iotdb.commons.pipe.plugin.builtin.connector.IoTDBThriftAsyncConnector;
import
org.apache.iotdb.commons.pipe.plugin.builtin.connector.IoTDBThriftConnector;
@@ -43,7 +42,6 @@ public enum BuiltinPipePlugin {
IOTDB_THRIFT_SYNC_CONNECTOR("iotdb-thrift-sync-connector",
IoTDBThriftSyncConnector.class),
IOTDB_THRIFT_ASYNC_CONNECTOR("iotdb-thrift-async-connector",
IoTDBThriftAsyncConnector.class),
IOTDB_LEGACY_PIPE_CONNECTOR("iotdb-legacy-pipe-connector",
IoTDBLegacyPipeConnector.class),
- IOTDB_AIR_GAP_CONNECTOR("iotdb-air-gap-connector",
IoTDBAirGapConnector.class),
WEBSOCKET_CONNECTOR("websocket-connector", WebSocketConnector.class),
;
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBAirGapConnector.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBAirGapConnector.java
deleted file mode 100644
index 81fa0b03a3d..00000000000
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBAirGapConnector.java
+++ /dev/null
@@ -1,28 +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.commons.pipe.plugin.builtin.connector;
-
-/**
- * This class is a placeholder and should not be initialized. It represents
the IoTDB Air Gap
- * connector. There is a real implementation in the server module but cannot
be imported here. The
- * pipe agent in the server module will replace this class with the real
implementation when
- * initializing the IoTDB Air Gap connector.
- */
-public class IoTDBAirGapConnector extends PlaceholderConnector {}
