This is an automated email from the ASF dual-hosted git repository.
bossenti pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 60a349466d refactor: remove direct usage of couchDB client (#2757)
60a349466d is described below
commit 60a349466ddde48222e177216f562548e01e32f0
Author: Tim <[email protected]>
AuthorDate: Fri Apr 26 09:47:14 2024 +0200
refactor: remove direct usage of couchDB client (#2757)
* refactor: remove direct usage of couchDB client
* chore: remove lightcouch dependency
* Revert "chore: remove lightcouch dependency"
This reverts commit 672335154111d5b7463b32de3d1d6fc597cacbd2.
* refactor: restructure code
* style: adapt formatting
---
.../dataexplorer/DataExplorerSchemaManagement.java | 50 +++++-----------------
1 file changed, 11 insertions(+), 39 deletions(-)
diff --git
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/DataExplorerSchemaManagement.java
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/DataExplorerSchemaManagement.java
index 7db5bad83b..40eb818c2a 100644
---
a/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/DataExplorerSchemaManagement.java
+++
b/streampipes-data-explorer/src/main/java/org/apache/streampipes/dataexplorer/DataExplorerSchemaManagement.java
@@ -24,14 +24,7 @@ import org.apache.streampipes.model.datalake.DataLakeMeasure;
import
org.apache.streampipes.model.datalake.DataLakeMeasureSchemaUpdateStrategy;
import org.apache.streampipes.model.schema.EventProperty;
import org.apache.streampipes.storage.api.IDataLakeStorage;
-import org.apache.streampipes.storage.couchdb.utils.Utils;
-import com.google.gson.JsonObject;
-import org.lightcouch.CouchDbClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@@ -41,8 +34,6 @@ import java.util.stream.Stream;
public class DataExplorerSchemaManagement implements
IDataExplorerSchemaManagement {
- private static final Logger LOG =
LoggerFactory.getLogger(DataExplorerSchemaManagement.class);
-
IDataLakeStorage dataLakeStorage;
public DataExplorerSchemaManagement(IDataLakeStorage dataLakeStorage) {
@@ -80,7 +71,7 @@ public class DataExplorerSchemaManagement implements
IDataExplorerSchemaManageme
}
/**
- * Destiguishes between the update straregy for existing measurments
+ * Distinguishes between the update strategy for existing measurements
*/
private void handleExistingMeasurement(
DataLakeMeasure measure,
@@ -125,36 +116,17 @@ public class DataExplorerSchemaManagement implements
IDataExplorerSchemaManageme
@Override
public boolean deleteMeasurementByName(String measureName) {
- boolean isSuccess = false;
- CouchDbClient couchDbClient = Utils.getCouchDbDataLakeClient();
- List<JsonObject> docs = couchDbClient.view("_all_docs")
- .includeDocs(true)
- .query(JsonObject.class);
-
- for (JsonObject document : docs) {
- if (document.get("measureName")
- .toString()
- .replace("\"", "")
- .equals(measureName)) {
- couchDbClient.remove(
- document.get("_id")
- .toString()
- .replace("\"", ""),
- document.get("_rev")
- .toString()
- .replace("\"", "")
- );
- isSuccess = true;
- break;
- }
- }
-
- try {
- couchDbClient.close();
- } catch (IOException e) {
- LOG.error("Could not close CouchDB client", e);
+ var measureToDeleteOpt = dataLakeStorage.getAllDataLakeMeasures()
+ .stream()
+ .filter(measurement ->
measurement.getMeasureName()
+
.equals(measureName))
+ .findFirst();
+
+ return measureToDeleteOpt.map(measure -> {
+ dataLakeStorage.deleteDataLakeMeasure(measure.getElementId());
+ return true;
}
- return isSuccess;
+ ).orElse(false);
}
@Override