Skip to content

Commit 35249bc

Browse files
VGalaxiesJackieTien97
authored andcommitted
Subscription: add config to enable or disable subscription (#15820) (#15822)
1 parent 5551ac7 commit 35249bc

20 files changed

Lines changed: 149 additions & 3 deletions

File tree

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,12 @@ public CommonConfig setQueryMemoryProportion(String queryMemoryProportion) {
502502
return this;
503503
}
504504

505+
@Override
506+
public CommonConfig setSubscriptionEnabled(boolean subscriptionEnabled) {
507+
setProperty("subscription_enabled", String.valueOf(subscriptionEnabled));
508+
return this;
509+
}
510+
505511
@Override
506512
public CommonConfig setDefaultStorageGroupLevel(int defaultStorageGroupLevel) {
507513
setProperty("default_storage_group_level", String.valueOf(defaultStorageGroupLevel));

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,13 @@ public CommonConfig setQueryMemoryProportion(String queryMemoryProportion) {
513513
return this;
514514
}
515515

516+
@Override
517+
public CommonConfig setSubscriptionEnabled(boolean subscriptionEnabled) {
518+
dnConfig.setSubscriptionEnabled(subscriptionEnabled);
519+
cnConfig.setSubscriptionEnabled(subscriptionEnabled);
520+
return this;
521+
}
522+
516523
@Override
517524
public CommonConfig setDefaultStorageGroupLevel(int defaultStorageGroupLevel) {
518525
dnConfig.setDefaultStorageGroupLevel(defaultStorageGroupLevel);

integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,4 +360,9 @@ public CommonConfig setPipeConnectorRequestSliceThresholdBytes(
360360
public CommonConfig setQueryMemoryProportion(String queryMemoryProportion) {
361361
return this;
362362
}
363+
364+
@Override
365+
public CommonConfig setSubscriptionEnabled(boolean subscriptionEnabled) {
366+
return this;
367+
}
363368
}

integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ CommonConfig setPipeConnectorRequestSliceThresholdBytes(
160160

161161
CommonConfig setQueryMemoryProportion(String queryMemoryProportion);
162162

163+
CommonConfig setSubscriptionEnabled(boolean subscriptionEnabled);
164+
163165
default CommonConfig setDefaultStorageGroupLevel(int defaultStorageGroupLevel) {
164166
return this;
165167
}

integration-test/src/test/java/org/apache/iotdb/subscription/it/cluster/IoTDBSubscriptionRestartIT.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ public class IoTDBSubscriptionRestartIT extends AbstractSubscriptionIT {
7171
public void setUp() throws Exception {
7272
super.setUp();
7373

74+
// enable subscription
75+
EnvFactory.getEnv().getConfig().getCommonConfig().setSubscriptionEnabled(true);
76+
77+
// set cluster env
7478
EnvFactory.getEnv()
7579
.getConfig()
7680
.getCommonConfig()

integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/AbstractSubscriptionDualIT.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ public void setUp() throws Exception {
4747
}
4848

4949
protected void setUpConfig() {
50+
// enable subscription
51+
senderEnv.getConfig().getCommonConfig().setSubscriptionEnabled(true);
52+
receiverEnv.getConfig().getCommonConfig().setSubscriptionEnabled(true);
53+
5054
// enable auto create schema
5155
senderEnv.getConfig().getCommonConfig().setAutoCreateSchemaEnabled(true);
5256
receiverEnv.getConfig().getCommonConfig().setAutoCreateSchemaEnabled(true);

integration-test/src/test/java/org/apache/iotdb/subscription/it/local/AbstractSubscriptionLocalIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ public abstract class AbstractSubscriptionLocalIT extends AbstractSubscriptionIT
3232
public void setUp() throws Exception {
3333
super.setUp();
3434

35+
// enable subscription
36+
EnvFactory.getEnv().getConfig().getCommonConfig().setSubscriptionEnabled(true);
3537
EnvFactory.getEnv().initClusterEnvironment();
3638
}
3739

integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/AbstractSubscriptionTripleIT.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ public void setUp() throws Exception {
5555
}
5656

5757
protected void setUpConfig() {
58+
// enable subscription
59+
sender.getConfig().getCommonConfig().setSubscriptionEnabled(true);
60+
receiver1.getConfig().getCommonConfig().setSubscriptionEnabled(true);
61+
receiver2.getConfig().getCommonConfig().setSubscriptionEnabled(true);
62+
5863
// enable auto create schema
5964
sender.getConfig().getCommonConfig().setAutoCreateSchemaEnabled(true);
6065
receiver1.getConfig().getCommonConfig().setAutoCreateSchemaEnabled(true);

integration-test/src/test/java/org/apache/iotdb/tools/it/ExportTsFileTestIT.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ public class ExportTsFileTestIT extends AbstractScriptIT {
5252

5353
@BeforeClass
5454
public static void setUp() throws Exception {
55+
// enable subscription
56+
EnvFactory.getEnv().getConfig().getCommonConfig().setSubscriptionEnabled(true);
5557
EnvFactory.getEnv().initClusterEnvironment();
58+
5659
ip = EnvFactory.getEnv().getIP();
5760
port = EnvFactory.getEnv().getPort();
5861
toolsPath = EnvFactory.getEnv().getToolsPath();

iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ public enum TSStatusCode {
262262
SUBSCRIPTION_MISSING_CUSTOMER(1909),
263263
SHOW_SUBSCRIPTION_ERROR(1910),
264264
SUBSCRIPTION_PIPE_TIMEOUT_ERROR(1911),
265+
SUBSCRIPTION_NOT_ENABLED_ERROR(1912),
265266

266267
// Topic
267268
CREATE_TOPIC_ERROR(2000),

0 commit comments

Comments
 (0)