This is an automated email from the ASF dual-hosted git repository.
mmerli 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 009bc29 merge windowing code back into function instance (#4332)
009bc29 is described below
commit 009bc292e487089f8f86b654de6718f899f1a8fd
Author: Boyang Jerry Peng <[email protected]>
AuthorDate: Thu May 23 23:54:49 2019 -0700
merge windowing code back into function instance (#4332)
---
pulsar-functions/instance/pom.xml | 6 --
.../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
pulsar-functions/pom.xml | 1 -
pulsar-functions/windowing/pom.xml | 65 ----------------------
31 files changed, 72 deletions(-)
diff --git a/pulsar-functions/instance/pom.xml
b/pulsar-functions/instance/pom.xml
index 3c5afc3..04b3c18 100644
--- a/pulsar-functions/instance/pom.xml
+++ b/pulsar-functions/instance/pom.xml
@@ -78,12 +78,6 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-functions-windowing</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>stream-storage-java-client</artifactId>
<exclusions>
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/DefaultEvictionContext.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/DefaultEvictionContext.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/DefaultEvictionContext.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/DefaultEvictionContext.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/Event.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/Event.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/Event.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/Event.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/EventImpl.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EventImpl.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/EventImpl.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EventImpl.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/EvictionContext.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EvictionContext.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/EvictionContext.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EvictionContext.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/EvictionPolicy.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EvictionPolicy.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/EvictionPolicy.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EvictionPolicy.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/TimestampExtractor.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TimestampExtractor.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/TimestampExtractor.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TimestampExtractor.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/TriggerHandler.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TriggerHandler.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/TriggerHandler.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TriggerHandler.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/TriggerPolicy.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TriggerPolicy.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/TriggerPolicy.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TriggerPolicy.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEvent.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEvent.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEvent.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEvent.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEventGenerator.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEventGenerator.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEventGenerator.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEventGenerator.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/Window.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/Window.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/Window.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/Window.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowContextImpl.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowContextImpl.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowContextImpl.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowContextImpl.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutor.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutor.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutor.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutor.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowImpl.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowImpl.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowImpl.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowImpl.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowLifecycleListener.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowLifecycleListener.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowLifecycleListener.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowLifecycleListener.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowManager.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowManager.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowManager.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowManager.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowUtils.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowUtils.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/WindowUtils.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowUtils.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/evictors/CountEvictionPolicy.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/CountEvictionPolicy.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/evictors/CountEvictionPolicy.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/CountEvictionPolicy.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/evictors/TimeEvictionPolicy.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/TimeEvictionPolicy.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/evictors/TimeEvictionPolicy.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/TimeEvictionPolicy.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkCountEvictionPolicy.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkCountEvictionPolicy.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkCountEvictionPolicy.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkCountEvictionPolicy.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkTimeEvictionPolicy.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkTimeEvictionPolicy.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkTimeEvictionPolicy.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkTimeEvictionPolicy.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/triggers/CountTriggerPolicy.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/CountTriggerPolicy.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/triggers/CountTriggerPolicy.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/CountTriggerPolicy.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/triggers/TimeTriggerPolicy.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/TimeTriggerPolicy.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/triggers/TimeTriggerPolicy.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/TimeTriggerPolicy.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkCountTriggerPolicy.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkCountTriggerPolicy.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkCountTriggerPolicy.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkCountTriggerPolicy.java
diff --git
a/pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkTimeTriggerPolicy.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkTimeTriggerPolicy.java
similarity index 100%
rename from
pulsar-functions/windowing/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkTimeTriggerPolicy.java
rename to
pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkTimeTriggerPolicy.java
diff --git
a/pulsar-functions/windowing/src/test/java/org/apache/pulsar/functions/windowing/WaterMarkEventGeneratorTest.java
b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WaterMarkEventGeneratorTest.java
similarity index 100%
rename from
pulsar-functions/windowing/src/test/java/org/apache/pulsar/functions/windowing/WaterMarkEventGeneratorTest.java
rename to
pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WaterMarkEventGeneratorTest.java
diff --git
a/pulsar-functions/windowing/src/test/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutorTest.java
b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutorTest.java
similarity index 100%
rename from
pulsar-functions/windowing/src/test/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutorTest.java
rename to
pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutorTest.java
diff --git
a/pulsar-functions/windowing/src/test/java/org/apache/pulsar/functions/windowing/WindowManagerTest.java
b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WindowManagerTest.java
similarity index 100%
rename from
pulsar-functions/windowing/src/test/java/org/apache/pulsar/functions/windowing/WindowManagerTest.java
rename to
pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WindowManagerTest.java
diff --git a/pulsar-functions/pom.xml b/pulsar-functions/pom.xml
index 4ec29fc..0f0219a 100644
--- a/pulsar-functions/pom.xml
+++ b/pulsar-functions/pom.xml
@@ -41,7 +41,6 @@
<module>runtime-all</module>
<module>worker</module>
<module>secrets</module>
- <module>windowing</module>
</modules>
</project>
diff --git a/pulsar-functions/windowing/pom.xml
b/pulsar-functions/windowing/pom.xml
deleted file mode 100644
index d9f724f..0000000
--- a/pulsar-functions/windowing/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<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";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-functions</artifactId>
- <version>2.4.0-SNAPSHOT</version>
- </parent>
-
- <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>
