From 2984e68db4feee3b2b1675516774d67cba98c885 Mon Sep 17 00:00:00 2001 From: pranjal0811 Date: Sun, 1 Sep 2019 13:17:58 +0530 Subject: [PATCH 1/7] partition query support and siddhi version update to latest --- .../flink/streaming/siddhi/SiddhiStream.java | 4 +- .../operator/AbstractSiddhiOperator.java | 14 +++--- .../operator/SiddhiOperatorContext.java | 2 +- .../operator/StreamInMemOutputHandler.java | 8 ++-- .../siddhi/operator/StreamOutputHandler.java | 6 +-- .../siddhi/schema/SiddhiStreamSchema.java | 4 +- .../siddhi/utils/SiddhiExecutionPlanner.java | 46 +++++++++++-------- .../siddhi/utils/SiddhiTypeFactory.java | 10 ++-- .../CustomPlusFunctionExtension.java | 33 ++++++------- .../siddhi/operator/SiddhiSyntaxTest.java | 10 ++-- .../schema/SiddhiExecutionPlanSchemaTest.java | 4 +- pom.xml | 16 +++++-- 12 files changed, 87 insertions(+), 70 deletions(-) diff --git a/core/src/main/java/org/apache/flink/streaming/siddhi/SiddhiStream.java b/core/src/main/java/org/apache/flink/streaming/siddhi/SiddhiStream.java index e1cc024..f5ad77f 100644 --- a/core/src/main/java/org/apache/flink/streaming/siddhi/SiddhiStream.java +++ b/core/src/main/java/org/apache/flink/streaming/siddhi/SiddhiStream.java @@ -41,8 +41,8 @@ import org.apache.flink.streaming.api.datastream.KeyedStream; import org.apache.flink.types.Row; import org.apache.flink.util.Preconditions; -import org.wso2.siddhi.query.api.definition.AbstractDefinition; -import org.wso2.siddhi.query.api.definition.Attribute; +import io.siddhi.query.api.definition.AbstractDefinition; +import io.siddhi.query.api.definition.Attribute; import java.util.*; diff --git a/core/src/main/java/org/apache/flink/streaming/siddhi/operator/AbstractSiddhiOperator.java b/core/src/main/java/org/apache/flink/streaming/siddhi/operator/AbstractSiddhiOperator.java index f212052..f8ab582 100755 --- a/core/src/main/java/org/apache/flink/streaming/siddhi/operator/AbstractSiddhiOperator.java +++ b/core/src/main/java/org/apache/flink/streaming/siddhi/operator/AbstractSiddhiOperator.java @@ -53,11 +53,11 @@ import org.apache.flink.streaming.runtime.tasks.StreamTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.wso2.siddhi.core.SiddhiAppRuntime; -import org.wso2.siddhi.core.SiddhiManager; -import org.wso2.siddhi.core.stream.input.InputHandler; -import org.wso2.siddhi.query.api.definition.AbstractDefinition; -import org.wso2.siddhi.query.api.definition.StreamDefinition; +import io.siddhi.core.SiddhiAppRuntime; +import io.siddhi.core.SiddhiManager; +import io.siddhi.core.stream.input.InputHandler; +import io.siddhi.query.api.definition.AbstractDefinition; +import io.siddhi.query.api.definition.StreamDefinition; /** *

Siddhi Runtime Operator

@@ -66,13 +66,13 @@ * *