[streampipes] branch 1479-truncate-does-not-work-in-data-lake-configuration updated: Provide database name in query object (#1479)

[ri...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch 1479-truncate-does-not-work-in-data-lake-configuration
in repository https://gitbox.apache.org/repos/asf/streampipes.git


The following commit(s) were added to refs/heads/1479-truncate-does-not-work-in-data-lake-configuration by this push:
     new 50d31b55c Provide database name in query object (#1479)
50d31b55c is described below

commit 50d31b55ce7f4c0f5c72fdc91d93737d60ddca17
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Tue Apr 4 21:53:37 2023 +0200

    Provide database name in query object (#1479)
---
 .../influx/DataExplorerInfluxQueryExecutor.java          | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/influx/DataExplorerInfluxQueryExecutor.java b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/influx/DataExplorerInfluxQueryExecutor.java
index d0bbdc09f..54cd01b8e 100644
--- a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/influx/DataExplorerInfluxQueryExecutor.java
+++ b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/influx/DataExplorerInfluxQueryExecutor.java
@@ -18,6 +18,7 @@
 
 package org.apache.streampipes.dataexplorer.influx;
 
+import org.apache.streampipes.commons.environment.Environments;
 import org.apache.streampipes.dataexplorer.commons.influx.InfluxClientProvider;
 import org.apache.streampipes.dataexplorer.param.DeleteQueryParams;
 import org.apache.streampipes.dataexplorer.param.SelectQueryParams;
@@ -125,19 +126,19 @@ public class DataExplorerInfluxQueryExecutor extends DataExplorerQueryExecutor<Q
           + " AND time < "
           + params.getEndTime() * 1000000;
     }
-    return new Query(query);
+    return new Query(query, getDatabaseName());
   }
 
   @Override
   protected Query makeCountQuery(SelectQueryParams params) {
     var builder = getQueryBuilder(params.getIndex());
-    return params.toCountQuery(builder);
+    return getQueryWithDatabaseName(params.toCountQuery(builder));
   }
 
   @Override
   protected Query makeSelectQuery(SelectQueryParams params) {
     var builder = getQueryBuilder(params.getIndex());
-    return params.toQuery(builder);
+    return getQueryWithDatabaseName(params.toQuery(builder));
   }
 
   private boolean hasResult(QueryResult queryResult) {
@@ -145,4 +146,13 @@ public class DataExplorerInfluxQueryExecutor extends DataExplorerQueryExecutor<Q
         && queryResult.getResults().size() > 0
         && queryResult.getResults().get(0).getSeries() != null;
   }
+
+  private Query getQueryWithDatabaseName(Query query) {
+    var databaseName = getDatabaseName();
+    return new Query(query.getCommand(), databaseName);
+  }
+
+  private String getDatabaseName() {
+    return Environments.getEnvironment().getTsStorageBucket().getValueOrDefault();
+  }
 }