You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2022/11/09 15:54:37 UTC
[incubator-streampipes] branch STREAMPIPES-623 created (now bb7606fbf)
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a change to branch STREAMPIPES-623
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
at bb7606fbf Merge branch 'dev' into STREAMPIPES-623
This branch includes the following new commits:
new 53f14a30d [STREAMPIPES-623] Change name timestamp field for data export
new d23f99819 [STREAMPIPES-623] Updated the timestamp fields for all cypress tests
new bb7606fbf Merge branch 'dev' into STREAMPIPES-623
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-streampipes] 01/03: [STREAMPIPES-623] Change name timestamp field for data export
Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch STREAMPIPES-623
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 53f14a30da50afc4ad60f9868d763503f14b1ad7
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Wed Nov 9 16:22:46 2022 +0100
[STREAMPIPES-623] Change name timestamp field for data export
---
.../dataexplorer/DataLakeManagementV4.java | 31 +++-
.../model/datalake/DataLakeMeasure.java | 168 ++++++++++++---------
.../model/datalake/DataLakeMeasureTest.java | 59 ++++++++
.../fixtures/dataDownloadDialog/testCsvComma.csv | 2 +-
.../dataDownloadDialog/testCsvSemicolon.csv | 2 +-
.../fixtures/dataDownloadDialog/testJson.json | 2 +-
.../testRemoveLinesWithMissingValues.csv | 2 +-
7 files changed, 186 insertions(+), 80 deletions(-)
diff --git a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/DataLakeManagementV4.java b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/DataLakeManagementV4.java
index 1823d32ab..9ee04ff03 100644
--- a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/DataLakeManagementV4.java
+++ b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/DataLakeManagementV4.java
@@ -67,7 +67,11 @@ import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
-import static org.apache.streampipes.dataexplorer.v4.SupportedDataLakeQueryParameters.*;
+import static org.apache.streampipes.dataexplorer.v4.SupportedDataLakeQueryParameters.QP_AUTO_AGGREGATE;
+import static org.apache.streampipes.dataexplorer.v4.SupportedDataLakeQueryParameters.QP_CSV_DELIMITER;
+import static org.apache.streampipes.dataexplorer.v4.SupportedDataLakeQueryParameters.QP_LIMIT;
+import static org.apache.streampipes.dataexplorer.v4.SupportedDataLakeQueryParameters.QP_MAXIMUM_AMOUNT_OF_EVENTS;
+import static org.apache.streampipes.dataexplorer.v4.SupportedDataLakeQueryParameters.QP_PAGE;
public class DataLakeManagementV4 {
@@ -87,6 +91,13 @@ public class DataLakeManagementV4 {
return getDataLakeStorage().findOne(measureId);
}
+ private Optional<DataLakeMeasure> findByMeasurementName(String measurementName) {
+ return getAllMeasurements()
+ .stream()
+ .filter(measurement -> measurement.getMeasureName().equals(measurementName))
+ .findFirst();
+ }
+
public SpQueryResult getData(ProvidedQueryParams queryParams, boolean ignoreMissingData) throws IllegalArgumentException {
if (queryParams.has(QP_AUTO_AGGREGATE)) {
queryParams = new AutoAggregationHandler(queryParams).makeAutoAggregationQueryParams();
@@ -114,6 +125,8 @@ public class DataLakeManagementV4 {
params.update(QP_LIMIT, 500000);
}
+ var measurement = findByMeasurementName(params.getMeasurementId()).get();
+
SpQueryResult dataResult;
//JSON
if (format.equals("json")) {
@@ -131,7 +144,10 @@ public class DataLakeManagementV4 {
params.update(SupportedDataLakeQueryParameters.QP_PAGE, String.valueOf(i));
dataResult = getData(params, ignoreMissingValues);
+
if (dataResult.getTotal() > 0) {
+ changeTimestampHeader(measurement, dataResult);
+
for (List<Object> row : dataResult.getAllDataSeries().get(0).getRows()) {
if (!isFirstDataObject) {
outputStream.write(toBytes(","));
@@ -179,8 +195,12 @@ public class DataLakeManagementV4 {
do {
params.update(SupportedDataLakeQueryParameters.QP_PAGE, String.valueOf(i));
dataResult = getData(params, ignoreMissingValues);
+
+
//Send first header
if (dataResult.getTotal() > 0) {
+ changeTimestampHeader(measurement, dataResult);
+
if (isFirstDataObject) {
boolean isFirst = true;
for (int i1 = 0; i1 < dataResult.getHeaders().size(); i1++) {
@@ -221,6 +241,15 @@ public class DataLakeManagementV4 {
}
}
+ /**
+ * Replaces the field 'time' of the data result with the actual timestamp field name of the measurement
+ * @param measurement contains the actual timestamp name value
+ * @param dataResult the query result of the database with 'time' as timestamp field name
+ */
+ private void changeTimestampHeader(DataLakeMeasure measurement, SpQueryResult dataResult) {
+ dataResult.getHeaders().set(0, measurement.getTimestampFieldName());
+ }
+
public boolean removeAllMeasurements() {
List<DataLakeMeasure> allMeasurements = getAllMeasurements();
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeMeasure.java b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeMeasure.java
index 5b90fd955..fbc2ef863 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeMeasure.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeMeasure.java
@@ -18,113 +18,131 @@
package org.apache.streampipes.model.datalake;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.schema.EventSchema;
+import org.apache.streampipes.model.shared.annotation.TsIgnore;
import org.apache.streampipes.model.shared.annotation.TsModel;
@TsModel
public class DataLakeMeasure extends UnnamedStreamPipesEntity {
- public final static String CURRENT_SCHEMA_VERSION = "1.1";
+ public static final String CURRENT_SCHEMA_VERSION = "1.1";
- @JsonProperty("_rev")
- private @SerializedName("_rev") String rev;
+ private static final String STREAM_PREFIX_DELIMITER = "::";
- private String measureName;
+ public static final String ASSERTION_ERROR_MESSAGE = "timestamp field requires a stream prefix (e.g. s0::timestamp)";
- private String timestampField;
- private EventSchema eventSchema;
- private String pipelineId;
- private String pipelineName;
- private boolean pipelineIsRunning;
+ @JsonProperty("_rev")
+ private @SerializedName("_rev") String rev;
- private String schemaVersion;
+ private String measureName;
- public DataLakeMeasure() {
- super();
- }
+ private String timestampField;
+ private EventSchema eventSchema;
+ private String pipelineId;
+ private String pipelineName;
+ private boolean pipelineIsRunning;
- public DataLakeMeasure(DataLakeMeasure other) {
- super(other);
- this.measureName = other.getMeasureName();
- this.eventSchema = new EventSchema(other.getEventSchema());
+ private String schemaVersion;
- }
+ public DataLakeMeasure() {
+ super();
+ }
- public DataLakeMeasure(String measureName, EventSchema eventSchema) {
- this.measureName = measureName;
- this.eventSchema = eventSchema;
- }
+ public DataLakeMeasure(DataLakeMeasure other) {
+ super(other);
+ this.measureName = other.getMeasureName();
+ this.eventSchema = new EventSchema(other.getEventSchema());
- public DataLakeMeasure(String measureName, String timestampField, EventSchema eventSchema) {
- this.measureName = measureName;
- this.eventSchema = eventSchema;
- this.timestampField = timestampField;
- }
+ }
- public String getMeasureName() {
- return measureName;
- }
+ public DataLakeMeasure(String measureName, EventSchema eventSchema) {
+ this.measureName = measureName;
+ this.eventSchema = eventSchema;
+ }
- public void setMeasureName(String measureName) {
- this.measureName = measureName;
- }
+ public DataLakeMeasure(String measureName, String timestampField, EventSchema eventSchema) {
+ this.measureName = measureName;
+ this.eventSchema = eventSchema;
+ this.timestampField = timestampField;
+ }
- public EventSchema getEventSchema() {
- return eventSchema;
- }
+ public String getMeasureName() {
+ return measureName;
+ }
- public void setEventSchema(EventSchema eventSchema) {
- this.eventSchema = eventSchema;
- }
+ public void setMeasureName(String measureName) {
+ this.measureName = measureName;
+ }
- public String getPipelineId() {
- return pipelineId;
- }
+ public EventSchema getEventSchema() {
+ return eventSchema;
+ }
- public void setPipelineId(String pipelineId) {
- this.pipelineId = pipelineId;
- }
+ public void setEventSchema(EventSchema eventSchema) {
+ this.eventSchema = eventSchema;
+ }
- public String getPipelineName() {
- return pipelineName;
- }
+ public String getPipelineId() {
+ return pipelineId;
+ }
- public void setPipelineName(String pipelineName) {
- this.pipelineName = pipelineName;
- }
+ public void setPipelineId(String pipelineId) {
+ this.pipelineId = pipelineId;
+ }
- public boolean isPipelineIsRunning() {
- return pipelineIsRunning;
- }
+ public String getPipelineName() {
+ return pipelineName;
+ }
- public void setPipelineIsRunning(boolean pipelineIsRunning) {
- this.pipelineIsRunning = pipelineIsRunning;
- }
+ public void setPipelineName(String pipelineName) {
+ this.pipelineName = pipelineName;
+ }
- public String getSchemaVersion() {
- return schemaVersion;
- }
+ public boolean isPipelineIsRunning() {
+ return pipelineIsRunning;
+ }
- public void setSchemaVersion(String schemaVersion) {
- this.schemaVersion = schemaVersion;
- }
+ public void setPipelineIsRunning(boolean pipelineIsRunning) {
+ this.pipelineIsRunning = pipelineIsRunning;
+ }
- public String getTimestampField() {
- return timestampField;
- }
+ public String getSchemaVersion() {
+ return schemaVersion;
+ }
- public void setTimestampField(String timestampField) {
- this.timestampField = timestampField;
- }
+ public void setSchemaVersion(String schemaVersion) {
+ this.schemaVersion = schemaVersion;
+ }
- public String getRev() {
- return rev;
- }
+ public String getTimestampField() {
+ return timestampField;
+ }
- public void setRev(String rev) {
- this.rev = rev;
- }
+
+ /**
+ * This can be used to get the name of the timestamp property without the stream prefix
+ * @return the name of the timestamp property
+ */
+ @TsIgnore
+ @JsonIgnore
+ public String getTimestampFieldName() {
+ return timestampField.split(STREAM_PREFIX_DELIMITER)[1];
+ }
+
+ public void setTimestampField(String timestampField) {
+ assert timestampField.split(STREAM_PREFIX_DELIMITER).length == 2 : ASSERTION_ERROR_MESSAGE;
+ this.timestampField = timestampField;
+ }
+
+ public String getRev() {
+ return rev;
+ }
+
+ public void setRev(String rev) {
+ this.rev = rev;
+ }
}
diff --git a/streampipes-model/src/test/java/org/apache/streampipes/model/datalake/DataLakeMeasureTest.java b/streampipes-model/src/test/java/org/apache/streampipes/model/datalake/DataLakeMeasureTest.java
new file mode 100644
index 000000000..8a6f79f54
--- /dev/null
+++ b/streampipes-model/src/test/java/org/apache/streampipes/model/datalake/DataLakeMeasureTest.java
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ *
+ */
+
+package org.apache.streampipes.model.datalake;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class DataLakeMeasureTest {
+
+ private static final String TIMESTAMP_FIELD = "testTimestamp";
+ private static final String STREAM_PREFIX = "s0::";
+ private static final String TIMESTAMP_FIELD_NAME = STREAM_PREFIX + TIMESTAMP_FIELD;
+
+ private DataLakeMeasure dataLakeMeasure = new DataLakeMeasure();
+ @Test
+ public void setTimestampFieldSuccess() {
+ dataLakeMeasure.setTimestampField(TIMESTAMP_FIELD_NAME);
+
+ var result = dataLakeMeasure.getTimestampField();
+
+ assertEquals(TIMESTAMP_FIELD_NAME, result);
+ }
+
+ @Test
+ public void setTimestampFieldAssertionError() {
+ try {
+ dataLakeMeasure.setTimestampField(TIMESTAMP_FIELD);
+ } catch (AssertionError assertionError) {
+ assertEquals(DataLakeMeasure.ASSERTION_ERROR_MESSAGE, assertionError.getMessage());
+ }
+ }
+
+ @Test
+ public void getTimestampFieldName() {
+ dataLakeMeasure.setTimestampField(TIMESTAMP_FIELD_NAME);
+
+ var result = dataLakeMeasure.getTimestampFieldName();
+
+ assertEquals(TIMESTAMP_FIELD, result);
+ }
+
+}
\ No newline at end of file
diff --git a/ui/cypress/fixtures/dataDownloadDialog/testCsvComma.csv b/ui/cypress/fixtures/dataDownloadDialog/testCsvComma.csv
index 474a7fd3d..fdc110a3e 100644
--- a/ui/cypress/fixtures/dataDownloadDialog/testCsvComma.csv
+++ b/ui/cypress/fixtures/dataDownloadDialog/testCsvComma.csv
@@ -1,4 +1,4 @@
-time,v1,v2,v3,v4
+timestamp,v1,v2,v3,v4
1623871499055,4.099999904632568,abc,true,1.0
1623871500059,4.199999809265137,abc,false,2.0
1623871507091,4.300000190734863,,,3.0
diff --git a/ui/cypress/fixtures/dataDownloadDialog/testCsvSemicolon.csv b/ui/cypress/fixtures/dataDownloadDialog/testCsvSemicolon.csv
index f1ed0928e..f4ce709b9 100644
--- a/ui/cypress/fixtures/dataDownloadDialog/testCsvSemicolon.csv
+++ b/ui/cypress/fixtures/dataDownloadDialog/testCsvSemicolon.csv
@@ -1,4 +1,4 @@
-time;v1;v2;v3;v4
+timestamp;v1;v2;v3;v4
1623871499055;4.099999904632568;abc;true;1.0
1623871500059;4.199999809265137;abc;false;2.0
1623871507091;4.300000190734863;;;3.0
diff --git a/ui/cypress/fixtures/dataDownloadDialog/testJson.json b/ui/cypress/fixtures/dataDownloadDialog/testJson.json
index d26278677..756056b24 100644
--- a/ui/cypress/fixtures/dataDownloadDialog/testJson.json
+++ b/ui/cypress/fixtures/dataDownloadDialog/testJson.json
@@ -1 +1 @@
-[{"time": 1623871499055,"v1": 4.099999904632568,"v2": "abc","v3": true,"v4": 1.0},{"time": 1623871500059,"v1": 4.199999809265137,"v2": "abc","v3": false,"v4": 2.0},{"time": 1623871507091,"v1": 4.300000190734863,"v2": null,"v3": null,"v4": 3.0},{"time": 1623871508093,"v1": 4.400000095367432,"v2": "abc","v3": true,"v4": 4.0},{"time": 1623871508095,"v1": 4.5,"v2": null,"v3": null,"v4": 5.0}]
+[{"timestamp": 1623871499055,"v1": 4.099999904632568,"v2": "abc","v3": true,"v4": 1.0},{"timestamp": 1623871500059,"v1": 4.199999809265137,"v2": "abc","v3": false,"v4": 2.0},{"timestamp": 1623871507091,"v1": 4.300000190734863,"v2": null,"v3": null,"v4": 3.0},{"timestamp": 1623871508093,"v1": 4.400000095367432,"v2": "abc","v3": true,"v4": 4.0},{"timestamp": 1623871508095,"v1": 4.5,"v2": null,"v3": null,"v4": 5.0}]
diff --git a/ui/cypress/fixtures/dataDownloadDialog/testRemoveLinesWithMissingValues.csv b/ui/cypress/fixtures/dataDownloadDialog/testRemoveLinesWithMissingValues.csv
index a7902e7ec..0d0dd2888 100644
--- a/ui/cypress/fixtures/dataDownloadDialog/testRemoveLinesWithMissingValues.csv
+++ b/ui/cypress/fixtures/dataDownloadDialog/testRemoveLinesWithMissingValues.csv
@@ -1,4 +1,4 @@
-time;v1;v2;v3;v4
+timestamp;v1;v2;v3;v4
1623871499055;4.099999904632568;abc;true;1.0
1623871500059;4.199999809265137;abc;false;2.0
1623871508093;4.400000095367432;abc;true;4.0
[incubator-streampipes] 02/03: [STREAMPIPES-623] Updated the timestamp fields for all cypress tests
Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch STREAMPIPES-623
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit d23f99819a08d63fd3643ab589bc7401d7e0caf7
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Wed Nov 9 16:53:57 2022 +0100
[STREAMPIPES-623] Updated the timestamp fields for all cypress tests
---
ui/cypress/fixtures/connect/aggregationRules/expected.csv | 2 +-
ui/cypress/fixtures/connect/removeDuplicateRules/expected.csv | 2 +-
ui/cypress/fixtures/connect/valueRules/expected.csv | 2 +-
.../fixtures/pipelineElement/enrich-jvm/jsEvaluator1/expected.csv | 2 +-
.../fixtures/pipelineElement/enrich-jvm/jsEvaluator2/expected.csv | 2 +-
ui/cypress/fixtures/pipelineElement/enrich-jvm/math1/expected.csv | 2 +-
ui/cypress/fixtures/pipelineElement/enrich-jvm/math2/expected.csv | 2 +-
ui/cypress/fixtures/pipelineElement/enrich-jvm/math3/expected.csv | 2 +-
.../fixtures/pipelineElement/enrich-jvm/staticmath1/expected.csv | 2 +-
.../fixtures/pipelineElement/enrich-jvm/staticmath2/expected.csv | 2 +-
.../fixtures/pipelineElement/enrich-jvm/trigonometry1/expected.csv | 2 +-
.../fixtures/pipelineElement/enrich-jvm/trigonometry2/expected.csv | 2 +-
.../fixtures/pipelineElement/enrich-jvm/valueChange1/expected.csv | 2 +-
.../fixtures/pipelineElement/filters-jvm/booleanFilter1/expected.csv | 4 ++--
.../fixtures/pipelineElement/filters-jvm/booleanFilter2/expected.csv | 2 +-
.../pipelineElement/filters-jvm/numericalFilter1/expected.csv | 2 +-
.../fixtures/pipelineElement/filters-jvm/projection1/expected.csv | 2 +-
.../fixtures/pipelineElement/filters-jvm/rateLimit1/expected.csv | 2 +-
.../fixtures/pipelineElement/filters-jvm/textFilter1/expected.csv | 2 +-
.../fixtures/pipelineElement/filters-jvm/textFilter2/expected.csv | 2 +-
.../pipelineElement/filters-jvm/thresholdDetection1/expected.csv | 2 +-
.../fixtures/pipelineElement/filters-siddhi/increase1/expected.csv | 2 +-
.../fixtures/pipelineElement/filters-siddhi/increase3/expected.csv | 2 +-
.../pipelineElement/transformation-jvm/booleanCounter1/expected.csv | 2 +-
.../pipelineElement/transformation-jvm/booleanCounter2/expected.csv | 2 +-
.../pipelineElement/transformation-jvm/booleanInverter1/expected.csv | 2 +-
.../pipelineElement/transformation-jvm/countArray1/expected.csv | 2 +-
.../pipelineElement/transformation-jvm/fieldHasher1/expected.csv | 2 +-
.../pipelineElement/transformation-jvm/fieldHasher2/expected.csv | 2 +-
.../pipelineElement/transformation-jvm/fieldMapper1/expected.csv | 2 +-
.../pipelineElement/transformation-jvm/fieldRenamer1/expected.csv | 2 +-
.../pipelineElement/transformation-jvm/signalEdgeFilter1/expected.csv | 2 +-
.../pipelineElement/transformation-jvm/splitArray1/expected.csv | 2 +-
33 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/ui/cypress/fixtures/connect/aggregationRules/expected.csv b/ui/cypress/fixtures/connect/aggregationRules/expected.csv
index ab5ca59d7..bcb273f68 100644
--- a/ui/cypress/fixtures/connect/aggregationRules/expected.csv
+++ b/ui/cypress/fixtures/connect/aggregationRules/expected.csv
@@ -1,2 +1,2 @@
-time;value
+timestamp;value
1623871499000;2.0
diff --git a/ui/cypress/fixtures/connect/removeDuplicateRules/expected.csv b/ui/cypress/fixtures/connect/removeDuplicateRules/expected.csv
index 89bf95290..7b28504a5 100644
--- a/ui/cypress/fixtures/connect/removeDuplicateRules/expected.csv
+++ b/ui/cypress/fixtures/connect/removeDuplicateRules/expected.csv
@@ -1,4 +1,4 @@
-time;value
+timestamp;value
1623871499000;2.0
1623871500000;3.0
1623871501000;4.0
diff --git a/ui/cypress/fixtures/connect/valueRules/expected.csv b/ui/cypress/fixtures/connect/valueRules/expected.csv
index ec2e02acf..ea21f50ce 100644
--- a/ui/cypress/fixtures/connect/valueRules/expected.csv
+++ b/ui/cypress/fixtures/connect/valueRules/expected.csv
@@ -1,2 +1,2 @@
-time;temperature;value
+timestamp;temperature;value
1640350512123;50.003334045410156;100.0
diff --git a/ui/cypress/fixtures/pipelineElement/enrich-jvm/jsEvaluator1/expected.csv b/ui/cypress/fixtures/pipelineElement/enrich-jvm/jsEvaluator1/expected.csv
index 55d3116d1..918d36b5e 100644
--- a/ui/cypress/fixtures/pipelineElement/enrich-jvm/jsEvaluator1/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/enrich-jvm/jsEvaluator1/expected.csv
@@ -1,4 +1,4 @@
-time;numberlist
+timestamp;numberlist
1623871499055;2.0
1623871500059;3.0
1623871501064;4.0
diff --git a/ui/cypress/fixtures/pipelineElement/enrich-jvm/jsEvaluator2/expected.csv b/ui/cypress/fixtures/pipelineElement/enrich-jvm/jsEvaluator2/expected.csv
index c52f3fcda..7d1cc0d50 100644
--- a/ui/cypress/fixtures/pipelineElement/enrich-jvm/jsEvaluator2/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/enrich-jvm/jsEvaluator2/expected.csv
@@ -1,4 +1,4 @@
-time;numberlist;plusone
+timestamp;numberlist;plusone
1623871499055;2.0;3.0
1623871500059;3.0;4.0
1623871501064;4.0;5.0
diff --git a/ui/cypress/fixtures/pipelineElement/enrich-jvm/math1/expected.csv b/ui/cypress/fixtures/pipelineElement/enrich-jvm/math1/expected.csv
index 5b481a537..e2fb0c188 100644
--- a/ui/cypress/fixtures/pipelineElement/enrich-jvm/math1/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/enrich-jvm/math1/expected.csv
@@ -1,3 +1,3 @@
-time;calculationResult;temperature1;temperature2
+timestamp;calculationResult;temperature1;temperature2
1623871499055;5.0;2.0;3.0
1623871500059;7.0;3.0;4.0
diff --git a/ui/cypress/fixtures/pipelineElement/enrich-jvm/math2/expected.csv b/ui/cypress/fixtures/pipelineElement/enrich-jvm/math2/expected.csv
index 43a07791f..f11ce541a 100644
--- a/ui/cypress/fixtures/pipelineElement/enrich-jvm/math2/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/enrich-jvm/math2/expected.csv
@@ -1,3 +1,3 @@
-time;calculationResult;temperature1;temperature2
+timestamp;calculationResult;temperature1;temperature2
1623871499055;1.0;4.0;4.0
1623871500059;20.0;100.0;5.0
diff --git a/ui/cypress/fixtures/pipelineElement/enrich-jvm/math3/expected.csv b/ui/cypress/fixtures/pipelineElement/enrich-jvm/math3/expected.csv
index 3f681d912..b4d06a76a 100644
--- a/ui/cypress/fixtures/pipelineElement/enrich-jvm/math3/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/enrich-jvm/math3/expected.csv
@@ -1,3 +1,3 @@
-time;calculationResult;temperature1;temperature2
+timestamp;calculationResult;temperature1;temperature2
1623871499055;8.0;4.0;2.0
1623871500059;17.5;3.5;5.0
diff --git a/ui/cypress/fixtures/pipelineElement/enrich-jvm/staticmath1/expected.csv b/ui/cypress/fixtures/pipelineElement/enrich-jvm/staticmath1/expected.csv
index 6727b729a..0405380d8 100644
--- a/ui/cypress/fixtures/pipelineElement/enrich-jvm/staticmath1/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/enrich-jvm/staticmath1/expected.csv
@@ -1,3 +1,3 @@
-time;temperature1
+timestamp;temperature1
1623871499055;20.0
1623871500059;17.5
diff --git a/ui/cypress/fixtures/pipelineElement/enrich-jvm/staticmath2/expected.csv b/ui/cypress/fixtures/pipelineElement/enrich-jvm/staticmath2/expected.csv
index 5a04b8ad5..5ec5e931b 100644
--- a/ui/cypress/fixtures/pipelineElement/enrich-jvm/staticmath2/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/enrich-jvm/staticmath2/expected.csv
@@ -1,3 +1,3 @@
-time;temperature1
+timestamp;temperature1
1623871499055;4.0
1623871500059;2.0
diff --git a/ui/cypress/fixtures/pipelineElement/enrich-jvm/trigonometry1/expected.csv b/ui/cypress/fixtures/pipelineElement/enrich-jvm/trigonometry1/expected.csv
index bef8e9274..1e63455d3 100644
--- a/ui/cypress/fixtures/pipelineElement/enrich-jvm/trigonometry1/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/enrich-jvm/trigonometry1/expected.csv
@@ -1,3 +1,3 @@
-time;temperature1;trigonometryResult
+timestamp;temperature1;trigonometryResult
1623871499055;90.0;0.8939966636005579
1623871500059;180.0;-0.8011526357338304
diff --git a/ui/cypress/fixtures/pipelineElement/enrich-jvm/trigonometry2/expected.csv b/ui/cypress/fixtures/pipelineElement/enrich-jvm/trigonometry2/expected.csv
index 5ca7cff4f..d306625c1 100644
--- a/ui/cypress/fixtures/pipelineElement/enrich-jvm/trigonometry2/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/enrich-jvm/trigonometry2/expected.csv
@@ -1,3 +1,3 @@
-time;temperature1;trigonometryResult
+timestamp;temperature1;trigonometryResult
1623871499055;120.0;0.8141809705265618
1623871500059;150.0;0.6992508064783751
diff --git a/ui/cypress/fixtures/pipelineElement/enrich-jvm/valueChange1/expected.csv b/ui/cypress/fixtures/pipelineElement/enrich-jvm/valueChange1/expected.csv
index 55b0312dd..def809b28 100644
--- a/ui/cypress/fixtures/pipelineElement/enrich-jvm/valueChange1/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/enrich-jvm/valueChange1/expected.csv
@@ -1,4 +1,4 @@
-time;isChanged;numberlist
+timestamp;isChanged;numberlist
1623871499055;false;2.0
1623871500059;false;3.0
1623871501064;true;4.0
diff --git a/ui/cypress/fixtures/pipelineElement/filters-jvm/booleanFilter1/expected.csv b/ui/cypress/fixtures/pipelineElement/filters-jvm/booleanFilter1/expected.csv
index b525a46a6..84b6b2e11 100644
--- a/ui/cypress/fixtures/pipelineElement/filters-jvm/booleanFilter1/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/filters-jvm/booleanFilter1/expected.csv
@@ -1,6 +1,6 @@
-time;randomboolean
+timestamp;randomboolean
1623871501064;true
1623871503078;true
1623871505084;true
1623871507091;true
-1623871508093;true
\ No newline at end of file
+1623871508093;true
diff --git a/ui/cypress/fixtures/pipelineElement/filters-jvm/booleanFilter2/expected.csv b/ui/cypress/fixtures/pipelineElement/filters-jvm/booleanFilter2/expected.csv
index 0eea96979..3a0ceb024 100644
--- a/ui/cypress/fixtures/pipelineElement/filters-jvm/booleanFilter2/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/filters-jvm/booleanFilter2/expected.csv
@@ -1,4 +1,4 @@
-time;randomboolean
+timestamp;randomboolean
1623871499055;false
1623871500059;false
1623871502070;false
diff --git a/ui/cypress/fixtures/pipelineElement/filters-jvm/numericalFilter1/expected.csv b/ui/cypress/fixtures/pipelineElement/filters-jvm/numericalFilter1/expected.csv
index 0a518f52b..1639aebcb 100644
--- a/ui/cypress/fixtures/pipelineElement/filters-jvm/numericalFilter1/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/filters-jvm/numericalFilter1/expected.csv
@@ -1,4 +1,4 @@
-time;randomnumber
+timestamp;randomnumber
1623871499055;62.0
1623871504082;56.0
1623871505084;95.0
diff --git a/ui/cypress/fixtures/pipelineElement/filters-jvm/projection1/expected.csv b/ui/cypress/fixtures/pipelineElement/filters-jvm/projection1/expected.csv
index a2ad79f39..249d92f74 100644
--- a/ui/cypress/fixtures/pipelineElement/filters-jvm/projection1/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/filters-jvm/projection1/expected.csv
@@ -1,4 +1,4 @@
-time;a
+timestamp;a
1623871499055;a
1623871504082;a
1623871505084;a
diff --git a/ui/cypress/fixtures/pipelineElement/filters-jvm/rateLimit1/expected.csv b/ui/cypress/fixtures/pipelineElement/filters-jvm/rateLimit1/expected.csv
index 0d663ca71..aa1a3795a 100644
--- a/ui/cypress/fixtures/pipelineElement/filters-jvm/rateLimit1/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/filters-jvm/rateLimit1/expected.csv
@@ -1,3 +1,3 @@
-time;randomnumber
+timestamp;randomnumber
1623871494000;22.0
1623871499000;26.0
diff --git a/ui/cypress/fixtures/pipelineElement/filters-jvm/textFilter1/expected.csv b/ui/cypress/fixtures/pipelineElement/filters-jvm/textFilter1/expected.csv
index 4ccf65d5d..7e5c6e777 100644
--- a/ui/cypress/fixtures/pipelineElement/filters-jvm/textFilter1/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/filters-jvm/textFilter1/expected.csv
@@ -1,4 +1,4 @@
-time;randomchar
+timestamp;randomchar
1623871501064;c
1623871504082;c
1623871507091;c
diff --git a/ui/cypress/fixtures/pipelineElement/filters-jvm/textFilter2/expected.csv b/ui/cypress/fixtures/pipelineElement/filters-jvm/textFilter2/expected.csv
index 2877b522f..8cc452711 100644
--- a/ui/cypress/fixtures/pipelineElement/filters-jvm/textFilter2/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/filters-jvm/textFilter2/expected.csv
@@ -1,4 +1,4 @@
-time;randomchar
+timestamp;randomchar
1623871499055;apple
1623871502070;apple
1623871505084;apple
diff --git a/ui/cypress/fixtures/pipelineElement/filters-jvm/thresholdDetection1/expected.csv b/ui/cypress/fixtures/pipelineElement/filters-jvm/thresholdDetection1/expected.csv
index 52727c6e0..bcb728d49 100644
--- a/ui/cypress/fixtures/pipelineElement/filters-jvm/thresholdDetection1/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/filters-jvm/thresholdDetection1/expected.csv
@@ -1,4 +1,4 @@
-time;randomnumber;thresholdDetected
+timestamp;randomnumber;thresholdDetected
1623871499055;62.0;true
1623871500059;46.0;false
1623871501064;41.0;false
diff --git a/ui/cypress/fixtures/pipelineElement/filters-siddhi/increase1/expected.csv b/ui/cypress/fixtures/pipelineElement/filters-siddhi/increase1/expected.csv
index cf3cbf9af..510280db2 100644
--- a/ui/cypress/fixtures/pipelineElement/filters-siddhi/increase1/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/filters-siddhi/increase1/expected.csv
@@ -1,2 +1,2 @@
-time;sensorValue
+timestamp;sensorValue
1623871503078;10.0
diff --git a/ui/cypress/fixtures/pipelineElement/filters-siddhi/increase3/expected.csv b/ui/cypress/fixtures/pipelineElement/filters-siddhi/increase3/expected.csv
index cf3cbf9af..510280db2 100644
--- a/ui/cypress/fixtures/pipelineElement/filters-siddhi/increase3/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/filters-siddhi/increase3/expected.csv
@@ -1,2 +1,2 @@
-time;sensorValue
+timestamp;sensorValue
1623871503078;10.0
diff --git a/ui/cypress/fixtures/pipelineElement/transformation-jvm/booleanCounter1/expected.csv b/ui/cypress/fixtures/pipelineElement/transformation-jvm/booleanCounter1/expected.csv
index 550e14d5e..a3f287057 100644
--- a/ui/cypress/fixtures/pipelineElement/transformation-jvm/booleanCounter1/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/transformation-jvm/booleanCounter1/expected.csv
@@ -1,4 +1,4 @@
-time;booleanToCount;counter
+timestamp;booleanToCount;counter
1623871499055;true;1
1623871502070;false;2
1623871505084;true;3
diff --git a/ui/cypress/fixtures/pipelineElement/transformation-jvm/booleanCounter2/expected.csv b/ui/cypress/fixtures/pipelineElement/transformation-jvm/booleanCounter2/expected.csv
index 1eaabc8b2..5ce8e2809 100644
--- a/ui/cypress/fixtures/pipelineElement/transformation-jvm/booleanCounter2/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/transformation-jvm/booleanCounter2/expected.csv
@@ -1,4 +1,4 @@
-time;counter;randomboolean
+timestamp;counter;randomboolean
1623871501064;1;true
1623871502070;2;false
1623871503078;3;true
diff --git a/ui/cypress/fixtures/pipelineElement/transformation-jvm/booleanInverter1/expected.csv b/ui/cypress/fixtures/pipelineElement/transformation-jvm/booleanInverter1/expected.csv
index dae89b039..653aa9aae 100644
--- a/ui/cypress/fixtures/pipelineElement/transformation-jvm/booleanInverter1/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/transformation-jvm/booleanInverter1/expected.csv
@@ -1,4 +1,4 @@
-time;booleanToInvert
+timestamp;booleanToInvert
1623871499055;false
1623871500059;false
1623871501064;false
diff --git a/ui/cypress/fixtures/pipelineElement/transformation-jvm/countArray1/expected.csv b/ui/cypress/fixtures/pipelineElement/transformation-jvm/countArray1/expected.csv
index 2f327e4ac..e1798e51f 100644
--- a/ui/cypress/fixtures/pipelineElement/transformation-jvm/countArray1/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/transformation-jvm/countArray1/expected.csv
@@ -1,4 +1,4 @@
-time;countValue
+timestamp;countValue
1623871499055;4.0
1623871500059;2.0
1623871507091;5.0
diff --git a/ui/cypress/fixtures/pipelineElement/transformation-jvm/fieldHasher1/expected.csv b/ui/cypress/fixtures/pipelineElement/transformation-jvm/fieldHasher1/expected.csv
index 27830ff66..9ae74591f 100644
--- a/ui/cypress/fixtures/pipelineElement/transformation-jvm/fieldHasher1/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/transformation-jvm/fieldHasher1/expected.csv
@@ -1,3 +1,3 @@
-time;sensorId
+timestamp;sensorId
1623871499055;a9993e364706816aba3e25717850c26c9cd0d89d
1623871500059;40bd001563085fc35165329ea1ff5c5ecbdbbeef
diff --git a/ui/cypress/fixtures/pipelineElement/transformation-jvm/fieldHasher2/expected.csv b/ui/cypress/fixtures/pipelineElement/transformation-jvm/fieldHasher2/expected.csv
index 8f61632da..bad17b41a 100644
--- a/ui/cypress/fixtures/pipelineElement/transformation-jvm/fieldHasher2/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/transformation-jvm/fieldHasher2/expected.csv
@@ -1,3 +1,3 @@
-time;sensorId
+timestamp;sensorId
1623871499055;900150983cd24fb0d6963f7d28e17f72
1623871500059;202cb962ac59075b964b07152d234b70
diff --git a/ui/cypress/fixtures/pipelineElement/transformation-jvm/fieldMapper1/expected.csv b/ui/cypress/fixtures/pipelineElement/transformation-jvm/fieldMapper1/expected.csv
index cc037c0d1..cddd87630 100644
--- a/ui/cypress/fixtures/pipelineElement/transformation-jvm/fieldMapper1/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/transformation-jvm/fieldMapper1/expected.csv
@@ -1,3 +1,3 @@
-time;hashedField
+timestamp;hashedField
1623871499055;e80b5017098950fc58aad83c8c14978e
1623871500059;e10adc3949ba59abbe56e057f20f883e
diff --git a/ui/cypress/fixtures/pipelineElement/transformation-jvm/fieldRenamer1/expected.csv b/ui/cypress/fixtures/pipelineElement/transformation-jvm/fieldRenamer1/expected.csv
index cb49781e0..a03ba37cc 100644
--- a/ui/cypress/fixtures/pipelineElement/transformation-jvm/fieldRenamer1/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/transformation-jvm/fieldRenamer1/expected.csv
@@ -1,4 +1,4 @@
-time;newname
+timestamp;newname
1623871499055;122.0
1623871500059;123.0
1623871501064;124.0
diff --git a/ui/cypress/fixtures/pipelineElement/transformation-jvm/signalEdgeFilter1/expected.csv b/ui/cypress/fixtures/pipelineElement/transformation-jvm/signalEdgeFilter1/expected.csv
index 71be1ef3b..7470d5ba1 100644
--- a/ui/cypress/fixtures/pipelineElement/transformation-jvm/signalEdgeFilter1/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/transformation-jvm/signalEdgeFilter1/expected.csv
@@ -1,4 +1,4 @@
-time;booleanEdge
+timestamp;booleanEdge
1623871499055;true
1623871502070;false
1623871505084;true
diff --git a/ui/cypress/fixtures/pipelineElement/transformation-jvm/splitArray1/expected.csv b/ui/cypress/fixtures/pipelineElement/transformation-jvm/splitArray1/expected.csv
index 40710f379..9bb212a00 100644
--- a/ui/cypress/fixtures/pipelineElement/transformation-jvm/splitArray1/expected.csv
+++ b/ui/cypress/fixtures/pipelineElement/transformation-jvm/splitArray1/expected.csv
@@ -1,3 +1,3 @@
-time;array_value
+timestamp;array_value
1623871500059;4.0
1623871508093;1.0
[incubator-streampipes] 03/03: Merge branch 'dev' into STREAMPIPES-623
Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch STREAMPIPES-623
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit bb7606fbfa757191372a52140e856c5569d4d013
Merge: 53f14a30d d23f99819
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Wed Nov 9 16:54:17 2022 +0100
Merge branch 'dev' into STREAMPIPES-623
ui/cypress/fixtures/connect/aggregationRules/expected.csv | 2 +-
ui/cypress/fixtures/connect/removeDuplicateRules/expected.csv | 2 +-
ui/cypress/fixtures/connect/valueRules/expected.csv | 2 +-
.../fixtures/pipelineElement/enrich-jvm/jsEvaluator1/expected.csv | 2 +-
.../fixtures/pipelineElement/enrich-jvm/jsEvaluator2/expected.csv | 2 +-
ui/cypress/fixtures/pipelineElement/enrich-jvm/math1/expected.csv | 2 +-
ui/cypress/fixtures/pipelineElement/enrich-jvm/math2/expected.csv | 2 +-
ui/cypress/fixtures/pipelineElement/enrich-jvm/math3/expected.csv | 2 +-
.../fixtures/pipelineElement/enrich-jvm/staticmath1/expected.csv | 2 +-
.../fixtures/pipelineElement/enrich-jvm/staticmath2/expected.csv | 2 +-
.../fixtures/pipelineElement/enrich-jvm/trigonometry1/expected.csv | 2 +-
.../fixtures/pipelineElement/enrich-jvm/trigonometry2/expected.csv | 2 +-
.../fixtures/pipelineElement/enrich-jvm/valueChange1/expected.csv | 2 +-
.../fixtures/pipelineElement/filters-jvm/booleanFilter1/expected.csv | 4 ++--
.../fixtures/pipelineElement/filters-jvm/booleanFilter2/expected.csv | 2 +-
.../pipelineElement/filters-jvm/numericalFilter1/expected.csv | 2 +-
.../fixtures/pipelineElement/filters-jvm/projection1/expected.csv | 2 +-
.../fixtures/pipelineElement/filters-jvm/rateLimit1/expected.csv | 2 +-
.../fixtures/pipelineElement/filters-jvm/textFilter1/expected.csv | 2 +-
.../fixtures/pipelineElement/filters-jvm/textFilter2/expected.csv | 2 +-
.../pipelineElement/filters-jvm/thresholdDetection1/expected.csv | 2 +-
.../fixtures/pipelineElement/filters-siddhi/increase1/expected.csv | 2 +-
.../fixtures/pipelineElement/filters-siddhi/increase3/expected.csv | 2 +-
.../pipelineElement/transformation-jvm/booleanCounter1/expected.csv | 2 +-
.../pipelineElement/transformation-jvm/booleanCounter2/expected.csv | 2 +-
.../pipelineElement/transformation-jvm/booleanInverter1/expected.csv | 2 +-
.../pipelineElement/transformation-jvm/countArray1/expected.csv | 2 +-
.../pipelineElement/transformation-jvm/fieldHasher1/expected.csv | 2 +-
.../pipelineElement/transformation-jvm/fieldHasher2/expected.csv | 2 +-
.../pipelineElement/transformation-jvm/fieldMapper1/expected.csv | 2 +-
.../pipelineElement/transformation-jvm/fieldRenamer1/expected.csv | 2 +-
.../pipelineElement/transformation-jvm/signalEdgeFilter1/expected.csv | 2 +-
.../pipelineElement/transformation-jvm/splitArray1/expected.csv | 2 +-
33 files changed, 34 insertions(+), 34 deletions(-)