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-extensions.git
The following commit(s) were added to refs/heads/dev by this push:
new 9fdfa6d [hotfix] commented not working siddhi processors, add custom
output strategy to numerical filter in siddhi
9fdfa6d is described below
commit 9fdfa6d3343b940af0888b2a9a0a29170b72a4c5
Author: Patrick Wiener <[email protected]>
AuthorDate: Mon Jul 20 12:21:07 2020 +0200
[hotfix] commented not working siddhi processors, add custom output
strategy to numerical filter in siddhi
---
.../processors/siddhi/FiltersSiddhiInit.java | 8 ++++---
...{NumericalOperator.java => FilterOperator.java} | 2 +-
.../processors/siddhi/filter/NumericalFilter.java | 26 ++++++++++++++--------
.../siddhi/filter/NumericalFilterController.java | 7 +++---
.../siddhi/filter/NumericalFilterParameters.java | 12 +++++-----
.../processors/siddhi/stop/StreamStop.java | 5 +----
6 files changed, 34 insertions(+), 26 deletions(-)
diff --git
a/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/FiltersSiddhiInit.java
b/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/FiltersSiddhiInit.java
index b49d270..58a1b9b 100644
---
a/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/FiltersSiddhiInit.java
+++
b/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/FiltersSiddhiInit.java
@@ -39,10 +39,12 @@ public class FiltersSiddhiInit extends
StandaloneModelSubmitter {
DeclarersSingleton
.getInstance()
.add(new TrendController())
- .add(new StreamStopController())
- .add(new FrequencyController())
- .add(new FrequencyChangeController())
.add(new NumericalFilterController());
+ // TODO: currently not working
+// .add(new StreamStopController())
+// .add(new FrequencyController())
+// .add(new FrequencyChangeController())
+
DeclarersSingleton.getInstance().registerDataFormats(new
JsonDataFormatFactory(),
new CborDataFormatFactory(),
diff --git
a/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalOperator.java
b/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/FilterOperator.java
similarity index 96%
rename from
streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalOperator.java
rename to
streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/FilterOperator.java
index 6f8338a..c3a59e1 100644
---
a/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalOperator.java
+++
b/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/FilterOperator.java
@@ -18,6 +18,6 @@
package org.apache.streampipes.processors.siddhi.filter;
-public enum NumericalOperator {
+public enum FilterOperator {
GE, GT, LE, LT, EQ, IE
}
diff --git
a/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalFilter.java
b/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalFilter.java
index b78e9ae..9368996 100644
---
a/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalFilter.java
+++
b/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalFilter.java
@@ -17,28 +17,37 @@
*/
package org.apache.streampipes.processors.siddhi.filter;
+import org.apache.streampipes.wrapper.siddhi.engine.SiddhiDebugCallback;
import org.apache.streampipes.wrapper.siddhi.engine.SiddhiEventEngine;
import java.util.List;
public class NumericalFilter extends
SiddhiEventEngine<NumericalFilterParameters> {
+ public NumericalFilter() {
+ super();
+ }
+
+ public NumericalFilter(SiddhiDebugCallback callback) {
+ super(callback);
+ }
+
@Override
protected String fromStatement(List<String> inputStreamNames,
NumericalFilterParameters params) {
String filterProperty = prepareName(params.getFilterProperty());
String filterOperator = "";
- if (params.getNumericalOperator() == NumericalOperator.EQ) {
+ if (params.getFilterOperator() == FilterOperator.EQ) {
filterOperator = "==";
- } else if (params.getNumericalOperator() == NumericalOperator.GE) {
+ } else if (params.getFilterOperator() == FilterOperator.GE) {
filterOperator = ">=";
- } else if (params.getNumericalOperator() == NumericalOperator.GT) {
+ } else if (params.getFilterOperator() == FilterOperator.GT) {
filterOperator = ">";
- } else if (params.getNumericalOperator() == NumericalOperator.LE) {
+ } else if (params.getFilterOperator() == FilterOperator.LE) {
filterOperator = "<=";
- } else if (params.getNumericalOperator() == NumericalOperator.LT) {
+ } else if (params.getFilterOperator() == FilterOperator.LT) {
filterOperator = "<";
- } else if (params.getNumericalOperator() == NumericalOperator.IE) {
+ } else if (params.getFilterOperator() == FilterOperator.IE) {
filterOperator = "!=";
}
@@ -49,8 +58,7 @@ public class NumericalFilter extends
SiddhiEventEngine<NumericalFilterParameters
}
@Override
- protected String selectStatement(NumericalFilterParameters
bindingParameters) {
- return "select *";
+ protected String selectStatement(NumericalFilterParameters params) {
+ return getCustomOutputSelectStatement(params.getGraph());
}
-
}
diff --git
a/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalFilterController.java
b/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalFilterController.java
index 530c32e..549c7ae 100644
---
a/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalFilterController.java
+++
b/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalFilterController.java
@@ -40,15 +40,16 @@ public class NumericalFilterController extends
StandaloneEventProcessingDeclarer
return
ProcessingElementBuilder.create("org.apache.streampipes.processors.siddhi.numericalfilter")
.category(DataProcessorType.FILTER)
.withLocales(Locales.EN)
- .withAssets(Assets.DOCUMENTATION, Assets.ICON)
+ .withAssets(Assets.DOCUMENTATION)
.requiredStream(StreamRequirementsBuilder
.create()
.requiredPropertyWithUnaryMapping(EpRequirements.numberReq(),
Labels.withId(NUMBER_MAPPING),
PropertyScope.NONE).build())
- .outputStrategy(OutputStrategies.keep())
.requiredSingleValueSelection(Labels.withId(OPERATION),
Options.from("<", "<=", ">",
">=", "==", "!="))
.requiredFloatParameter(Labels.withId(VALUE), NUMBER_MAPPING)
+ //.outputStrategy(OutputStrategies.keep())
+ .outputStrategy(OutputStrategies.custom())
.build();
}
@@ -74,7 +75,7 @@ public class NumericalFilterController extends
StandaloneEventProcessingDeclarer
String filterProperty = extractor.mappingPropertyValue(NUMBER_MAPPING);
- NumericalFilterParameters staticParam = new
NumericalFilterParameters(graph, threshold, NumericalOperator.valueOf
+ NumericalFilterParameters staticParam = new
NumericalFilterParameters(graph, threshold, FilterOperator.valueOf
(operation)
, filterProperty);
diff --git
a/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalFilterParameters.java
b/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalFilterParameters.java
index 3c1c24b..b918928 100644
---
a/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalFilterParameters.java
+++
b/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalFilterParameters.java
@@ -24,14 +24,14 @@ import
org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams
public class NumericalFilterParameters extends EventProcessorBindingParams {
private double threshold;
- private NumericalOperator numericalOperator;
+ private FilterOperator filterOperator;
private String filterProperty;
- public NumericalFilterParameters(DataProcessorInvocation graph, Double
threshold, NumericalOperator
- numericalOperator, String filterProperty) {
+ public NumericalFilterParameters(DataProcessorInvocation graph, Double
threshold, FilterOperator
+ filterOperator, String filterProperty) {
super(graph);
this.threshold = threshold;
- this.numericalOperator = numericalOperator;
+ this.filterOperator = filterOperator;
this.filterProperty = filterProperty;
}
@@ -39,8 +39,8 @@ public class NumericalFilterParameters extends
EventProcessorBindingParams {
return threshold;
}
- public NumericalOperator getNumericalOperator() {
- return numericalOperator;
+ public FilterOperator getFilterOperator() {
+ return filterOperator;
}
public String getFilterProperty() {
diff --git
a/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/stop/StreamStop.java
b/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/stop/StreamStop.java
index 6381b9e..26a380d 100644
---
a/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/stop/StreamStop.java
+++
b/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/stop/StreamStop.java
@@ -36,10 +36,7 @@ public class StreamStop extends
SiddhiEventEngine<StreamStopParameters> {
@Override
protected String selectStatement(StreamStopParameters params) {
- setSortedEventKeys(Arrays.asList("timestamp", "message"));
+ //setSortedEventKeys(Arrays.asList("timestamp", "message"));
return "select currentTimeMillis() as timestamp, 'Event stream has
stopped' as message";
}
-
-
-
}