This is an automated email from the ASF dual-hosted git repository.
fjohn pushed a commit to branch datalake-rest-extension
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/datalake-rest-extension by
this push:
new 845aac2 Fix
845aac2 is described below
commit 845aac251c303f716ad4f8dddd406f2c3bd26b38
Author: Felix John <[email protected]>
AuthorDate: Thu Sep 24 14:58:07 2020 +0200
Fix
---
.../rest/impl/datalake/DataLakeManagementV3.java | 18 ++++++------------
.../rest/impl/datalake/DataLakeResourceV3.java | 10 ++--------
2 files changed, 8 insertions(+), 20 deletions(-)
diff --git
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeManagementV3.java
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeManagementV3.java
index f29a2bd..e192276 100644
---
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeManagementV3.java
+++
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeManagementV3.java
@@ -240,17 +240,15 @@ public class DataLakeManagementV3 {
}
- public void createRetentionPolicy(String policyName, String duration, String
shardDuration, int replication, boolean defaultPolicy) {
+ public void createRetentionPolicy(String policyName, String duration, String
shardDuration, int replication) {
InfluxDB influxDB = getInfluxDBClient();
- String defaultPolicyString = "";
- if (defaultPolicy) { defaultPolicyString = " DEFAULT"; }
String durationString = "";
if (duration != null) { durationString = " DURATION " + duration; }
String replicationString = "";
if (replication != 0) { replicationString = " REPLICATION " + replication;
}
String shardDurationString = "";
- if (shardDuration != null) { shardDuration = " SHARD DURATION " +
shardDuration; }
+ if (shardDuration != null) { shardDurationString = " SHARD DURATION " +
shardDuration; }
Query query = new Query("CREATE RETENTION POLICY "
+ policyName
@@ -258,8 +256,7 @@ public class DataLakeManagementV3 {
+ BackendConfig.INSTANCE.getInfluxDatabaseName()
+ durationString
+ replicationString
- + shardDurationString
- + defaultPolicyString,
+ + shardDurationString,
BackendConfig.INSTANCE.getInfluxDatabaseName());
QueryResult influx_result = influxDB.query(query);
@@ -270,17 +267,15 @@ public class DataLakeManagementV3 {
}
- public void alterRetentionPolicy(String policyName, String duration, String
shardDuration, int replication, boolean defaultPolicy) {
+ public void alterRetentionPolicy(String policyName, String duration, String
shardDuration, int replication) {
InfluxDB influxDB = getInfluxDBClient();
- String defaultPolicyString = "";
- if (defaultPolicy) { defaultPolicyString = " DEFAULT"; }
String durationString = "";
if (duration != null) { durationString = " DURATION " + duration; }
String replicationString = "";
if (replication != 0) { replicationString = " REPLICATION " + replication;
}
String shardDurationString = "";
- if (shardDuration != null) { shardDuration = " SHARD DURATION " +
shardDuration; }
+ if (shardDuration != null) { shardDurationString = " SHARD DURATION " +
shardDuration; }
Query query = new Query("ALTER RETENTION POLICY "
+ policyName
@@ -288,8 +283,7 @@ public class DataLakeManagementV3 {
+ BackendConfig.INSTANCE.getInfluxDatabaseName()
+ durationString
+ replicationString
- + shardDurationString
- + defaultPolicyString,
+ + shardDurationString,
BackendConfig.INSTANCE.getInfluxDatabaseName());
QueryResult influx_result = influxDB.query(query);
diff --git
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeResourceV3.java
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeResourceV3.java
index ccbb8e7..3cb678c 100644
---
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeResourceV3.java
+++
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeResourceV3.java
@@ -294,15 +294,12 @@ public class DataLakeResourceV3 extends
AbstractRestInterface {
String duration = info.getQueryParameters().getFirst("duration");
String replicationString =
info.getQueryParameters().getFirst("replication");
String shardDuration = info.getQueryParameters().getFirst("shardDuration");
- String defaultPolicyString =
info.getQueryParameters().getFirst("defaultPolicy");
Integer replication = 0;
- Boolean defaultPolicy = Boolean.FALSE;
if (replicationString != null) { replication =
Integer.parseInt(replicationString); }
- if (defaultPolicyString != null) { defaultPolicy = Boolean.TRUE; }
+ dataLakeManagement.createRetentionPolicy(policyName, duration,
shardDuration, replication);
- dataLakeManagement.createRetentionPolicy(policyName, duration,
shardDuration, replication, defaultPolicy);
return Response.ok("Successfully created retention policy.",
MediaType.TEXT_PLAIN).build();
}
@@ -316,15 +313,12 @@ public class DataLakeResourceV3 extends
AbstractRestInterface {
String duration = info.getQueryParameters().getFirst("duration");
String replicationString =
info.getQueryParameters().getFirst("replication");
String shardDuration = info.getQueryParameters().getFirst("shardDuration");
- String defaultPolicyString =
info.getQueryParameters().getFirst("defaultPolicy");
Integer replication = 0;
- Boolean defaultPolicy = Boolean.FALSE;
if (replicationString != null) { replication =
Integer.parseInt(replicationString); }
- if (defaultPolicyString != null) { defaultPolicy = Boolean.TRUE; }
- dataLakeManagement.alterRetentionPolicy(policyName, duration,
shardDuration, replication, defaultPolicy);
+ dataLakeManagement.alterRetentionPolicy(policyName, duration,
shardDuration, replication);
return Response.ok("Successfully altered retention policy.",
MediaType.TEXT_PLAIN).build();
}
}
