merge windowing code back into function instance (apache#4332)

ouyanghuangzheng · May 24, 2019 · 009bc29 · 009bc29
1 parent a81d234
commit 009bc29
Show file tree

Hide file tree

Showing 31 changed files with 0 additions and 72 deletions.
diff --git a/pulsar-functions/instance/pom.xml b/pulsar-functions/instance/pom.xml
@@ -77,12 +77,6 @@
       <version>${project.version}</version>
     </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>

diff --git a/...ons/windowing/DefaultEvictionContext.java → ...ons/windowing/DefaultEvictionContext.java b/...ons/windowing/DefaultEvictionContext.java → ...ons/windowing/DefaultEvictionContext.java
diff --git a/...che/pulsar/functions/windowing/Event.java → ...che/pulsar/functions/windowing/Event.java b/...che/pulsar/functions/windowing/Event.java → ...che/pulsar/functions/windowing/Event.java
diff --git a/...pulsar/functions/windowing/EventImpl.java → ...pulsar/functions/windowing/EventImpl.java b/...pulsar/functions/windowing/EventImpl.java → ...pulsar/functions/windowing/EventImpl.java
diff --git a/.../functions/windowing/EvictionContext.java → .../functions/windowing/EvictionContext.java b/.../functions/windowing/EvictionContext.java → .../functions/windowing/EvictionContext.java
diff --git a/...r/functions/windowing/EvictionPolicy.java → ...r/functions/windowing/EvictionPolicy.java b/...r/functions/windowing/EvictionPolicy.java → ...r/functions/windowing/EvictionPolicy.java
diff --git a/...nctions/windowing/TimestampExtractor.java → ...nctions/windowing/TimestampExtractor.java b/...nctions/windowing/TimestampExtractor.java → ...nctions/windowing/TimestampExtractor.java
diff --git a/...r/functions/windowing/TriggerHandler.java → ...r/functions/windowing/TriggerHandler.java b/...r/functions/windowing/TriggerHandler.java → ...r/functions/windowing/TriggerHandler.java
diff --git a/...ar/functions/windowing/TriggerPolicy.java → ...ar/functions/windowing/TriggerPolicy.java b/...ar/functions/windowing/TriggerPolicy.java → ...ar/functions/windowing/TriggerPolicy.java
diff --git a/...r/functions/windowing/WaterMarkEvent.java → ...r/functions/windowing/WaterMarkEvent.java b/...r/functions/windowing/WaterMarkEvent.java → ...r/functions/windowing/WaterMarkEvent.java
diff --git a/...ns/windowing/WaterMarkEventGenerator.java → ...ns/windowing/WaterMarkEventGenerator.java b/...ns/windowing/WaterMarkEventGenerator.java → ...ns/windowing/WaterMarkEventGenerator.java
diff --git a/...he/pulsar/functions/windowing/Window.java → ...he/pulsar/functions/windowing/Window.java b/...he/pulsar/functions/windowing/Window.java → ...he/pulsar/functions/windowing/Window.java
diff --git a/...unctions/windowing/WindowContextImpl.java → ...unctions/windowing/WindowContextImpl.java b/...unctions/windowing/WindowContextImpl.java → ...unctions/windowing/WindowContextImpl.java
diff --git a/...ons/windowing/WindowFunctionExecutor.java → ...ons/windowing/WindowFunctionExecutor.java b/...ons/windowing/WindowFunctionExecutor.java → ...ons/windowing/WindowFunctionExecutor.java
diff --git a/...ulsar/functions/windowing/WindowImpl.java → ...ulsar/functions/windowing/WindowImpl.java b/...ulsar/functions/windowing/WindowImpl.java → ...ulsar/functions/windowing/WindowImpl.java
diff --git a/...ns/windowing/WindowLifecycleListener.java → ...ns/windowing/WindowLifecycleListener.java b/...ns/windowing/WindowLifecycleListener.java → ...ns/windowing/WindowLifecycleListener.java
diff --git a/...ar/functions/windowing/WindowManager.java → ...ar/functions/windowing/WindowManager.java b/...ar/functions/windowing/WindowManager.java → ...ar/functions/windowing/WindowManager.java
diff --git a/...lsar/functions/windowing/WindowUtils.java → ...lsar/functions/windowing/WindowUtils.java b/...lsar/functions/windowing/WindowUtils.java → ...lsar/functions/windowing/WindowUtils.java
diff --git a/...ndowing/evictors/CountEvictionPolicy.java → ...ndowing/evictors/CountEvictionPolicy.java b/...ndowing/evictors/CountEvictionPolicy.java → ...ndowing/evictors/CountEvictionPolicy.java
diff --git a/...indowing/evictors/TimeEvictionPolicy.java → ...indowing/evictors/TimeEvictionPolicy.java b/...indowing/evictors/TimeEvictionPolicy.java → ...indowing/evictors/TimeEvictionPolicy.java
diff --git a/...victors/WatermarkCountEvictionPolicy.java → ...victors/WatermarkCountEvictionPolicy.java b/...victors/WatermarkCountEvictionPolicy.java → ...victors/WatermarkCountEvictionPolicy.java
diff --git a/...evictors/WatermarkTimeEvictionPolicy.java → ...evictors/WatermarkTimeEvictionPolicy.java b/...evictors/WatermarkTimeEvictionPolicy.java → ...evictors/WatermarkTimeEvictionPolicy.java
diff --git a/...indowing/triggers/CountTriggerPolicy.java → ...indowing/triggers/CountTriggerPolicy.java b/...indowing/triggers/CountTriggerPolicy.java → ...indowing/triggers/CountTriggerPolicy.java
diff --git a/...windowing/triggers/TimeTriggerPolicy.java → ...windowing/triggers/TimeTriggerPolicy.java b/...windowing/triggers/TimeTriggerPolicy.java → ...windowing/triggers/TimeTriggerPolicy.java
diff --git a/...triggers/WatermarkCountTriggerPolicy.java → ...triggers/WatermarkCountTriggerPolicy.java b/...triggers/WatermarkCountTriggerPolicy.java → ...triggers/WatermarkCountTriggerPolicy.java
diff --git a/.../triggers/WatermarkTimeTriggerPolicy.java → .../triggers/WatermarkTimeTriggerPolicy.java b/.../triggers/WatermarkTimeTriggerPolicy.java → .../triggers/WatermarkTimeTriggerPolicy.java
diff --git a/...indowing/WaterMarkEventGeneratorTest.java → ...indowing/WaterMarkEventGeneratorTest.java b/...indowing/WaterMarkEventGeneratorTest.java → ...indowing/WaterMarkEventGeneratorTest.java
diff --git a/...windowing/WindowFunctionExecutorTest.java → ...windowing/WindowFunctionExecutorTest.java b/...windowing/WindowFunctionExecutorTest.java → ...windowing/WindowFunctionExecutorTest.java
diff --git a/...unctions/windowing/WindowManagerTest.java → ...unctions/windowing/WindowManagerTest.java b/...unctions/windowing/WindowManagerTest.java → ...unctions/windowing/WindowManagerTest.java
diff --git 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