Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
992 changes: 0 additions & 992 deletions .github/workflows/daily-it.yml

Large diffs are not rendered by default.

978 changes: 0 additions & 978 deletions .github/workflows/pipe-it.yml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -351,11 +351,6 @@ public void testAsyncConnectorUseNodeUrls() throws Exception {
doTestUseNodeUrls(BuiltinPipePlugin.IOTDB_THRIFT_ASYNC_CONNECTOR.getPipePluginName());
}

@Test
public void testAirGapConnectorUseNodeUrls() throws Exception {
doTestUseNodeUrls(BuiltinPipePlugin.IOTDB_AIR_GAP_CONNECTOR.getPipePluginName());
}

private void doTestUseNodeUrls(String connectorName) throws Exception {
senderEnv
.getConfig()
Expand Down Expand Up @@ -398,16 +393,7 @@ private void doTestUseNodeUrls(String connectorName) throws Exception {
};

for (final DataNodeWrapper wrapper : receiverEnv.getDataNodeWrapperList()) {
if (connectorName.equals(BuiltinPipePlugin.IOTDB_AIR_GAP_CONNECTOR.getPipePluginName())) {
// Use default port for convenience
nodeUrlsBuilder
.append(wrapper.getIp())
.append(":")
.append(wrapper.getPipeAirGapReceiverPort())
.append(",");
} else {
nodeUrlsBuilder.append(wrapper.getIpAndPortString()).append(",");
}
nodeUrlsBuilder.append(wrapper.getIpAndPortString()).append(",");
}

try (final SyncConfigNodeIServiceClient client =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -345,11 +345,6 @@ public void testAsyncConnectorUseNodeUrls() throws Exception {
doTestUseNodeUrls(BuiltinPipePlugin.IOTDB_THRIFT_ASYNC_CONNECTOR.getPipePluginName());
}

@Test
public void testAirGapConnectorUseNodeUrls() throws Exception {
doTestUseNodeUrls(BuiltinPipePlugin.IOTDB_AIR_GAP_CONNECTOR.getPipePluginName());
}

private void doTestUseNodeUrls(String sinkName) throws Exception {
senderEnv
.getConfig()
Expand Down Expand Up @@ -384,16 +379,7 @@ private void doTestUseNodeUrls(String sinkName) throws Exception {

final StringBuilder nodeUrlsBuilder = new StringBuilder();
for (final DataNodeWrapper wrapper : receiverEnv.getDataNodeWrapperList()) {
if (sinkName.equals(BuiltinPipePlugin.IOTDB_AIR_GAP_CONNECTOR.getPipePluginName())) {
// Use default port for convenience
nodeUrlsBuilder
.append(wrapper.getIp())
.append(":")
.append(wrapper.getPipeAirGapReceiverPort())
.append(",");
} else {
nodeUrlsBuilder.append(wrapper.getIpAndPortString()).append(",");
}
nodeUrlsBuilder.append(wrapper.getIpAndPortString()).append(",");
}

try (final SyncConfigNodeIServiceClient client =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin;
import org.apache.iotdb.commons.pipe.agent.plugin.builtin.sink.donothing.DoNothingSink;
import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeSinkConstructor;
import org.apache.iotdb.confignode.manager.pipe.sink.protocol.IoTDBConfigRegionAirGapSink;
import org.apache.iotdb.confignode.manager.pipe.sink.protocol.IoTDBConfigRegionSink;
import org.apache.iotdb.pipe.api.PipeConnector;

Expand All @@ -41,9 +40,6 @@ protected void initConstructors() {
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_THRIFT_ASYNC_CONNECTOR.getPipePluginName(),
IoTDBConfigRegionSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_AIR_GAP_CONNECTOR.getPipePluginName(),
IoTDBConfigRegionAirGapSink::new);
pluginConstructors.put(
BuiltinPipePlugin.DO_NOTHING_CONNECTOR.getPipePluginName(), DoNothingSink::new);

Expand All @@ -55,8 +51,6 @@ protected void initConstructors() {
BuiltinPipePlugin.IOTDB_THRIFT_SYNC_SINK.getPipePluginName(), IoTDBConfigRegionSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_THRIFT_ASYNC_SINK.getPipePluginName(), IoTDBConfigRegionSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_AIR_GAP_SINK.getPipePluginName(), IoTDBConfigRegionAirGapSink::new);
pluginConstructors.put(
BuiltinPipePlugin.DO_NOTHING_SINK.getPipePluginName(), DoNothingSink::new);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,10 @@

import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin;
import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.donothing.DoNothingProcessor;
import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.throwing.ThrowingExceptionProcessor;
import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeProcessorConstructor;
import org.apache.iotdb.commons.pipe.agent.plugin.meta.DataNodePipePluginMetaKeeper;
import org.apache.iotdb.db.pipe.processor.aggregate.AggregateProcessor;
import org.apache.iotdb.db.pipe.processor.aggregate.operator.processor.StandardStatisticsOperatorProcessor;
import org.apache.iotdb.db.pipe.processor.aggregate.window.processor.TumblingWindowingProcessor;
import org.apache.iotdb.db.pipe.processor.downsampling.changing.ChangingValueSamplingProcessor;
import org.apache.iotdb.db.pipe.processor.downsampling.sdt.SwingingDoorTrendingSamplingProcessor;
import org.apache.iotdb.db.pipe.processor.downsampling.tumbling.TumblingTimeSamplingProcessor;
import org.apache.iotdb.db.pipe.processor.pipeconsensus.PipeConsensusProcessor;
import org.apache.iotdb.db.pipe.processor.schemachange.RenameDatabaseProcessor;
import org.apache.iotdb.db.pipe.processor.twostage.plugin.TwoStageCountProcessor;

class PipeDataRegionProcessorConstructor extends PipeProcessorConstructor {

Expand All @@ -44,28 +36,6 @@ class PipeDataRegionProcessorConstructor extends PipeProcessorConstructor {
protected void initConstructors() {
pluginConstructors.put(
BuiltinPipePlugin.DO_NOTHING_PROCESSOR.getPipePluginName(), DoNothingProcessor::new);
pluginConstructors.put(
BuiltinPipePlugin.TUMBLING_TIME_SAMPLING_PROCESSOR.getPipePluginName(),
TumblingTimeSamplingProcessor::new);
pluginConstructors.put(
BuiltinPipePlugin.SDT_SAMPLING_PROCESSOR.getPipePluginName(),
SwingingDoorTrendingSamplingProcessor::new);
pluginConstructors.put(
BuiltinPipePlugin.CHANGING_VALUE_SAMPLING_PROCESSOR.getPipePluginName(),
ChangingValueSamplingProcessor::new);
pluginConstructors.put(
BuiltinPipePlugin.THROWING_EXCEPTION_PROCESSOR.getPipePluginName(),
ThrowingExceptionProcessor::new);
pluginConstructors.put(
BuiltinPipePlugin.AGGREGATE_PROCESSOR.getPipePluginName(), AggregateProcessor::new);
pluginConstructors.put(
BuiltinPipePlugin.STANDARD_STATISTICS_PROCESSOR.getPipePluginName(),
StandardStatisticsOperatorProcessor::new);
pluginConstructors.put(
BuiltinPipePlugin.TUMBLING_WINDOWING_PROCESSOR.getPipePluginName(),
TumblingWindowingProcessor::new);
pluginConstructors.put(
BuiltinPipePlugin.COUNT_POINT_PROCESSOR.getPipePluginName(), TwoStageCountProcessor::new);
pluginConstructors.put(
BuiltinPipePlugin.PIPE_CONSENSUS_PROCESSOR.getPipePluginName(),
PipeConsensusProcessor::new);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@
import org.apache.iotdb.commons.pipe.agent.plugin.builtin.sink.donothing.DoNothingSink;
import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeSinkConstructor;
import org.apache.iotdb.commons.pipe.agent.plugin.meta.DataNodePipePluginMetaKeeper;
import org.apache.iotdb.db.pipe.sink.protocol.airgap.IoTDBDataRegionAirGapSink;
import org.apache.iotdb.db.pipe.sink.protocol.legacy.IoTDBLegacyPipeSink;
import org.apache.iotdb.db.pipe.sink.protocol.opcda.OpcDaSink;
import org.apache.iotdb.db.pipe.sink.protocol.opcua.OpcUaSink;
import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.PipeConsensusAsyncSink;
import org.apache.iotdb.db.pipe.sink.protocol.thrift.async.IoTDBDataRegionAsyncSink;
import org.apache.iotdb.db.pipe.sink.protocol.thrift.sync.IoTDBDataRegionSyncSink;
Expand Down Expand Up @@ -59,13 +56,8 @@ protected void initConstructors() {
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_LEGACY_PIPE_CONNECTOR.getPipePluginName(),
IoTDBLegacyPipeSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_AIR_GAP_CONNECTOR.getPipePluginName(),
IoTDBDataRegionAirGapSink::new);
pluginConstructors.put(
BuiltinPipePlugin.WEBSOCKET_CONNECTOR.getPipePluginName(), WebSocketSink::new);
pluginConstructors.put(BuiltinPipePlugin.OPC_UA_CONNECTOR.getPipePluginName(), OpcUaSink::new);
pluginConstructors.put(BuiltinPipePlugin.OPC_DA_CONNECTOR.getPipePluginName(), OpcDaSink::new);
pluginConstructors.put(
BuiltinPipePlugin.DO_NOTHING_CONNECTOR.getPipePluginName(), DoNothingSink::new);
pluginConstructors.put(
Expand All @@ -82,12 +74,8 @@ protected void initConstructors() {
IoTDBDataRegionAsyncSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_LEGACY_PIPE_SINK.getPipePluginName(), IoTDBLegacyPipeSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_AIR_GAP_SINK.getPipePluginName(), IoTDBDataRegionAirGapSink::new);
pluginConstructors.put(
BuiltinPipePlugin.WEBSOCKET_SINK.getPipePluginName(), WebSocketSink::new);
pluginConstructors.put(BuiltinPipePlugin.OPC_UA_SINK.getPipePluginName(), OpcUaSink::new);
pluginConstructors.put(BuiltinPipePlugin.OPC_DA_SINK.getPipePluginName(), OpcDaSink::new);
pluginConstructors.put(
BuiltinPipePlugin.DO_NOTHING_SINK.getPipePluginName(), DoNothingSink::new);
pluginConstructors.put(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin;
import org.apache.iotdb.commons.pipe.agent.plugin.builtin.sink.donothing.DoNothingSink;
import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeSinkConstructor;
import org.apache.iotdb.db.pipe.sink.protocol.airgap.IoTDBSchemaRegionAirGapSink;
import org.apache.iotdb.db.pipe.sink.protocol.thrift.sync.IoTDBSchemaRegionSink;
import org.apache.iotdb.pipe.api.PipeConnector;

Expand All @@ -41,9 +40,6 @@ protected void initConstructors() {
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_THRIFT_ASYNC_CONNECTOR.getPipePluginName(),
IoTDBSchemaRegionSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_AIR_GAP_CONNECTOR.getPipePluginName(),
IoTDBSchemaRegionAirGapSink::new);
pluginConstructors.put(
BuiltinPipePlugin.DO_NOTHING_CONNECTOR.getPipePluginName(), DoNothingSink::new);

Expand All @@ -55,8 +51,6 @@ protected void initConstructors() {
BuiltinPipePlugin.IOTDB_THRIFT_SYNC_SINK.getPipePluginName(), IoTDBSchemaRegionSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_THRIFT_ASYNC_SINK.getPipePluginName(), IoTDBSchemaRegionSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_AIR_GAP_SINK.getPipePluginName(), IoTDBSchemaRegionAirGapSink::new);
pluginConstructors.put(
BuiltinPipePlugin.DO_NOTHING_SINK.getPipePluginName(), DoNothingSink::new);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,11 @@
while (!current.equalsInPipeConsensus(event) && iterator.hasNext()) {
current = iterator.next();
}
if (current.equalsInIoTConsensusV2(event)) {
if (current.equalsInPipeConsensus(event)) {
iterator.remove();
} else {
LOGGER.warn(
"IoTConsensusV2-ConsensusGroup-{}: event-{} not found in transferBuffer, skip removing. queue size = {}",

Check warning on line 243 in iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/PipeConsensusAsyncSink.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Line is longer than 100 characters (found 115).

See more on https://sonarcloud.io/project/issues?id=apache_iotdb&issues=AZ1shZ6J0YMKf6I9cMiG&open=AZ1shZ6J0YMKf6I9cMiG&pullRequest=17448
consensusGroupId,
event,
transferBuffer.size());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import org.apache.iotdb.commons.consensus.DataRegionId;
import org.apache.iotdb.commons.pipe.agent.task.PipeTaskAgent;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta;
import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant;
import org.apache.iotdb.commons.pipe.config.constant.SystemConstant;
import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBTreePatternOperations;
Expand Down Expand Up @@ -140,6 +141,21 @@ public class IoTDBDataRegionSource extends IoTDBSource {
public void validate(final PipeParameterValidator validator) throws Exception {
super.validate(validator);

final boolean forwardingPipeRequests =
validator
.getParameters()
.getBooleanOrDefault(
Arrays.asList(
PipeSourceConstant.EXTRACTOR_FORWARDING_PIPE_REQUESTS_KEY,
PipeSourceConstant.SOURCE_FORWARDING_PIPE_REQUESTS_KEY),
PipeSourceConstant.EXTRACTOR_FORWARDING_PIPE_REQUESTS_DEFAULT_VALUE);
if (!forwardingPipeRequests) {
throw new PipeParameterNotValidException(
String.format(
"The parameter %s cannot be set to false.",
PipeSourceConstant.SOURCE_FORWARDING_PIPE_REQUESTS_KEY));
}

final boolean isTreeDialect =
validator
.getParameters()
Expand Down Expand Up @@ -266,32 +282,6 @@ public void validate(final PipeParameterValidator validator) throws Exception {
Arrays.asList(EXTRACTOR_REALTIME_ENABLE_KEY, SOURCE_REALTIME_ENABLE_KEY),
EXTRACTOR_REALTIME_ENABLE_DEFAULT_VALUE));

// Validate source.realtime.mode
if (validator
.getParameters()
.getBooleanOrDefault(
Arrays.asList(EXTRACTOR_REALTIME_ENABLE_KEY, SOURCE_REALTIME_ENABLE_KEY),
EXTRACTOR_REALTIME_ENABLE_DEFAULT_VALUE)
|| validator
.getParameters()
.hasAnyAttributes(
SOURCE_START_TIME_KEY,
EXTRACTOR_START_TIME_KEY,
SOURCE_END_TIME_KEY,
EXTRACTOR_END_TIME_KEY)) {
validator.validateAttributeValueRange(
validator.getParameters().hasAttribute(EXTRACTOR_REALTIME_MODE_KEY)
? EXTRACTOR_REALTIME_MODE_KEY
: SOURCE_REALTIME_MODE_KEY,
true,
EXTRACTOR_REALTIME_MODE_FILE_VALUE,
EXTRACTOR_REALTIME_MODE_HYBRID_VALUE,
EXTRACTOR_REALTIME_MODE_LOG_VALUE,
EXTRACTOR_REALTIME_MODE_FORCED_LOG_VALUE,
EXTRACTOR_REALTIME_MODE_STREAM_MODE_VALUE,
EXTRACTOR_REALTIME_MODE_BATCH_MODE_VALUE);
}

checkInvalidParameters(validator);

constructHistoricalExtractor();
Expand Down Expand Up @@ -454,6 +444,13 @@ private void constructRealtimeExtractor(final PipeParameters parameters) {
return;
}

if (!(pipeName != null
&& (pipeName.startsWith(PipeStaticMeta.SUBSCRIPTION_PIPE_PREFIX)
|| pipeName.startsWith(PipeStaticMeta.CONSENSUS_PIPE_PREFIX)))) {
realtimeExtractor = new PipeRealtimeDataRegionTsFileSource();
return;
}

// Use hybrid mode by default
if (!parameters.hasAnyAttributes(EXTRACTOR_MODE_STREAMING_KEY, SOURCE_MODE_STREAMING_KEY)
&& !parameters.hasAnyAttributes(EXTRACTOR_REALTIME_MODE_KEY, SOURCE_REALTIME_MODE_KEY)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -930,8 +930,8 @@ private Event supplyDeletionEvent(final DeletionResource deletionResource) {
false);

// if using IoTV2, assign a replicateIndex for this historical deletion event
if (DataRegionConsensusImpl.getInstance() instanceof IoTConsensusV2
&& IoTConsensusV2Processor.isShouldReplicate(event)) {
if (DataRegionConsensusImpl.getInstance() instanceof PipeConsensus
&& PipeConsensusProcessor.isShouldReplicate(event)) {
event.setReplicateIndexForIoTV2(
ReplicateProgressDataNodeManager.assignReplicateIndexForIoTV2(pipeName));
LOGGER.debug(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public abstract class PipeRealtimeDataRegionSource implements PipeExtractor {
private final AtomicReference<Pair<Long, Long>> dataRegionTimePartitionIdBound =
new AtomicReference<>();

protected boolean isForwardingPipeRequests;
protected boolean isForwardingPipeRequests = true;

private boolean shouldTransferModFile; // Whether to transfer mods

Expand Down Expand Up @@ -250,22 +250,7 @@ public void customize(
? TimePartitionUtils.getTimePartitionId(realtimeDataExtractionEndTime)
: TimePartitionUtils.getTimePartitionId(realtimeDataExtractionEndTime) - 1;

final boolean isDoubleLiving =
parameters.getBooleanOrDefault(
Arrays.asList(
PipeSourceConstant.EXTRACTOR_MODE_DOUBLE_LIVING_KEY,
PipeSourceConstant.SOURCE_MODE_DOUBLE_LIVING_KEY),
PipeSourceConstant.EXTRACTOR_MODE_DOUBLE_LIVING_DEFAULT_VALUE);
if (isDoubleLiving) {
isForwardingPipeRequests = false;
} else {
isForwardingPipeRequests =
parameters.getBooleanOrDefault(
Arrays.asList(
PipeSourceConstant.EXTRACTOR_FORWARDING_PIPE_REQUESTS_KEY,
PipeSourceConstant.SOURCE_FORWARDING_PIPE_REQUESTS_KEY),
PipeSourceConstant.EXTRACTOR_FORWARDING_PIPE_REQUESTS_DEFAULT_VALUE);
}
isForwardingPipeRequests = true;

if (parameters.hasAnyAttributes(EXTRACTOR_MODS_KEY, SOURCE_MODS_KEY)) {
shouldTransferModFile =
Expand Down
Loading
Loading