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 2020/06/04 18:10:03 UTC
[incubator-streampipes-extensions] branch dev updated: Final fixes
for SQL sink and adapter
This is an automated email from the ASF dual-hosted git repository.
zehnder 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 765c7e9 Final fixes for SQL sink and adapter
765c7e9 is described below
commit 765c7e97bb381ad60f15ec2b6e642cc86433ed55
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Thu Jun 4 20:09:42 2020 +0200
Final fixes for SQL sink and adapter
---
.../java/org/apache/streampipes/connect/adapters/mysql/Column.java | 2 +-
.../java/org/apache/streampipes/pe/jvm/AllPipelineElementsInit.java | 4 ++++
.../java/org/apache/streampipes/sinks/databases/jvm/mysql/Column.java | 2 +-
.../apache/streampipes/sinks/databases/jvm/mysql/MysqlController.java | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/Column.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/Column.java
index 4b0a68e..986ca8d 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/Column.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/Column.java
@@ -59,7 +59,7 @@ class Column {
case "time":
case "timestamp":
case "year":
- this.type = Datatypes.Long;
+ this.type = Datatypes.Float;
def = System.currentTimeMillis();
this.domainProperty = SO.DateTime;
break;
diff --git a/streampipes-pipeline-elements-all-jvm/src/main/java/org/apache/streampipes/pe/jvm/AllPipelineElementsInit.java b/streampipes-pipeline-elements-all-jvm/src/main/java/org/apache/streampipes/pe/jvm/AllPipelineElementsInit.java
index dab36c9..c3eeba3 100644
--- a/streampipes-pipeline-elements-all-jvm/src/main/java/org/apache/streampipes/pe/jvm/AllPipelineElementsInit.java
+++ b/streampipes-pipeline-elements-all-jvm/src/main/java/org/apache/streampipes/pe/jvm/AllPipelineElementsInit.java
@@ -87,8 +87,10 @@ import org.apache.streampipes.sinks.databases.jvm.couchdb.CouchDbController;
import org.apache.streampipes.sinks.databases.jvm.ditto.DittoController;
import org.apache.streampipes.sinks.databases.jvm.influxdb.InfluxDbController;
import org.apache.streampipes.sinks.databases.jvm.iotdb.IotDbController;
+import org.apache.streampipes.sinks.databases.jvm.mysql.MysqlController;
import org.apache.streampipes.sinks.databases.jvm.opcua.UpcUaController;
import org.apache.streampipes.sinks.databases.jvm.postgresql.PostgreSqlController;
+import org.apache.streampipes.sinks.databases.jvm.redis.RedisController;
import org.apache.streampipes.sinks.internal.jvm.dashboard.DashboardController;
import org.apache.streampipes.sinks.internal.jvm.datalake.DataLakeController;
import org.apache.streampipes.sinks.internal.jvm.notification.NotificationController;
@@ -175,6 +177,8 @@ public class AllPipelineElementsInit extends StandaloneModelSubmitter {
.add(new PostgreSqlController())
.add(new IotDbController())
.add(new DittoController())
+ .add(new RedisController())
+ .add(new MysqlController())
// streampipes-sinks-internal-jvm
.add(new NotificationController())
.add(new DataLakeController())
diff --git a/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/mysql/Column.java b/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/mysql/Column.java
index 942078b..3b384c0 100644
--- a/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/mysql/Column.java
+++ b/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/mysql/Column.java
@@ -57,7 +57,7 @@ class Column {
case "time":
case "timestamp":
case "year":
- this.type = Datatypes.Long;
+ this.type = Datatypes.Float;
def = System.currentTimeMillis();
break;
default:
diff --git a/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/mysql/MysqlController.java b/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/mysql/MysqlController.java
index 64e9aa6..172b5c7 100644
--- a/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/mysql/MysqlController.java
+++ b/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/mysql/MysqlController.java
@@ -49,11 +49,11 @@ public class MysqlController extends StandaloneEventSinkDeclarer<MysqlParameters
.requiredProperty(EpRequirements.anyProperty())
.build())
.requiredTextParameter(Labels.withId(HOST_KEY), false, false)
+ .requiredIntegerParameter(Labels.withId(PORT_KEY), 3306)
.requiredTextParameter(Labels.withId(USER_KEY), false, false)
.requiredSecret(Labels.withId(PASSWORD_KEY))
.requiredTextParameter(Labels.withId(DB_KEY), false, false)
.requiredTextParameter(Labels.withId(TABLE_KEY), false, false)
- .requiredIntegerParameter(Labels.withId(PORT_KEY), 3306)
.build();
}