This is an automated email from the ASF dual-hosted git repository. karp pushed a commit to branch snapshot-1.0.4 in repository https://gitbox.apache.org/repos/asf/rocketmq-streams.git
commit 840c956f5b971b195fe83f2194d29ac36068026e Merge: a5396881 81bf080a Author: 维章 <[email protected]> AuthorDate: Thu May 26 10:50:47 2022 +0800 feat(db) remove db dependency besides channel-db pom.xml | 53 +-- rocketmq-streams-cep/pom.xml | 64 --- rocketmq-streams-cep/src/test/resources/log4j.xml | 36 -- rocketmq-streams-channel-kafka/pom.xml | 32 -- .../streams/kafka/KafkaChannelBuilder.java | 91 ---- .../apache/rocketmq/streams/kafka/KafkaSplit.java | 55 --- .../rocketmq/streams/kafka/sink/KafkaSink.java | 200 --------- .../rocketmq/streams/kafka/source/KafkaSource.java | 238 ---------- .../rocketmq/streams/kafka/KafkaChannelTest.java | 104 ----- .../src/test/resources/log4j.xml | 20 - rocketmq-streams-clients/pom.xml | 8 - .../streams/client/ScheduledStreamBuilder.java | 66 --- .../rocketmq/streams/client/ScheduledTask.java | 69 --- .../streams/client/source/DataStreamSource.java | 26 -- .../streams/client/transform/DataStream.java | 111 ----- .../streams/client/transform/JoinStream.java | 76 +--- rocketmq-streams-connectors/pom.xml | 47 -- .../streams/connectors/IBoundedSource.java | 32 -- .../streams/connectors/IBoundedSourceReader.java | 26 -- .../streams/connectors/IScheduleCallback.java | 24 - .../connectors/balance/AbstractBalance.java | 207 --------- .../streams/connectors/balance/IBalanceTask.java | 24 - .../streams/connectors/balance/ISourceBalance.java | 60 --- .../streams/connectors/balance/SplitChanged.java | 55 --- .../connectors/balance/impl/LeaseBalanceImpl.java | 144 ------ .../streams/connectors/model/PullMessage.java | 50 --- .../streams/connectors/model/ReaderStatus.java | 120 ----- .../streams/connectors/reader/DBScanReader.java | 269 ------------ .../streams/connectors/reader/ISplitReader.java | 96 ---- .../connectors/reader/SplitCloseFuture.java | 83 ---- .../connectors/source/AbstractPullSource.java | 312 ------------- .../source/CycleDynamicMultipleDBScanSource.java | 213 --------- .../source/DynamicMultipleDBScanSource.java | 190 -------- .../streams/connectors/source/IPullSource.java | 60 --- .../connectors/source/MutilBatchTaskSource.java | 158 ------- .../streams/connectors/source/SourceInstance.java | 37 -- .../source/filter/AbstractPatternFilter.java | 38 -- .../source/filter/BoundedPatternFilter.java | 53 --- .../source/filter/CyclePatternFilter.java | 173 -------- .../connectors/source/filter/CyclePeriod.java | 222 ---------- .../connectors/source/filter/CycleSchedule.java | 236 ---------- .../source/filter/CycleScheduleFilter.java | 37 -- .../source/filter/DataFormatPatternFilter.java | 106 ----- .../connectors/source/filter/PatternFilter.java | 41 -- rocketmq-streams-dim/pom.xml | 53 --- .../apache/rocketmq/streams/dim/DimComponent.java | 62 --- .../streams/dim/builder/AbstractDimParser.java | 52 --- .../streams/dim/builder/DBDimSQLParser.java | 84 ---- .../rocketmq/streams/dim/builder/DimBuilder.java | 94 ---- .../streams/dim/builder/FileDimSQLParser.java | 42 -- .../streams/dim/builder/IDimSQLParser.java | 30 -- .../streams/dim/builder/SQLParserFactory.java | 36 -- .../function/expression/InExpressionResource.java | 78 ---- .../expression/NotInExpressionResource.java | 44 -- .../dim/function/script/IntelligenceFunction.java | 79 ---- .../script/IntelligenceNameListFunction.java | 24 - .../dim/function/script/NameListFunction.java | 202 --------- .../rocketmq/streams/dim/index/DimIndex.java | 204 --------- .../rocketmq/streams/dim/index/IndexExecutor.java | 209 --------- .../intelligence/AbstractIntelligenceCache.java | 404 ----------------- .../dim/intelligence/AccountIntelligenceCache.java | 76 ---- .../dim/intelligence/DomainIntelligenceCache.java | 82 ---- .../dim/intelligence/IPIntelligenceCache.java | 107 ----- .../dim/intelligence/URLIntelligenceCache.java | 79 ---- .../rocketmq/streams/dim/model/AbstractDim.java | 489 --------------------- .../streams/dim/model/AbstractProcShareDim.java | 109 ----- .../apache/rocketmq/streams/dim/model/DBDim.java | 160 ------- .../apache/rocketmq/streams/dim/model/FileDim.java | 58 --- .../rocketmq/streams/dim/model/IDataCache.java | 26 -- .../rocketmq/streams/dim/model/IDimSource.java | 37 -- .../rocketmq/streams/dim/service/IDimService.java | 65 --- .../streams/dim/service/impl/DimServiceImpl.java | 90 ---- .../com/aliyun/service/ConfigureLoaderTest.java | 34 -- .../com/aliyun/service/ExpressionExecutorTest.java | 79 ---- .../java/com/aliyun/service/JsonParserTest.java | 40 -- .../com/aliyun/service/NameListFunctionTest.java | 99 ----- .../java/com/aliyun/service/TableCompressTest.java | 145 ------ .../examples/join/RocketmqDimJoinExample.java | 33 -- rocketmq-streams-filter/pom.xml | 4 - .../streams/filter/builder/ExpressionBuilder.java | 2 +- .../streams/filter/builder/RuleBuilder.java | 27 +- .../streams/filter/context/RuleContext.java | 55 +-- .../rocketmq/streams/filter/operator/Rule.java | 26 +- .../streams/filter/operator/action/Action.java | 9 - rocketmq-streams-lease/pom.xml | 40 -- .../rocketmq/streams/lease/LeaseComponent.java | 102 ----- .../rocketmq/streams/lease/model/LeaseInfo.java | 127 ------ .../streams/lease/service/ILeaseGetCallback.java | 30 -- .../streams/lease/service/ILeaseService.java | 134 ------ .../streams/lease/service/ILeaseStorage.java | 71 --- .../streams/lease/service/ILeaseStorasge.java | 63 --- .../lease/service/impl/BasedLesaseImpl.java | 402 ----------------- .../lease/service/impl/LeaseServiceImpl.java | 279 ------------ .../streams/lease/service/impl/MockLeaseImpl.java | 90 ---- .../lease/service/storages/DBLeaseStorage.java | 228 ---------- .../rocketmq/streams/lease/LeaseComponentTest.java | 117 ----- .../src/test/resources/log4j.xml | 36 -- rocketmq-streams-schedule/pom.xml | 58 --- .../streams/schedule/ScheduleComponent.java | 64 --- .../schedule/job/ConfigurableExecutorJob.java | 55 --- .../streams/schedule/service/IScheduleService.java | 89 ---- .../schedule/service/impl/ScheduleServiceImpl.java | 263 ----------- .../stream/schedule/ScheduleComponentTest.java | 62 --- .../src/test/resources/log4j.xml | 36 -- rocketmq-streams-window/pom.xml | 11 +- .../window/operator/join/ExpressionMatcher.java | 141 ++++++ .../streams/window/operator/join/JoinWindow.java | 4 +- .../streams/window/state/impl/WindowValue.java | 2 - 108 files changed, 169 insertions(+), 10325 deletions(-) diff --cc pom.xml index 2d139613,069531da..2349b35e --- a/pom.xml +++ b/pom.xml @@@ -33,9 -31,58 +33,8 @@@ <packaging>pom</packaging> <url>https://rocketmq.apache.org/</url> - - <scm> - <url>[email protected]:apache/rocketmq-streams.git</url> - <connection>scm:git:[email protected]:apache/rocketmq-streams.git</connection> - <developerConnection>scm:git:[email protected]:apache/rocketmq-streams.git</developerConnection> - <tag>1.0.0-preview</tag> - </scm> - - <mailingLists> - <mailingList> - <name>Development List</name> - <subscribe>[email protected]</subscribe> - <unsubscribe>[email protected]</unsubscribe> - <post>[email protected]</post> - </mailingList> - <mailingList> - <name>User List</name> - <subscribe>[email protected]</subscribe> - <unsubscribe>[email protected]</unsubscribe> - <post>[email protected]</post> - </mailingList> - <mailingList> - <name>Commits List</name> - <subscribe>[email protected]</subscribe> - <unsubscribe>[email protected]</unsubscribe> - <post>[email protected]</post> - </mailingList> - </mailingLists> - - <developers> - <developer> - <id>Apache RocketMQ</id> - <name>Apache RocketMQ of ASF</name> - <url>https://rocketmq.apache.org/</url> - </developer> - </developers> - - <organization> - <name>Apache Software Foundation</name> - <url>http://www.apache.org</url> - </organization> - - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0</url> - <distribution>repo</distribution> - </license> - </licenses> - <modules> <module>rocketmq-streams-commons</module> - <module>rocketmq-streams-dim</module> <module>rocketmq-streams-transport-minio</module> <module>rocketmq-streams-script</module> <module>rocketmq-streams-configurable</module> @@@ -205,11 -259,11 +199,6 @@@ <artifactId>rocketmq-streams-commons</artifactId> <version>${project.version}</version> </dependency> -- <dependency> -- <groupId>org.apache.rocketmq</groupId> -- <artifactId>rocketmq-streams-channel-es</artifactId> -- <version>${project.version}</version> -- </dependency> <dependency> <groupId>org.apache.rocketmq</groupId> <artifactId>rocketmq-streams-channel-mqtt</artifactId> @@@ -255,11 -304,11 +239,6 @@@ <artifactId>rocketmq-streams-db-operator</artifactId> <version>${project.version}</version> </dependency> -- <dependency> -- <groupId>org.apache.rocketmq</groupId> -- <artifactId>rocketmq-streams-dim</artifactId> -- <version>${project.version}</version> -- </dependency> <dependency> <groupId>org.apache.rocketmq</groupId> <artifactId>rocketmq-streams-filter</artifactId> @@@ -290,11 -330,11 +260,6 @@@ </exclusion> </exclusions> </dependency> -- <dependency> -- <groupId>org.apache.rocketmq</groupId> -- <artifactId>rocketmq-streams-script-python</artifactId> -- <version>${project.version}</version> -- </dependency> <dependency> <groupId>org.apache.rocketmq</groupId> <artifactId>rocketmq-streams-serviceloader</artifactId> @@@ -325,16 -365,7 +290,6 @@@ <artifactId>rocketmq-streams-channel-rocketmq</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.rocketmq</groupId> - <artifactId>rocketmq-streams-channel-kafka</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.rocketmq</groupId> - <artifactId>rocketmq-streams-connectors</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.apache.rocketmq</groupId> <artifactId>rocketmq-streams-examples</artifactId> @@@ -366,12 -397,12 +321,6 @@@ <version>${rocketmq.version}</version> </dependency> -- <dependency> -- <groupId>org.apache.rocketmq</groupId> -- <artifactId>rocketmq-tools</artifactId> -- <version>${rocketmq.version}</version> -- </dependency> -- <!-- ================================================= --> <!-- tool library --> <!-- ================================================= --> diff --cc rocketmq-streams-clients/pom.xml index 2d15efce,ff0e4cb0..e24e55f3 --- a/rocketmq-streams-clients/pom.xml +++ b/rocketmq-streams-clients/pom.xml @@@ -40,11 -38,6 +40,7 @@@ <groupId>org.apache.rocketmq</groupId> <artifactId>rocketmq-streams-channel-mqtt</artifactId> </dependency> + - <dependency> - <groupId>org.apache.rocketmq</groupId> - <artifactId>rocketmq-streams-channel-kafka</artifactId> - </dependency> <dependency> <groupId>org.apache.rocketmq</groupId> <artifactId>rocketmq-streams-channel-db</artifactId> diff --cc rocketmq-streams-filter/src/main/java/org/apache/rocketmq/streams/filter/context/RuleContext.java index 865683c6,89a398e7..55190561 --- a/rocketmq-streams-filter/src/main/java/org/apache/rocketmq/streams/filter/context/RuleContext.java +++ b/rocketmq-streams-filter/src/main/java/org/apache/rocketmq/streams/filter/context/RuleContext.java @@@ -36,11 -24,8 +24,7 @@@ import org.apache.rocketmq.streams.comm import org.apache.rocketmq.streams.common.context.AbstractContext; import org.apache.rocketmq.streams.common.context.IMessage; import org.apache.rocketmq.streams.common.context.Message; - import org.apache.rocketmq.streams.common.metadata.MetaData; - import org.apache.rocketmq.streams.common.metadata.MetaDataAdapter; import org.apache.rocketmq.streams.common.monitor.IMonitor; --import org.apache.rocketmq.streams.common.monitor.TopologyFilterMonitor; - import org.apache.rocketmq.streams.db.driver.JDBCDriver; import org.apache.rocketmq.streams.filter.function.expression.ExpressionFunction; import org.apache.rocketmq.streams.filter.operator.Rule; import org.apache.rocketmq.streams.filter.operator.action.Action; @@@ -50,6 -34,17 +34,19 @@@ import org.apache.rocketmq.streams.filt import org.apache.rocketmq.streams.script.function.model.FunctionConfigure; import org.apache.rocketmq.streams.script.function.service.impl.ScanFunctionService; + import java.io.Serializable; ++import java.util.ArrayList; ++import java.util.List; + import java.util.Properties; + import java.util.Vector; + import java.util.concurrent.ConcurrentHashMap; + import java.util.concurrent.ConcurrentMap; + import java.util.concurrent.ExecutorService; + import java.util.concurrent.LinkedBlockingQueue; + import java.util.concurrent.ThreadFactory; + import java.util.concurrent.ThreadPoolExecutor; + import java.util.concurrent.TimeUnit; + public class RuleContext extends AbstractContext<Message> implements Serializable { private static final Log LOG = LogFactory.getLog(RuleContext.class); diff --cc rocketmq-streams-filter/src/main/java/org/apache/rocketmq/streams/filter/operator/Rule.java index 5ae02236,ab7ed69f..5c75df17 --- a/rocketmq-streams-filter/src/main/java/org/apache/rocketmq/streams/filter/operator/Rule.java +++ b/rocketmq-streams-filter/src/main/java/org/apache/rocketmq/streams/filter/operator/Rule.java @@@ -46,9 -44,7 +46,8 @@@ import org.apache.rocketmq.streams.comm import org.apache.rocketmq.streams.common.topology.model.AbstractRule; import org.apache.rocketmq.streams.common.topology.stages.FilterChainStage; import org.apache.rocketmq.streams.common.utils.TraceUtil; - import org.apache.rocketmq.streams.db.driver.JDBCDriver; import org.apache.rocketmq.streams.filter.FilterComponent; +import org.apache.rocketmq.streams.filter.context.RuleContext; import org.apache.rocketmq.streams.filter.operator.action.Action; import org.apache.rocketmq.streams.filter.operator.action.impl.SinkAction; import org.apache.rocketmq.streams.filter.operator.expression.Expression; diff --cc rocketmq-streams-window/src/main/java/org/apache/rocketmq/streams/window/state/impl/WindowValue.java index 029ec495,c8534541..7d7285c0 --- a/rocketmq-streams-window/src/main/java/org/apache/rocketmq/streams/window/state/impl/WindowValue.java +++ b/rocketmq-streams-window/src/main/java/org/apache/rocketmq/streams/window/state/impl/WindowValue.java @@@ -41,12 -38,9 +41,10 @@@ import org.apache.rocketmq.streams.comm import org.apache.rocketmq.streams.common.utils.Base64Utils; import org.apache.rocketmq.streams.common.utils.DataTypeUtil; import org.apache.rocketmq.streams.common.utils.DateUtil; - import org.apache.rocketmq.streams.common.utils.MapKeyUtil; import org.apache.rocketmq.streams.common.utils.ReflectUtil; +import org.apache.rocketmq.streams.common.utils.SerializeUtil; import org.apache.rocketmq.streams.common.utils.StringUtil; import org.apache.rocketmq.streams.common.utils.TraceUtil; - import org.apache.rocketmq.streams.db.driver.orm.ORMUtil; import org.apache.rocketmq.streams.script.context.FunctionContext; import org.apache.rocketmq.streams.script.operator.impl.AggregationScript; import org.apache.rocketmq.streams.script.operator.impl.FunctionScript;
