You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by bo...@apache.org on 2024/04/30 09:34:40 UTC
(streampipes) 03/10: refactor: abstract query management
This is an automated email from the ASF dual-hosted git repository.
bossenti pushed a commit to branch abstract-data-explorer-from-influx
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 667bf32d119a48db5abfb047669cd50a62ad4a66
Author: bossenti <bo...@posteo.de>
AuthorDate: Tue Apr 30 11:21:14 2024 +0200
refactor: abstract query management
---
.../api}/IDataExplorerQueryManagement.java | 7 ++++---
...java => DataExplorerQueryManagementInflux.java} | 22 ++++++++++++++++------
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/streampipes-data-explorer-influx/src/main/java/org/apache/streampipes/dataexplorer/influx/migrate/IDataExplorerQueryManagement.java b/streampipes-data-explorer-api/src/main/java/org/apache/streampipes/dataexplorer/api/IDataExplorerQueryManagement.java
similarity index 88%
rename from streampipes-data-explorer-influx/src/main/java/org/apache/streampipes/dataexplorer/influx/migrate/IDataExplorerQueryManagement.java
rename to streampipes-data-explorer-api/src/main/java/org/apache/streampipes/dataexplorer/api/IDataExplorerQueryManagement.java
index 37e43002fc..1e3b500925 100644
--- a/streampipes-data-explorer-influx/src/main/java/org/apache/streampipes/dataexplorer/influx/migrate/IDataExplorerQueryManagement.java
+++ b/streampipes-data-explorer-api/src/main/java/org/apache/streampipes/dataexplorer/api/IDataExplorerQueryManagement.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.streampipes.dataexplorer.influx.migrate;
+package org.apache.streampipes.dataexplorer.api;
import org.apache.streampipes.dataexplorer.export.OutputFormat;
import org.apache.streampipes.model.datalake.SpQueryResult;
@@ -28,8 +28,9 @@ import java.util.Map;
public interface IDataExplorerQueryManagement {
- SpQueryResult getData(ProvidedRestQueryParams queryParams,
- boolean ignoreMissingData) throws IllegalArgumentException;
+ SpQueryResult getData(
+ ProvidedRestQueryParams queryParams,
+ boolean ignoreMissingData) throws IllegalArgumentException;
void getDataAsStream(ProvidedRestQueryParams params,
OutputFormat format,
diff --git a/streampipes-data-explorer-influx/src/main/java/org/apache/streampipes/dataexplorer/influx/migrate/DataExplorerQueryManagement.java b/streampipes-data-explorer-influx/src/main/java/org/apache/streampipes/dataexplorer/influx/DataExplorerQueryManagementInflux.java
similarity index 78%
rename from streampipes-data-explorer-influx/src/main/java/org/apache/streampipes/dataexplorer/influx/migrate/DataExplorerQueryManagement.java
rename to streampipes-data-explorer-influx/src/main/java/org/apache/streampipes/dataexplorer/influx/DataExplorerQueryManagementInflux.java
index d9dcc5c284..44b9374b80 100644
--- a/streampipes-data-explorer-influx/src/main/java/org/apache/streampipes/dataexplorer/influx/migrate/DataExplorerQueryManagement.java
+++ b/streampipes-data-explorer-influx/src/main/java/org/apache/streampipes/dataexplorer/influx/DataExplorerQueryManagementInflux.java
@@ -16,11 +16,13 @@
*
*/
-package org.apache.streampipes.dataexplorer.influx.migrate;
+package org.apache.streampipes.dataexplorer.influx;
+import org.apache.streampipes.dataexplorer.api.IDataExplorerQueryManagement;
import org.apache.streampipes.dataexplorer.api.IDataExplorerSchemaManagement;
import org.apache.streampipes.dataexplorer.export.OutputFormat;
-import org.apache.streampipes.dataexplorer.influx.DataExplorerInfluxQueryExecutor;
+import org.apache.streampipes.dataexplorer.QueryResultProvider;
+import org.apache.streampipes.dataexplorer.StreamedQueryResultProvider;
import org.apache.streampipes.dataexplorer.param.DeleteQueryParams;
import org.apache.streampipes.dataexplorer.param.ProvidedRestQueryParamConverter;
import org.apache.streampipes.model.datalake.param.ProvidedRestQueryParams;
@@ -32,18 +34,22 @@ import java.io.OutputStream;
import java.util.List;
import java.util.Map;
-public class DataExplorerQueryManagement implements IDataExplorerQueryManagement {
+public class DataExplorerQueryManagementInflux implements IDataExplorerQueryManagement {
private final IDataExplorerSchemaManagement dataExplorerSchemaManagement;
- public DataExplorerQueryManagement(IDataExplorerSchemaManagement dataExplorerSchemaManagement) {
+ public DataExplorerQueryManagementInflux(IDataExplorerSchemaManagement dataExplorerSchemaManagement) {
this.dataExplorerSchemaManagement = dataExplorerSchemaManagement;
}
@Override
public SpQueryResult getData(ProvidedRestQueryParams queryParams,
boolean ignoreMissingData) throws IllegalArgumentException {
- return new QueryResultProvider(queryParams, ignoreMissingData).getData();
+ return new QueryResultProvider(queryParams,
+ this,
+ new DataExplorerInfluxQueryExecutor(),
+ ignoreMissingData
+ ).getData();
}
@Override
@@ -52,7 +58,11 @@ public class DataExplorerQueryManagement implements IDataExplorerQueryManagement
boolean ignoreMissingValues,
OutputStream outputStream) throws IOException {
- new StreamedQueryResultProvider(params, format, ignoreMissingValues).getDataAsStream(outputStream);
+ new StreamedQueryResultProvider(params, format,
+ this,
+ new DataExplorerInfluxQueryExecutor(),
+ ignoreMissingValues
+ ).getDataAsStream(outputStream);
}
@Override