This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch ty/deletecode in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit b77ce994225d4808b751500588e5809bd543c089 Author: JackieTien97 <[email protected]> AuthorDate: Tue Oct 21 17:11:55 2025 +0800 fix compile error --- dependencies.json | 335 +++++++++++---------- .../it/SkipOnSetUpAndTearDownFailure.java | 3 +- iotdb-core/datanode/pom.xml | 8 - .../tablet/parser/TabletInsertionEventParser.java | 11 +- .../metric/processor/PipeProcessorMetrics.java | 3 +- .../schema/PipeSchemaRegionListenerMetrics.java | 4 +- .../metric/schema/PipeSchemaRegionSinkMetrics.java | 3 +- .../schema/PipeSchemaRegionSourceMetrics.java | 3 +- .../metric/sink/PipeDataRegionSinkMetrics.java | 3 +- .../db/pipe/metric/source/PipeAssignerMetrics.java | 3 +- .../metric/source/PipeDataRegionSourceMetrics.java | 3 +- .../realtime/PipeRealtimeDataRegionSource.java | 4 +- .../listener/PipeTimePartitionListener.java | 3 +- .../plan/relational/sql/ast/ShowSubscriptions.java | 4 +- .../plan/relational/sql/ast/ShowTopics.java | 4 +- .../scheduler/load/LoadTsFileDispatcherImpl.java | 2 +- .../broker/SubscriptionPrefetchingQueue.java | 7 +- .../broker/SubscriptionPrefetchingTabletQueue.java | 3 +- .../broker/SubscriptionPrefetchingTsFileQueue.java | 3 +- .../event/batch/SubscriptionPipeEventBatch.java | 4 +- .../event/batch/SubscriptionPipeEventBatches.java | 4 +- .../response/SubscriptionEventTsFileResponse.java | 3 +- .../SubscriptionPrefetchingQueueMetrics.java | 3 +- iotdb-core/node-commons/pom.xml | 4 - .../meta/consumer/ConsumerGroupMeta.java | 3 +- pom.xml | 11 - 26 files changed, 198 insertions(+), 243 deletions(-) diff --git a/dependencies.json b/dependencies.json index c2a255d7ba4..dc7efd318ca 100644 --- a/dependencies.json +++ b/dependencies.json @@ -1,167 +1,172 @@ { - "dependencies": [ - "cglib:cglib", - "ch.qos.logback:logback-classic", - "ch.qos.logback:logback-core", - "ch.qos.reload4j:reload4j", - "com.digitalpetri.fsm:strict-machine", - "com.digitalpetri.netty:netty-channel-fsm", - "com.fasterxml.jackson.core:jackson-annotations", - "com.fasterxml.jackson.core:jackson-core", - "com.fasterxml.jackson.core:jackson-databind", - "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", - "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base", - "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider", - "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", - "com.github.ben-manes.caffeine:caffeine", - "com.github.luben:zstd-jni", - "com.github.stephenc.jcip:jcip-annotations", - "com.github.wendykierp:JTransforms", - "com.google.code.findbugs:jsr305", - "com.google.code.gson:gson", - "com.google.errorprone:error_prone_annotations", - "com.google.guava:failureaccess", - "com.google.guava:guava", - "com.google.guava:listenablefuture", - "com.google.j2objc:j2objc-annotations", - "com.h2database:h2-mvstore", - "com.lmax:disruptor", - "com.nimbusds:content-type", - "com.nimbusds:lang-tag", - "com.nimbusds:nimbus-jose-jwt", - "com.nimbusds:oauth2-oidc-sdk", - "com.sun.istack:istack-commons-runtime", - "com.zaxxer:HikariCP", - "commons-cli:commons-cli", - "commons-codec:commons-codec", - "commons-io:commons-io", - "commons-logging:commons-logging", - "io.airlift:airline", - "io.airlift:concurrent", - "io.airlift:log", - "io.airlift:units", - "io.dropwizard.metrics:metrics-core", - "io.jsonwebtoken:jjwt-api", - "io.micrometer:micrometer-commons", - "io.micrometer:micrometer-core", - "io.micrometer:micrometer-observation", - "com.github.moquette-io.moquette:moquette-broker", - "io.netty:netty-buffer", - "io.netty:netty-codec", - "io.netty:netty-codec-dns", - "io.netty:netty-codec-http", - "io.netty:netty-codec-http2", - "io.netty:netty-codec-mqtt", - "io.netty:netty-codec-socks", - "io.netty:netty-common", - "io.netty:netty-handler", - "io.netty:netty-handler-proxy", - "io.netty:netty-resolver", - "io.netty:netty-resolver-dns", - "io.netty:netty-resolver-dns-classes-macos", - "io.netty:netty-resolver-dns-native-macos", - "io.netty:netty-tcnative-boringssl-static", - "io.netty:netty-tcnative-classes", - "io.netty:netty-transport", - "io.netty:netty-transport-classes-epoll", - "io.netty:netty-transport-native-epoll", - "io.netty:netty-transport-native-unix-common", - "io.netty:netty-transport-classes-kqueue", - "io.netty:netty-transport-native-kqueue", - "io.projectreactor:reactor-core", - "io.projectreactor.netty:reactor-netty-core", - "io.projectreactor.netty:reactor-netty-http", - "io.swagger:swagger-annotations", - "io.swagger:swagger-core", - "io.swagger:swagger-jaxrs", - "io.swagger:swagger-models", - "jakarta.activation:jakarta.activation-api", - "jakarta.annotation:jakarta.annotation-api", - "jakarta.servlet:jakarta.servlet-api", - "jakarta.validation:jakarta.validation-api", - "jakarta.ws.rs:jakarta.ws.rs-api", - "jakarta.xml.bind:jakarta.xml.bind-api", - "net.java.dev.jna:jna", - "net.java.dev.jna:jna-platform", - "net.minidev:accessors-smart", - "net.minidev:json-smart", - "org.antlr:antlr4-runtime", - "org.apache.commons:commons-collections4", - "org.apache.commons:commons-csv", - "org.apache.commons:commons-jexl3", - "org.apache.commons:commons-lang3", - "org.apache.commons:commons-math3", - "org.apache.commons:commons-pool2", - "org.apache.httpcomponents:httpclient", - "org.apache.httpcomponents:httpcore", - "com.timecho.ratis:ratis-client", - "com.timecho.ratis:ratis-common", - "com.timecho.ratis:ratis-grpc", - "com.timecho.ratis:ratis-metrics-api", - "com.timecho.ratis:ratis-proto", - "com.timecho.ratis:ratis-server", - "com.timecho.ratis:ratis-server-api", - "org.apache.ratis:ratis-thirdparty-misc", - "org.apache.thrift:libthrift", - "org.apache.tsfile:common", - "org.apache.tsfile:tsfile", - "org.bouncycastle:bcpkix-jdk18on", - "org.bouncycastle:bcprov-jdk18on", - "org.bouncycastle:bcutil-jdk18on", - "org.checkerframework:checker-qual", - "org.eclipse.collections:eclipse-collections", - "org.eclipse.collections:eclipse-collections-api", - "org.eclipse.jetty:jetty-http", - "org.eclipse.jetty:jetty-io", - "org.eclipse.jetty:jetty-security", - "org.eclipse.jetty:jetty-server", - "org.eclipse.jetty:jetty-servlet", - "org.eclipse.jetty:jetty-util", - "org.eclipse.jetty:jetty-util-ajax", - "org.eclipse.milo:bsd-core", - "org.eclipse.milo:bsd-generator", - "org.eclipse.milo:sdk-client", - "org.eclipse.milo:sdk-core", - "org.eclipse.milo:sdk-server", - "org.eclipse.milo:stack-client", - "org.eclipse.milo:stack-core", - "org.eclipse.milo:stack-server", - "org.fusesource.hawtbuf:hawtbuf", - "org.fusesource.hawtdispatch:hawtdispatch", - "org.fusesource.hawtdispatch:hawtdispatch-transport", - "org.fusesource.mqtt-client:mqtt-client", - "org.glassfish.hk2:hk2-api", - "org.glassfish.hk2:hk2-locator", - "org.glassfish.hk2:hk2-utils", - "org.glassfish.hk2:osgi-resource-locator", - "org.glassfish.hk2.external:aopalliance-repackaged", - "org.glassfish.hk2.external:jakarta.inject", - "org.glassfish.jaxb:jaxb-runtime", - "org.glassfish.jaxb:txw2", - "org.glassfish.jersey.containers:jersey-container-servlet-core", - "org.glassfish.jersey.core:jersey-client", - "org.glassfish.jersey.core:jersey-common", - "org.glassfish.jersey.core:jersey-server", - "org.glassfish.jersey.inject:jersey-hk2", - "org.glassfish.jersey.media:jersey-media-multipart", - "org.hdrhistogram:HdrHistogram", - "org.java-websocket:Java-WebSocket", - "org.javassist:javassist", - "org.jline:jline", - "org.jvnet.mimepull:mimepull", - "org.latencyutils:LatencyUtils", - "org.lz4:lz4-java", - "org.ops4j.pax.jdbc:pax-jdbc-common", - "org.osgi:osgi.cmpn", - "org.osgi:osgi.core", - "org.ow2.asm:asm", - "org.reactivestreams:reactive-streams", - "org.slf4j:slf4j-api", - "org.slf4j:slf4j-reload4j", - "org.tukaani:xz", - "org.xerial.snappy:snappy-java", - "org.yaml:snakeyaml", - "pl.edu.icm:JLargeArrays" - ] + "dependencies": [ + "cglib:cglib", + "ch.qos.logback:logback-classic", + "ch.qos.logback:logback-core", + "ch.qos.reload4j:reload4j", + "com.digitalpetri.fsm:strict-machine", + "com.digitalpetri.netty:netty-channel-fsm", + "com.fasterxml.jackson.core:jackson-annotations", + "com.fasterxml.jackson.core:jackson-core", + "com.fasterxml.jackson.core:jackson-databind", + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base", + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider", + "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.github.ben-manes.caffeine:caffeine", + "com.github.luben:zstd-jni", + "com.github.moquette-io.moquette:moquette-broker", + "com.github.stephenc.jcip:jcip-annotations", + "com.github.wendykierp:JTransforms", + "com.google.code.findbugs:jsr305", + "com.google.code.gson:gson", + "com.google.errorprone:error_prone_annotations", + "com.google.guava:failureaccess", + "com.google.guava:guava", + "com.google.guava:listenablefuture", + "com.google.j2objc:j2objc-annotations", + "com.h2database:h2-mvstore", + "com.lmax:disruptor", + "com.nimbusds:content-type", + "com.nimbusds:lang-tag", + "com.nimbusds:nimbus-jose-jwt", + "com.nimbusds:oauth2-oidc-sdk", + "com.sun.istack:istack-commons-runtime", + "com.timecho.ratis:ratis-client", + "com.timecho.ratis:ratis-common", + "com.timecho.ratis:ratis-grpc", + "com.timecho.ratis:ratis-metrics-api", + "com.timecho.ratis:ratis-proto", + "com.timecho.ratis:ratis-server", + "com.timecho.ratis:ratis-server-api", + "com.zaxxer:HikariCP", + "commons-cli:commons-cli", + "commons-codec:commons-codec", + "commons-io:commons-io", + "commons-logging:commons-logging", + "io.airlift:airline", + "io.airlift:units", + "io.dropwizard.metrics:metrics-core", + "io.jsonwebtoken:jjwt-api", + "io.micrometer:micrometer-commons", + "io.micrometer:micrometer-core", + "io.micrometer:micrometer-observation", + "io.netty:netty-buffer", + "io.netty:netty-codec", + "io.netty:netty-codec-dns", + "io.netty:netty-codec-http", + "io.netty:netty-codec-http2", + "io.netty:netty-codec-mqtt", + "io.netty:netty-codec-socks", + "io.netty:netty-common", + "io.netty:netty-handler", + "io.netty:netty-handler-proxy", + "io.netty:netty-resolver", + "io.netty:netty-resolver-dns", + "io.netty:netty-resolver-dns-classes-macos", + "io.netty:netty-resolver-dns-native-macos", + "io.netty:netty-tcnative-boringssl-static", + "io.netty:netty-tcnative-boringssl-static", + "io.netty:netty-tcnative-boringssl-static", + "io.netty:netty-tcnative-boringssl-static", + "io.netty:netty-tcnative-boringssl-static", + "io.netty:netty-tcnative-classes", + "io.netty:netty-transport", + "io.netty:netty-transport-classes-epoll", + "io.netty:netty-transport-classes-kqueue", + "io.netty:netty-transport-native-epoll", + "io.netty:netty-transport-native-epoll", + "io.netty:netty-transport-native-kqueue", + "io.netty:netty-transport-native-kqueue", + "io.netty:netty-transport-native-unix-common", + "io.projectreactor:reactor-core", + "io.projectreactor.netty:reactor-netty-core", + "io.projectreactor.netty:reactor-netty-http", + "io.swagger:swagger-annotations", + "io.swagger:swagger-core", + "io.swagger:swagger-jaxrs", + "io.swagger:swagger-models", + "jakarta.activation:jakarta.activation-api", + "jakarta.annotation:jakarta.annotation-api", + "jakarta.servlet:jakarta.servlet-api", + "jakarta.validation:jakarta.validation-api", + "jakarta.ws.rs:jakarta.ws.rs-api", + "jakarta.xml.bind:jakarta.xml.bind-api", + "net.java.dev.jna:jna", + "net.java.dev.jna:jna-platform", + "net.minidev:accessors-smart", + "net.minidev:json-smart", + "org.antlr:antlr4-runtime", + "org.apache.commons:commons-collections4", + "org.apache.commons:commons-csv", + "org.apache.commons:commons-jexl3", + "org.apache.commons:commons-lang3", + "org.apache.commons:commons-math3", + "org.apache.commons:commons-pool2", + "org.apache.httpcomponents:httpclient", + "org.apache.httpcomponents:httpcore", + "org.apache.ratis:ratis-thirdparty-misc", + "org.apache.thrift:libthrift", + "org.apache.tsfile:common", + "org.apache.tsfile:tsfile", + "org.bouncycastle:bcpkix-jdk18on", + "org.bouncycastle:bcprov-jdk18on", + "org.bouncycastle:bcutil-jdk18on", + "org.checkerframework:checker-qual", + "org.checkerframework:checker-qual", + "org.eclipse.collections:eclipse-collections", + "org.eclipse.collections:eclipse-collections-api", + "org.eclipse.jetty:jetty-http", + "org.eclipse.jetty:jetty-io", + "org.eclipse.jetty:jetty-security", + "org.eclipse.jetty:jetty-server", + "org.eclipse.jetty:jetty-servlet", + "org.eclipse.jetty:jetty-util", + "org.eclipse.jetty:jetty-util-ajax", + "org.eclipse.milo:bsd-core", + "org.eclipse.milo:bsd-generator", + "org.eclipse.milo:sdk-client", + "org.eclipse.milo:sdk-core", + "org.eclipse.milo:sdk-server", + "org.eclipse.milo:stack-client", + "org.eclipse.milo:stack-core", + "org.eclipse.milo:stack-server", + "org.fusesource.hawtbuf:hawtbuf", + "org.fusesource.hawtdispatch:hawtdispatch", + "org.fusesource.hawtdispatch:hawtdispatch-transport", + "org.fusesource.mqtt-client:mqtt-client", + "org.glassfish.hk2:hk2-api", + "org.glassfish.hk2:hk2-locator", + "org.glassfish.hk2:hk2-utils", + "org.glassfish.hk2:osgi-resource-locator", + "org.glassfish.hk2.external:aopalliance-repackaged", + "org.glassfish.hk2.external:jakarta.inject", + "org.glassfish.jaxb:jaxb-runtime", + "org.glassfish.jaxb:txw2", + "org.glassfish.jersey.containers:jersey-container-servlet-core", + "org.glassfish.jersey.core:jersey-client", + "org.glassfish.jersey.core:jersey-common", + "org.glassfish.jersey.core:jersey-server", + "org.glassfish.jersey.inject:jersey-hk2", + "org.glassfish.jersey.media:jersey-media-multipart", + "org.hdrhistogram:HdrHistogram", + "org.java-websocket:Java-WebSocket", + "org.javassist:javassist", + "org.jline:jline", + "org.jvnet.mimepull:mimepull", + "org.latencyutils:LatencyUtils", + "org.lz4:lz4-java", + "org.ops4j.pax.jdbc:pax-jdbc-common", + "org.osgi:osgi.cmpn", + "org.osgi:osgi.core", + "org.ow2.asm:asm", + "org.reactivestreams:reactive-streams", + "org.slf4j:slf4j-api", + "org.slf4j:slf4j-reload4j", + "org.tukaani:xz", + "org.xerial.snappy:snappy-java", + "org.yaml:snakeyaml", + "pl.edu.icm:JLargeArrays" + ] } diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/SkipOnSetUpAndTearDownFailure.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/SkipOnSetUpAndTearDownFailure.java index 6c389161219..02041d5e957 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/SkipOnSetUpAndTearDownFailure.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/SkipOnSetUpAndTearDownFailure.java @@ -19,7 +19,6 @@ package org.apache.iotdb.subscription.it; -import org.checkerframework.checker.nullness.qual.NonNull; import org.junit.Assume; import org.junit.rules.TestRule; import org.junit.runner.Description; @@ -38,7 +37,7 @@ public class SkipOnSetUpAndTearDownFailure implements TestRule { * @param tearDownMethodName Should be exactly the same as the method name decorated with @After. */ public SkipOnSetUpAndTearDownFailure( - @NonNull final String setUpMethodName, @NonNull final String tearDownMethodName) { + final String setUpMethodName, final String tearDownMethodName) { this.setUpMethodName = setUpMethodName; this.tearDownMethodName = tearDownMethodName; } diff --git a/iotdb-core/datanode/pom.xml b/iotdb-core/datanode/pom.xml index 490780a87a7..8afe00d3e04 100644 --- a/iotdb-core/datanode/pom.xml +++ b/iotdb-core/datanode/pom.xml @@ -207,10 +207,6 @@ <groupId>org.eclipse.milo</groupId> <artifactId>stack-server</artifactId> </dependency> - <dependency> - <groupId>org.checkerframework</groupId> - <artifactId>checker-qual</artifactId> - </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> @@ -235,10 +231,6 @@ <groupId>io.airlift</groupId> <artifactId>airline</artifactId> </dependency> - <dependency> - <groupId>io.airlift</groupId> - <artifactId>concurrent</artifactId> - </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/parser/TabletInsertionEventParser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/parser/TabletInsertionEventParser.java index 0cdba9d28d4..e10051325b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/parser/TabletInsertionEventParser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/parser/TabletInsertionEventParser.java @@ -39,7 +39,6 @@ import org.apache.tsfile.write.UnSupportedDataTypeException; import org.apache.tsfile.write.record.Tablet; import org.apache.tsfile.write.schema.IMeasurementSchema; import org.apache.tsfile.write.schema.MeasurementSchema; -import org.checkerframework.checker.nullness.qual.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -426,12 +425,12 @@ public abstract class TabletInsertionEventParser { } private static Object filterValueColumnsByRowIndexList( - @NonNull final TSDataType type, - @NonNull final Object originValueColumn, - @NonNull final List<Integer> rowIndexList, + final TSDataType type, + final Object originValueColumn, + final List<Integer> rowIndexList, final boolean isSingleOriginValueColumn, - @NonNull final BitMap originNullValueColumnBitmap, - @NonNull final BitMap nullValueColumnBitmap /* output parameters */) { + final BitMap originNullValueColumnBitmap, + final BitMap nullValueColumnBitmap /* output parameters */) { switch (type) { case INT32: { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/processor/PipeProcessorMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/processor/PipeProcessorMetrics.java index dd7adc6d9c0..1e0dd86b41a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/processor/PipeProcessorMetrics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/processor/PipeProcessorMetrics.java @@ -29,7 +29,6 @@ import org.apache.iotdb.metrics.utils.MetricLevel; import org.apache.iotdb.metrics.utils.MetricType; import com.google.common.collect.ImmutableSet; -import org.checkerframework.checker.nullness.qual.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -158,7 +157,7 @@ public class PipeProcessorMetrics implements IMetricSet { //////////////////////////// register & deregister (pipe integration) //////////////////////////// - public void register(@NonNull final PipeProcessorSubtask pipeProcessorSubtask) { + public void register(final PipeProcessorSubtask pipeProcessorSubtask) { final String taskID = pipeProcessorSubtask.getTaskID(); processorMap.putIfAbsent(taskID, pipeProcessorSubtask); if (Objects.nonNull(metricService)) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionListenerMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionListenerMetrics.java index ee2b6c09989..0e0ac145566 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionListenerMetrics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionListenerMetrics.java @@ -28,7 +28,6 @@ import org.apache.iotdb.metrics.utils.MetricLevel; import org.apache.iotdb.metrics.utils.MetricType; import com.google.common.collect.ImmutableSet; -import org.checkerframework.checker.nullness.qual.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -93,8 +92,7 @@ public class PipeSchemaRegionListenerMetrics implements IMetricSet { //////////////////////////// register & deregister (pipe integration) //////////////////////////// public void register( - @NonNull final SchemaRegionListeningQueue schemaRegionListeningQueue, - final Integer schemaRegionId) { + final SchemaRegionListeningQueue schemaRegionListeningQueue, final Integer schemaRegionId) { listeningQueueMap.putIfAbsent(schemaRegionId, schemaRegionListeningQueue); if (Objects.nonNull(metricService)) { createMetrics(schemaRegionId); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionSinkMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionSinkMetrics.java index 940b4404086..c6e8ad52950 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionSinkMetrics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionSinkMetrics.java @@ -29,7 +29,6 @@ import org.apache.iotdb.metrics.utils.MetricLevel; import org.apache.iotdb.metrics.utils.MetricType; import com.google.common.collect.ImmutableSet; -import org.checkerframework.checker.nullness.qual.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -101,7 +100,7 @@ public class PipeSchemaRegionSinkMetrics implements IMetricSet { //////////////////////////// Register & deregister (pipe integration) //////////////////////////// - public void register(@NonNull final PipeSinkSubtask pipeSinkSubtask) { + public void register(final PipeSinkSubtask pipeSinkSubtask) { final String taskID = pipeSinkSubtask.getTaskID(); connectorMap.putIfAbsent(taskID, pipeSinkSubtask); if (Objects.nonNull(metricService)) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionSourceMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionSourceMetrics.java index 5a2a74dc7ab..9c752d9753f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionSourceMetrics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionSourceMetrics.java @@ -28,7 +28,6 @@ import org.apache.iotdb.metrics.utils.MetricLevel; import org.apache.iotdb.metrics.utils.MetricType; import com.google.common.collect.ImmutableSet; -import org.checkerframework.checker.nullness.qual.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -101,7 +100,7 @@ public class PipeSchemaRegionSourceMetrics implements IMetricSet { //////////////////////////// register & deregister (pipe integration) //////////////////////////// - public void register(@NonNull final IoTDBSchemaRegionSource extractor) { + public void register(final IoTDBSchemaRegionSource extractor) { final String taskID = extractor.getTaskID(); extractorMap.putIfAbsent(taskID, extractor); if (Objects.nonNull(metricService)) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/sink/PipeDataRegionSinkMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/sink/PipeDataRegionSinkMetrics.java index 23024424b92..7eef4a03aa5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/sink/PipeDataRegionSinkMetrics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/sink/PipeDataRegionSinkMetrics.java @@ -31,7 +31,6 @@ import org.apache.iotdb.metrics.utils.MetricLevel; import org.apache.iotdb.metrics.utils.MetricType; import com.google.common.collect.ImmutableSet; -import org.checkerframework.checker.nullness.qual.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -438,7 +437,7 @@ public class PipeDataRegionSinkMetrics implements IMetricSet { //////////////////////////// register & deregister (pipe integration) //////////////////////////// - public void register(@NonNull final PipeSinkSubtask pipeSinkSubtask) { + public void register(final PipeSinkSubtask pipeSinkSubtask) { final String taskID = pipeSinkSubtask.getTaskID(); connectorMap.putIfAbsent(taskID, pipeSinkSubtask); if (Objects.nonNull(metricService)) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/source/PipeAssignerMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/source/PipeAssignerMetrics.java index 43bf41dfb83..7f89cdc5372 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/source/PipeAssignerMetrics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/source/PipeAssignerMetrics.java @@ -28,7 +28,6 @@ import org.apache.iotdb.metrics.utils.MetricLevel; import org.apache.iotdb.metrics.utils.MetricType; import com.google.common.collect.ImmutableSet; -import org.checkerframework.checker.nullness.qual.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -119,7 +118,7 @@ public class PipeAssignerMetrics implements IMetricSet { //////////////////////////// register & deregister (pipe integration) //////////////////////////// - public void register(@NonNull PipeDataRegionAssigner pipeDataRegionAssigner) { + public void register(PipeDataRegionAssigner pipeDataRegionAssigner) { String dataRegionId = pipeDataRegionAssigner.getDataRegionId(); synchronized (this) { assignerMap.putIfAbsent(dataRegionId, pipeDataRegionAssigner); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/source/PipeDataRegionSourceMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/source/PipeDataRegionSourceMetrics.java index c2f7da4c490..918445b57e7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/source/PipeDataRegionSourceMetrics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/source/PipeDataRegionSourceMetrics.java @@ -31,7 +31,6 @@ import org.apache.iotdb.metrics.utils.MetricLevel; import org.apache.iotdb.metrics.utils.MetricType; import com.google.common.collect.ImmutableSet; -import org.checkerframework.checker.nullness.qual.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -289,7 +288,7 @@ public class PipeDataRegionSourceMetrics implements IMetricSet { //////////////////////////// register & deregister (pipe integration) //////////////////////////// - public void register(@NonNull final IoTDBDataRegionSource extractor) { + public void register(final IoTDBDataRegionSource extractor) { final String taskID = extractor.getTaskID(); extractorMap.putIfAbsent(taskID, extractor); if (Objects.nonNull(metricService)) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionSource.java index 08cc91b232d..cd00e2975a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionSource.java @@ -53,7 +53,6 @@ import org.apache.iotdb.pipe.api.event.Event; import org.apache.iotdb.pipe.api.exception.PipeParameterNotValidException; import org.apache.tsfile.utils.Pair; -import org.checkerframework.checker.nullness.qual.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -568,8 +567,7 @@ public abstract class PipeRealtimeDataRegionSource implements PipeExtractor { return realtimeDataExtractionEndTime; } - public void setDataRegionTimePartitionIdBound( - @NonNull final Pair<Long, Long> timePartitionIdBound) { + public void setDataRegionTimePartitionIdBound(final Pair<Long, Long> timePartitionIdBound) { LOGGER.info( "PipeRealtimeDataRegionExtractor({}) observed data region {} time partition growth, recording time partition id bound: {}.", taskID, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/listener/PipeTimePartitionListener.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/listener/PipeTimePartitionListener.java index ff66149e3d3..c5e98cd1b2c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/listener/PipeTimePartitionListener.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/listener/PipeTimePartitionListener.java @@ -22,7 +22,6 @@ package org.apache.iotdb.db.pipe.source.dataregion.realtime.listener; import org.apache.iotdb.db.pipe.source.dataregion.realtime.PipeRealtimeDataRegionSource; import org.apache.tsfile.utils.Pair; -import org.checkerframework.checker.nullness.qual.NonNull; import java.util.HashMap; import java.util.Map; @@ -69,7 +68,7 @@ public class PipeTimePartitionListener { //////////////////////////// listen to changes //////////////////////////// public synchronized void listenToTimePartitionGrow( - String dataRegionId, @NonNull Pair<Long, Long> newTimePartitionIdBound) { + String dataRegionId, Pair<Long, Long> newTimePartitionIdBound) { boolean shouldBroadcastTimePartitionChange = false; Pair<Long, Long> oldTimePartitionIdBound = dataRegionId2TimePartitionIdBound.get(dataRegionId); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowSubscriptions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowSubscriptions.java index c16a9836d89..fc89088dc84 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowSubscriptions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowSubscriptions.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.Objects; import static com.google.common.base.MoreObjects.toStringHelper; @@ -29,7 +27,7 @@ public class ShowSubscriptions extends SubscriptionStatement { private final String topicName; - public ShowSubscriptions(@Nullable final String topicName) { + public ShowSubscriptions(final String topicName) { this.topicName = topicName; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTopics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTopics.java index f12e6f2a0d2..5b78117cefa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTopics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTopics.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.Objects; import static com.google.common.base.MoreObjects.toStringHelper; @@ -29,7 +27,7 @@ public class ShowTopics extends SubscriptionStatement { private final String topicName; - public ShowTopics(@Nullable final String topicName) { + public ShowTopics(final String topicName) { this.topicName = topicName; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java index 77226615e27..cfe6bb1a1a6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java @@ -45,13 +45,13 @@ import org.apache.iotdb.db.queryengine.plan.scheduler.FragInstanceDispatchResult import org.apache.iotdb.db.queryengine.plan.scheduler.IFragInstanceDispatcher; import org.apache.iotdb.db.storageengine.StorageEngine; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; +import org.apache.iotdb.db.utils.SetThreadName; import org.apache.iotdb.mpp.rpc.thrift.TLoadCommandReq; import org.apache.iotdb.mpp.rpc.thrift.TLoadResp; import org.apache.iotdb.mpp.rpc.thrift.TTsFilePieceReq; import org.apache.iotdb.rpc.RpcUtils; import org.apache.iotdb.rpc.TSStatusCode; -import io.airlift.concurrent.SetThreadName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/SubscriptionPrefetchingQueue.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/SubscriptionPrefetchingQueue.java index 903f59e4225..b8bdc4e802f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/SubscriptionPrefetchingQueue.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/SubscriptionPrefetchingQueue.java @@ -46,7 +46,6 @@ import org.apache.iotdb.session.subscription.util.PollTimer; import com.google.common.collect.ImmutableSet; import org.apache.tsfile.utils.Pair; -import org.checkerframework.checker.nullness.qual.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -420,7 +419,7 @@ public abstract class SubscriptionPrefetchingQueue { } } - public void prefetchEvent(@NonNull final SubscriptionEvent thisEvent) { + public void prefetchEvent(final SubscriptionEvent thisEvent) { final SubscriptionEvent thatEvent = prefetchingQueue.peek(); if (Objects.nonNull(thatEvent)) { if (thisEvent.compareTo(thatEvent) < 0) { @@ -990,8 +989,8 @@ public abstract class SubscriptionPrefetchingQueue { } @SafeVarargs - private static @NonNull RemappingFunction<SubscriptionEvent> COMBINER( - final @NonNull RemappingFunction<SubscriptionEvent>... functions) { + private static RemappingFunction<SubscriptionEvent> COMBINER( + final RemappingFunction<SubscriptionEvent>... functions) { return (ev) -> { if (Objects.isNull(ev)) { return null; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/SubscriptionPrefetchingTabletQueue.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/SubscriptionPrefetchingTabletQueue.java index 755826f4ced..0f23dcc2522 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/SubscriptionPrefetchingTabletQueue.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/SubscriptionPrefetchingTabletQueue.java @@ -31,7 +31,6 @@ import org.apache.iotdb.rpc.subscription.payload.poll.SubscriptionPollResponseTy import org.apache.iotdb.rpc.subscription.payload.poll.TabletsPayload; import org.apache.tsfile.utils.Pair; -import org.checkerframework.checker.nullness.qual.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,7 +69,7 @@ public class SubscriptionPrefetchingTabletQueue extends SubscriptionPrefetchingQ } } - private @NonNull SubscriptionEvent pollTabletsInternal( + private SubscriptionEvent pollTabletsInternal( final String consumerId, final SubscriptionCommitContext commitContext, final int offset) { final AtomicReference<SubscriptionEvent> eventRef = new AtomicReference<>(); inFlightEvents.compute( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/SubscriptionPrefetchingTsFileQueue.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/SubscriptionPrefetchingTsFileQueue.java index 14e8c27902c..076a8f54315 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/SubscriptionPrefetchingTsFileQueue.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/SubscriptionPrefetchingTsFileQueue.java @@ -33,7 +33,6 @@ import org.apache.iotdb.rpc.subscription.payload.poll.SubscriptionPollResponse; import org.apache.iotdb.rpc.subscription.payload.poll.SubscriptionPollResponseType; import org.apache.tsfile.utils.Pair; -import org.checkerframework.checker.nullness.qual.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -74,7 +73,7 @@ public class SubscriptionPrefetchingTsFileQueue extends SubscriptionPrefetchingQ } } - public @NonNull SubscriptionEvent pollTsFileInternal( + public SubscriptionEvent pollTsFileInternal( final String consumerId, final SubscriptionCommitContext commitContext, final long writingOffset) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/event/batch/SubscriptionPipeEventBatch.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/event/batch/SubscriptionPipeEventBatch.java index fe1b280f16c..d25573add6b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/event/batch/SubscriptionPipeEventBatch.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/event/batch/SubscriptionPipeEventBatch.java @@ -25,7 +25,6 @@ import org.apache.iotdb.db.subscription.event.SubscriptionEvent; import org.apache.iotdb.pipe.api.event.dml.insertion.TabletInsertionEvent; import org.apache.iotdb.pipe.api.event.dml.insertion.TsFileInsertionEvent; -import org.checkerframework.checker.nullness.qual.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -88,8 +87,7 @@ public abstract class SubscriptionPipeEventBatch { * @return {@code true} if there are subscription events consumed. */ protected synchronized boolean onEvent( - final @NonNull EnrichedEvent event, final Consumer<SubscriptionEvent> consumer) - throws Exception { + final EnrichedEvent event, final Consumer<SubscriptionEvent> consumer) throws Exception { if (event instanceof TabletInsertionEvent) { onTabletInsertionEvent((TabletInsertionEvent) event); enrichedEvents.add(event); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/event/batch/SubscriptionPipeEventBatches.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/event/batch/SubscriptionPipeEventBatches.java index 17debfc4b48..459682fe4ce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/event/batch/SubscriptionPipeEventBatches.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/event/batch/SubscriptionPipeEventBatches.java @@ -26,7 +26,6 @@ import org.apache.iotdb.db.subscription.broker.SubscriptionPrefetchingTsFileQueu import org.apache.iotdb.db.subscription.event.SubscriptionEvent; import com.google.common.collect.ImmutableList; -import org.checkerframework.checker.nullness.qual.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -93,8 +92,7 @@ public class SubscriptionPipeEventBatches { /** * @return {@code true} if there are subscription events consumed. */ - public boolean onEvent( - final @NonNull EnrichedEvent event, final Consumer<SubscriptionEvent> consumer) + public boolean onEvent(final EnrichedEvent event, final Consumer<SubscriptionEvent> consumer) throws Exception { final int regionId = event.getCommitterKey().getRegionId(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/event/response/SubscriptionEventTsFileResponse.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/event/response/SubscriptionEventTsFileResponse.java index ee3fe2302f4..e8def6da381 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/event/response/SubscriptionEventTsFileResponse.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/event/response/SubscriptionEventTsFileResponse.java @@ -36,7 +36,6 @@ import org.apache.iotdb.rpc.subscription.payload.poll.SubscriptionPollResponse; import org.apache.iotdb.rpc.subscription.payload.poll.SubscriptionPollResponseType; import org.apache.thrift.annotation.Nullable; -import org.checkerframework.checker.nullness.qual.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -164,7 +163,7 @@ public class SubscriptionEventTsFileResponse extends SubscriptionEventExtendable return Optional.empty(); } - private @NonNull CachedSubscriptionPollResponse generateResponseWithPieceOrSealPayload( + private CachedSubscriptionPollResponse generateResponseWithPieceOrSealPayload( final long writingOffset) throws IOException, InterruptedException, PipeRuntimeOutOfMemoryCriticalException { final long tsFileLength = tsFile.length(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/metric/SubscriptionPrefetchingQueueMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/metric/SubscriptionPrefetchingQueueMetrics.java index 4e712fb2972..aa061cc8ff3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/metric/SubscriptionPrefetchingQueueMetrics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/metric/SubscriptionPrefetchingQueueMetrics.java @@ -29,7 +29,6 @@ import org.apache.iotdb.metrics.utils.MetricLevel; import org.apache.iotdb.metrics.utils.MetricType; import com.google.common.collect.ImmutableSet; -import org.checkerframework.checker.nullness.qual.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,7 +71,7 @@ public class SubscriptionPrefetchingQueueMetrics implements IMetricSet { //////////////////////////// register & deregister //////////////////////////// - public void register(@NonNull final SubscriptionPrefetchingQueue prefetchingQueue) { + public void register(final SubscriptionPrefetchingQueue prefetchingQueue) { final String id = prefetchingQueue.getPrefetchingQueueId(); prefetchingQueueMap.putIfAbsent(id, prefetchingQueue); if (Objects.nonNull(metricService)) { diff --git a/iotdb-core/node-commons/pom.xml b/iotdb-core/node-commons/pom.xml index 5c5cf963a9c..5d819160e49 100644 --- a/iotdb-core/node-commons/pom.xml +++ b/iotdb-core/node-commons/pom.xml @@ -172,10 +172,6 @@ <artifactId>reflections</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.checkerframework</groupId> - <artifactId>checker-qual</artifactId> - </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/subscription/meta/consumer/ConsumerGroupMeta.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/subscription/meta/consumer/ConsumerGroupMeta.java index 728f584d92b..4393ef8a6cf 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/subscription/meta/consumer/ConsumerGroupMeta.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/subscription/meta/consumer/ConsumerGroupMeta.java @@ -24,7 +24,6 @@ import org.apache.iotdb.rpc.subscription.exception.SubscriptionException; import org.apache.thrift.annotation.Nullable; import org.apache.tsfile.utils.PublicBAOS; import org.apache.tsfile.utils.ReadWriteIOUtils; -import org.checkerframework.checker.nullness.qual.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -263,7 +262,7 @@ public class ConsumerGroupMeta { } private Set<String> removeSubscriptionInternal( - @NonNull final String consumerId, final Set<String> topics) { + final String consumerId, final Set<String> topics) { if (!consumerIdToConsumerMeta.containsKey(consumerId)) { throw new SubscriptionException( String.format( diff --git a/pom.xml b/pom.xml index 1c01f72b1a3..ad4aedcdbeb 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,6 @@ <!-- This was the last version to support Java 8 --> <caffeine.version>2.9.3</caffeine.version> <cglib.version>3.3.0</cglib.version> - <checker-qual.version>3.38.0</checker-qual.version> <cmake.build.type>Release</cmake.build.type> <commons-cli.version>1.5.0</commons-cli.version> <commons-codec.version>1.16.1</commons-codec.version> @@ -416,11 +415,6 @@ <artifactId>stack-server</artifactId> <version>${milo.version}</version> </dependency> - <dependency> - <groupId>org.checkerframework</groupId> - <artifactId>checker-qual</artifactId> - <version>${checker-qual.version}</version> - </dependency> <!-- TODO: Deprecated: Use Airline 2 or Picocli instead --> <dependency> <groupId>io.airlift</groupId> @@ -433,11 +427,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>io.airlift</groupId> - <artifactId>concurrent</artifactId> - <version>${airlift.version}</version> - </dependency> <dependency> <groupId>org.eclipse.milo</groupId> <artifactId>sdk-server</artifactId>
