From ef1363d928a99e0a024447eb703d6848e4f296e1 Mon Sep 17 00:00:00 2001 From: Jared Tan Date: Sun, 15 Nov 2020 19:28:38 +0800 Subject: [PATCH] remove unused min date timebucket in jdbc delethistory logical. (#5845) * remove unused min date timebucket in jdbc delethistory logical. * update CHANGES.md --- CHANGES.md | 1 + .../elasticsearch/base/HistoryDeleteEsDAO.java | 2 +- .../plugin/influxdb/base/HistoryDeleteDAO.java | 2 +- .../plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java | 18 ++++++------------ 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index da53a495fa..4ea802ea09 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -41,6 +41,7 @@ Release Notes. * Make the codes and doc consistent in sharding server and core server. * Fix that chunked string is incorrect while the tag contains colon. * Fix the incorrect dynamic configuration key bug of `endpoint-name-grouping`. +* Remove unused min date timebucket in jdbc deletehistory logical #### UI * Fix incorrect label in radial chart in topology. diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/HistoryDeleteEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/HistoryDeleteEsDAO.java index db49ff1041..d1fcc521e9 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/HistoryDeleteEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/HistoryDeleteEsDAO.java @@ -49,7 +49,7 @@ public class HistoryDeleteEsDAO extends EsDAO implements IHistoryDeleteDAO { return; } } - deadline = Long.valueOf(new DateTime().plusDays(0 - ttl).toString("yyyyMMdd")); + deadline = Long.parseLong(new DateTime().plusDays(-ttl).toString("yyyyMMdd")); List indexes = client.retrievalIndexByAliases(model.getName()); diff --git a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/base/HistoryDeleteDAO.java b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/base/HistoryDeleteDAO.java index be97c2ed3a..dc17339869 100644 --- a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/base/HistoryDeleteDAO.java +++ b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/base/HistoryDeleteDAO.java @@ -40,7 +40,7 @@ public class HistoryDeleteDAO implements IHistoryDeleteDAO { log.debug("TTL execution log, model: {}", model.getName()); } try { - long deadline = Long.valueOf(new DateTime().plusDays(0 - ttl).toString("yyyyMMddHHmm")); + long deadline = Long.parseLong(new DateTime().plusDays(-ttl).toString("yyyyMMddHHmm")); client.deleteByQuery(model.getName(), TimeBucket.getTimestamp(deadline)); } catch (Exception e) { diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java index 31ffe50325..4f9dcf7ee8 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java @@ -39,34 +39,28 @@ public class H2HistoryDeleteDAO implements IHistoryDeleteDAO { @Override public void deleteHistory(Model model, String timeBucketColumnName, int ttl) throws IOException { SQLBuilder dataDeleteSQL = new SQLBuilder("delete from " + model.getName() + " where ") - .append(timeBucketColumnName).append("<= ? and ") - .append(timeBucketColumnName).append(">= ?"); - long minTimeBucket = 0; - DateTime minDate = new DateTime(1900, 1, 1, 0, 0); + .append(timeBucketColumnName).append("<= ? "); try (Connection connection = client.getConnection()) { long deadline; if (model.isRecord()) { - deadline = Long.valueOf(new DateTime().plusDays(0 - ttl).toString("yyyyMMddHHmmss")); + deadline = Long.parseLong(new DateTime().plusDays(-ttl).toString("yyyyMMddHHmmss")); } else { switch (model.getDownsampling()) { case Minute: - deadline = Long.valueOf(new DateTime().plusDays(0 - ttl).toString("yyyyMMddHHmm")); - minTimeBucket = Long.valueOf(minDate.toString("yyyyMMddHHmm")); + deadline = Long.parseLong(new DateTime().plusDays(-ttl).toString("yyyyMMddHHmm")); break; case Hour: - deadline = Long.valueOf(new DateTime().plusDays(0 - ttl).toString("yyyyMMddHH")); - minTimeBucket = Long.valueOf(minDate.toString("yyyyMMddHH")); + deadline = Long.parseLong(new DateTime().plusDays(-ttl).toString("yyyyMMddHH")); break; case Day: - deadline = Long.valueOf(new DateTime().plusDays(0 - ttl).toString("yyyyMMdd")); - minTimeBucket = Long.valueOf(minDate.toString("yyyyMMdd")); + deadline = Long.parseLong(new DateTime().plusDays(-ttl).toString("yyyyMMdd")); break; default: return; } } - client.execute(connection, dataDeleteSQL.toString(), deadline, minTimeBucket); + client.execute(connection, dataDeleteSQL.toString(), deadline); } catch (JDBCClientException | SQLException e) { throw new IOException(e.getMessage(), e); } -- GitLab