diff --git a/CHANGES.md b/CHANGES.md index da53a495fae615d12fa1262053e30b9850c24c5e..4ea802ea0903482097b39aaf03c8ab20f17806d2 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 db49ff1041064de194541566195e031033c733f2..d1fcc521e96b3a8e73eb343bcc6273591eb3f733 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 be97c2ed3abb853748fe1429d416224a3f1fdf1e..dc17339869d7f2a416bfab841eb40154dd797338 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 31ffe50325814f2e53672a05e9c5dae1a71b85da..4f9dcf7ee87886d2d72a897e156b03b67a2177d7 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); }