This is an automated email from the ASF dual-hosted git repository. sanjeevrk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push: new 3aeafc1 Consolidated all windowing code into its own module (#3583) 3aeafc1 is described below commit 3aeafc185603a76515de1a904068806dd872a740 Author: Sanjeev Kulkarni <sanjee...@gmail.com> AuthorDate: Tue Feb 12 15:56:56 2019 -0800 Consolidated all windowing code into its own module (#3583) * moved all windowing related code into its own submodule. * added pom --- pulsar-functions/pom.xml | 1 + pulsar-functions/{ => windowing}/pom.xml | 53 +++++++++++++++------- .../windowing/DefaultEvictionContext.java | 0 .../apache/pulsar/functions/windowing/Event.java | 0 .../pulsar/functions/windowing/EventImpl.java | 0 .../functions/windowing/EvictionContext.java | 0 .../pulsar/functions/windowing/EvictionPolicy.java | 0 .../functions/windowing/TimestampExtractor.java | 0 .../pulsar/functions/windowing/TriggerHandler.java | 0 .../pulsar/functions/windowing/TriggerPolicy.java | 0 .../pulsar/functions/windowing/WaterMarkEvent.java | 0 .../windowing/WaterMarkEventGenerator.java | 0 .../apache/pulsar/functions/windowing/Window.java | 0 .../functions/windowing/WindowContextImpl.java | 0 .../windowing/WindowFunctionExecutor.java | 0 .../pulsar/functions/windowing/WindowImpl.java | 0 .../windowing/WindowLifecycleListener.java | 0 .../pulsar/functions/windowing/WindowManager.java | 0 .../pulsar/functions/windowing/WindowUtils.java | 0 .../windowing/evictors/CountEvictionPolicy.java | 0 .../windowing/evictors/TimeEvictionPolicy.java | 0 .../evictors/WatermarkCountEvictionPolicy.java | 0 .../evictors/WatermarkTimeEvictionPolicy.java | 0 .../windowing/triggers/CountTriggerPolicy.java | 0 .../windowing/triggers/TimeTriggerPolicy.java | 0 .../triggers/WatermarkCountTriggerPolicy.java | 0 .../triggers/WatermarkTimeTriggerPolicy.java | 0 .../windowing/WaterMarkEventGeneratorTest.java | 0 .../windowing/WindowFunctionExecutorTest.java | 0 .../functions/windowing/WindowManagerTest.java | 0 30 files changed, 37 insertions(+), 17 deletions(-) diff --git a/pulsar-functions/pom.xml b/pulsar-functions/pom.xml index a101a87..4b58a24 100644 --- a/pulsar-functions/pom.xml +++ b/pulsar-functions/pom.xml @@ -41,6 +41,7 @@ <module>runtime-all</module> <module>worker</module> <module>secrets</module> + <module>windowing</module> </modules> </project> diff --git a/pulsar-functions/pom.xml b/pulsar-functions/windowing/pom.xml similarity index 50% copy from pulsar-functions/pom.xml copy to pulsar-functions/windowing/pom.xml index a101a87..a50fc09 100644 --- a/pulsar-functions/pom.xml +++ b/pulsar-functions/windowing/pom.xml @@ -19,28 +19,47 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> + <parent> <groupId>org.apache.pulsar</groupId> - <artifactId>pulsar</artifactId> + <artifactId>pulsar-functions</artifactId> <version>2.3.0-SNAPSHOT</version> </parent> - <artifactId>pulsar-functions</artifactId> - <name>Pulsar Functions :: Parent</name> - - <modules> - <module>proto</module> - <module>api-java</module> - <module>java-examples</module> - <module>utils</module> - <module>instance</module> - <module>runtime</module> - <module>runtime-all</module> - <module>worker</module> - <module>secrets</module> - </modules> + <artifactId>pulsar-functions-windowing</artifactId> + <name>Pulsar Functions :: Windowing</name> + + <dependencies> + + <!-- logging --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pulsar-functions-utils</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pulsar-functions-api</artifactId> + <version>${project.version}</version> + </dependency> + + + </dependencies> </project> diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/DefaultEvictionContext.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/DefaultEvictionContext.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/DefaultEvictionContext.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/DefaultEvictionContext.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/Event.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/Event.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/Event.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/Event.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EventImpl.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/EventImpl.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EventImpl.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/EventImpl.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EvictionContext.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/EvictionContext.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EvictionContext.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/EvictionContext.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EvictionPolicy.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/EvictionPolicy.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EvictionPolicy.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/EvictionPolicy.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TimestampExtractor.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/TimestampExtractor.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TimestampExtractor.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/TimestampExtractor.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TriggerHandler.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/TriggerHandler.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TriggerHandler.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/TriggerHandler.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TriggerPolicy.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/TriggerPolicy.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TriggerPolicy.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/TriggerPolicy.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEvent.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEvent.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEvent.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEvent.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEventGenerator.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEventGenerator.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEventGenerator.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEventGenerator.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/Window.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/Window.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/Window.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/Window.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowContextImpl.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowContextImpl.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowContextImpl.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowContextImpl.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutor.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutor.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutor.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutor.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowImpl.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowImpl.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowImpl.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowImpl.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowLifecycleListener.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowLifecycleListener.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowLifecycleListener.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowLifecycleListener.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowManager.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowManager.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowManager.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowManager.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowUtils.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowUtils.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowUtils.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowUtils.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/CountEvictionPolicy.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/evictors/CountEvictionPolicy.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/CountEvictionPolicy.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/evictors/CountEvictionPolicy.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/TimeEvictionPolicy.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/evictors/TimeEvictionPolicy.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/TimeEvictionPolicy.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/evictors/TimeEvictionPolicy.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkCountEvictionPolicy.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkCountEvictionPolicy.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkCountEvictionPolicy.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkCountEvictionPolicy.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkTimeEvictionPolicy.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkTimeEvictionPolicy.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkTimeEvictionPolicy.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkTimeEvictionPolicy.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/CountTriggerPolicy.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/triggers/CountTriggerPolicy.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/CountTriggerPolicy.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/triggers/CountTriggerPolicy.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/TimeTriggerPolicy.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/triggers/TimeTriggerPolicy.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/TimeTriggerPolicy.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/triggers/TimeTriggerPolicy.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkCountTriggerPolicy.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkCountTriggerPolicy.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkCountTriggerPolicy.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkCountTriggerPolicy.java diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkTimeTriggerPolicy.java b/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkTimeTriggerPolicy.java similarity index 100% rename from pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkTimeTriggerPolicy.java rename to pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkTimeTriggerPolicy.java diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WaterMarkEventGeneratorTest.java b/pulsar-functions/windowing/src/test/java/org/apache/pulsar/functions/windowing/WaterMarkEventGeneratorTest.java similarity index 100% rename from pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WaterMarkEventGeneratorTest.java rename to pulsar-functions/windowing/src/test/java/org/apache/pulsar/functions/windowing/WaterMarkEventGeneratorTest.java diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutorTest.java b/pulsar-functions/windowing/src/test/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutorTest.java similarity index 100% rename from pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutorTest.java rename to pulsar-functions/windowing/src/test/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutorTest.java diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WindowManagerTest.java b/pulsar-functions/windowing/src/test/java/org/apache/pulsar/functions/windowing/WindowManagerTest.java similarity index 100% rename from pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WindowManagerTest.java rename to pulsar-functions/windowing/src/test/java/org/apache/pulsar/functions/windowing/WindowManagerTest.java