This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new eb15d9a8367 Subscription: simplify table and tree consumer builder
interface (#15399)
eb15d9a8367 is described below
commit eb15d9a8367d77c0d22c0de3e4cd742abd1e4b34
Author: VGalaxies <[email protected]>
AuthorDate: Thu Apr 24 13:13:03 2025 +0800
Subscription: simplify table and tree consumer builder interface (#15399)
---
.../iotdb/TableModelSubscriptionSessionExample.java | 2 +-
.../tsfile/subscription/SubscriptionTableTsFile.java | 2 +-
.../base/AbstractSubscriptionConsumerBuilder.java | 20 --------------------
.../table/SubscriptionTablePullConsumerBuilder.java | 3 +--
.../table/SubscriptionTablePushConsumerBuilder.java | 3 +--
.../tree/SubscriptionTreePullConsumerBuilder.java | 3 +--
.../tree/SubscriptionTreePushConsumerBuilder.java | 3 +--
7 files changed, 6 insertions(+), 30 deletions(-)
diff --git
a/example/session/src/main/java/org/apache/iotdb/TableModelSubscriptionSessionExample.java
b/example/session/src/main/java/org/apache/iotdb/TableModelSubscriptionSessionExample.java
index 92b5df1788e..363ff971662 100644
---
a/example/session/src/main/java/org/apache/iotdb/TableModelSubscriptionSessionExample.java
+++
b/example/session/src/main/java/org/apache/iotdb/TableModelSubscriptionSessionExample.java
@@ -119,7 +119,7 @@ public class TableModelSubscriptionSessionExample {
new SubscriptionTablePullConsumerBuilder()
.consumerId("c1")
.consumerGroupId("cg1")
- .buildTablePullConsumer()) {
+ .build()) {
consumer1.open();
consumer1.subscribe(TOPIC_1);
while (true) {
diff --git
a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/tsfile/subscription/SubscriptionTableTsFile.java
b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/tsfile/subscription/SubscriptionTableTsFile.java
index 0c9c3268c94..9a5e7f7dc9a 100644
---
a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/tsfile/subscription/SubscriptionTableTsFile.java
+++
b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/tsfile/subscription/SubscriptionTableTsFile.java
@@ -109,7 +109,7 @@ public class SubscriptionTableTsFile extends
AbstractSubscriptionTsFile {
.autoCommit(Constants.AUTO_COMMIT)
.autoCommitIntervalMs(Constants.AUTO_COMMIT_INTERVAL)
.fileSaveDir(commonParam.getTargetDir())
- .buildTablePullConsumer());
+ .build());
}
commonParam
.getPullTableConsumers()
diff --git
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/base/AbstractSubscriptionConsumerBuilder.java
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/base/AbstractSubscriptionConsumerBuilder.java
index 7ddcca7b9c6..7f965069e73 100644
---
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/base/AbstractSubscriptionConsumerBuilder.java
+++
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/base/AbstractSubscriptionConsumerBuilder.java
@@ -21,10 +21,6 @@ package org.apache.iotdb.session.subscription.consumer.base;
import org.apache.iotdb.isession.SessionConfig;
import org.apache.iotdb.rpc.subscription.config.ConsumerConstant;
-import
org.apache.iotdb.session.subscription.consumer.ISubscriptionTablePullConsumer;
-import
org.apache.iotdb.session.subscription.consumer.ISubscriptionTablePushConsumer;
-import
org.apache.iotdb.session.subscription.consumer.ISubscriptionTreePullConsumer;
-import
org.apache.iotdb.session.subscription.consumer.ISubscriptionTreePushConsumer;
import org.apache.iotdb.session.subscription.util.IdentifierUtils;
import org.apache.thrift.annotation.Nullable;
@@ -131,20 +127,4 @@ public class AbstractSubscriptionConsumerBuilder {
this.maxPollParallelism = Math.max(maxPollParallelism, 1);
return this;
}
-
- public ISubscriptionTreePullConsumer buildTreePullConsumer() {
- throw new UnsupportedOperationException();
- }
-
- public ISubscriptionTreePushConsumer buildTreePushConsumer() {
- throw new UnsupportedOperationException();
- }
-
- public ISubscriptionTablePullConsumer buildTablePullConsumer() {
- throw new UnsupportedOperationException();
- }
-
- public ISubscriptionTablePushConsumer buildTablePushConsumer() {
- throw new UnsupportedOperationException();
- }
}
diff --git
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/table/SubscriptionTablePullConsumerBuilder.java
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/table/SubscriptionTablePullConsumerBuilder.java
index 1389f9dcf37..b85b669876a 100644
---
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/table/SubscriptionTablePullConsumerBuilder.java
+++
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/table/SubscriptionTablePullConsumerBuilder.java
@@ -118,8 +118,7 @@ public class SubscriptionTablePullConsumerBuilder extends
AbstractSubscriptionPu
return this;
}
- @Override
- public ISubscriptionTablePullConsumer buildTablePullConsumer() {
+ public ISubscriptionTablePullConsumer build() {
return new SubscriptionTablePullConsumer(this);
}
}
diff --git
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/table/SubscriptionTablePushConsumerBuilder.java
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/table/SubscriptionTablePushConsumerBuilder.java
index 1c5c05e84c8..fcd62b235e2 100644
---
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/table/SubscriptionTablePushConsumerBuilder.java
+++
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/table/SubscriptionTablePushConsumerBuilder.java
@@ -132,8 +132,7 @@ public class SubscriptionTablePushConsumerBuilder extends
AbstractSubscriptionPu
return this;
}
- @Override
- public ISubscriptionTablePushConsumer buildTablePushConsumer() {
+ public ISubscriptionTablePushConsumer build() {
return new SubscriptionTablePushConsumer(this);
}
}
diff --git
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/tree/SubscriptionTreePullConsumerBuilder.java
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/tree/SubscriptionTreePullConsumerBuilder.java
index ebd87bdc0ff..f3d3b7afba8 100644
---
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/tree/SubscriptionTreePullConsumerBuilder.java
+++
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/tree/SubscriptionTreePullConsumerBuilder.java
@@ -117,8 +117,7 @@ public class SubscriptionTreePullConsumerBuilder extends
AbstractSubscriptionPul
return this;
}
- @Override
- public ISubscriptionTreePullConsumer buildTreePullConsumer() {
+ public ISubscriptionTreePullConsumer build() {
return new SubscriptionTreePullConsumer(this);
}
}
diff --git
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/tree/SubscriptionTreePushConsumerBuilder.java
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/tree/SubscriptionTreePushConsumerBuilder.java
index 09c6e60dc8b..44fde0ed4f0 100644
---
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/tree/SubscriptionTreePushConsumerBuilder.java
+++
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/tree/SubscriptionTreePushConsumerBuilder.java
@@ -132,8 +132,7 @@ public class SubscriptionTreePushConsumerBuilder extends
AbstractSubscriptionPus
return this;
}
- @Override
- public ISubscriptionTreePushConsumer buildTreePushConsumer() {
+ public ISubscriptionTreePushConsumer build() {
return new SubscriptionTreePushConsumer(this);
}
}
