This is an automated email from the ASF dual-hosted git repository.

wiener pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git


The following commit(s) were added to refs/heads/dev by this push:
     new 98006cc  [hotfix] extend Siddhi wrapper to cast timestamps in windows 
to long
98006cc is described below

commit 98006cc4f57f50a40093526ca24bf2411f88e79a
Author: Patrick Wiener <[email protected]>
AuthorDate: Tue Jul 14 22:45:07 2020 +0200

    [hotfix] extend Siddhi wrapper to cast timestamps in windows to long
---
 .../wrapper/siddhi/engine/SiddhiEventEngine.java   | 24 +++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git 
a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/SiddhiEventEngine.java
 
b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/SiddhiEventEngine.java
index 15bd0db..ac9366f 100644
--- 
a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/SiddhiEventEngine.java
+++ 
b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/SiddhiEventEngine.java
@@ -34,6 +34,10 @@ import io.siddhi.core.event.Event;
 import io.siddhi.core.stream.input.InputHandler;
 import io.siddhi.core.stream.output.StreamCallback;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.util.*;
 
 public abstract class SiddhiEventEngine<B extends EventProcessorBindingParams> 
implements
@@ -51,6 +55,8 @@ public abstract class SiddhiEventEngine<B extends 
EventProcessorBindingParams> i
   private Boolean debugMode;
   private SiddhiDebugCallback debugCallback;
 
+  private String timestampField;
+
   private static final Logger LOG = 
LoggerFactory.getLogger(SiddhiEventEngine.class);
 
   public SiddhiEventEngine() {
@@ -76,6 +82,7 @@ public abstract class SiddhiEventEngine<B extends 
EventProcessorBindingParams> i
 
     SiddhiManager siddhiManager = SpSiddhiManager.INSTANCE.getSiddhiManager();
 
+    this.timestampField = 
removeStreamIdFromTimestamp(setTimestamp(parameters));
 
     LOG.info("Configuring event types for graph " + 
parameters.getGraph().getName());
     parameters.getInEventTypes().forEach((key, value) -> {
@@ -125,6 +132,10 @@ public abstract class SiddhiEventEngine<B extends 
EventProcessorBindingParams> i
 
   }
 
+  private String removeStreamIdFromTimestamp(String timestampField) {
+    return timestampField !=null ? timestampField.replaceAll("s0::", "") : 
null;
+  }
+
   private String getOutputTopicName(B parameters) {
     return parameters
             .getGraph()
@@ -163,7 +174,13 @@ public abstract class SiddhiEventEngine<B extends 
EventProcessorBindingParams> i
     }
 
     for (String key : sortedEventKeys) {
-      joiner.add("s0" + key + " " + toType((Class<?>) typeMap.get(key)));
+      // TODO: get timestamp field from user params
+      if(key.equalsIgnoreCase(this.timestampField)) {
+        joiner.add("s0" + key + " LONG");
+      }
+      else {
+        joiner.add("s0" + key + " " + toType((Class<?>) typeMap.get(key)));
+      }
     }
 
     this.siddhiAppString.append(defineStreamPrefix);
@@ -228,6 +245,10 @@ public abstract class SiddhiEventEngine<B extends 
EventProcessorBindingParams> i
 
   protected abstract String selectStatement(final B bindingParameters);
 
+  protected String setTimestamp(final B bindingparameters) {
+    return null;
+  }
+
   protected String prepareName(String eventName) {
     return eventName
             .replaceAll("\\.", "")
@@ -236,6 +257,7 @@ public abstract class SiddhiEventEngine<B extends 
EventProcessorBindingParams> i
   }
 
 
+
   protected String getCustomOutputSelectStatement(DataProcessorInvocation 
invocation,
                                                   String eventName) {
     StringBuilder selectString = new StringBuilder();

Reply via email to