You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2023/05/23 02:05:35 UTC
[iotdb] branch rel/1.1 updated: [To rel/1.1][IOTDB-5888] Fix some logs didn't consider timestamp precision (#9917)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch rel/1.1
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.1 by this push:
new 70f69e4b21a [To rel/1.1][IOTDB-5888] Fix some logs didn't consider timestamp precision (#9917)
70f69e4b21a is described below
commit 70f69e4b21a930996104829a10789beed4387390
Author: Haonan <hh...@outlook.com>
AuthorDate: Tue May 23 10:05:29 2023 +0800
[To rel/1.1][IOTDB-5888] Fix some logs didn't consider timestamp precision (#9917)
---
.../org/apache/iotdb/db/engine/storagegroup/DataRegion.java | 10 ++++------
.../org/apache/iotdb/db/exception/query/OutOfTTLException.java | 4 ++--
.../java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java | 4 ++--
.../java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java | 4 ++--
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java
index 7127c2a96c8..aa550edb29e 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java
@@ -999,9 +999,8 @@ public class DataRegion implements IDataRegionForQuery {
TSStatusCode.OUT_OF_TTL,
String.format(
"Insertion time [%s] is less than ttl time bound [%s]",
- DateTimeUtils.convertMillsecondToZonedDateTime(currTime),
- DateTimeUtils.convertMillsecondToZonedDateTime(
- DateTimeUtils.currentTime() - dataTTL)));
+ DateTimeUtils.convertLongToDate(currTime),
+ DateTimeUtils.convertLongToDate(DateTimeUtils.currentTime() - dataTTL)));
loc++;
noFailure = false;
} else {
@@ -2929,9 +2928,8 @@ public class DataRegion implements IDataRegionForQuery {
TSStatusCode.OUT_OF_TTL.getStatusCode(),
String.format(
"Insertion time [%s] is less than ttl time bound [%s]",
- DateTimeUtils.convertMillsecondToZonedDateTime(insertRowNode.getTime()),
- DateTimeUtils.convertMillsecondToZonedDateTime(
- DateTimeUtils.currentTime() - dataTTL))));
+ DateTimeUtils.convertLongToDate(insertRowNode.getTime()),
+ DateTimeUtils.convertLongToDate(DateTimeUtils.currentTime() - dataTTL))));
continue;
}
// init map
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/query/OutOfTTLException.java b/server/src/main/java/org/apache/iotdb/db/exception/query/OutOfTTLException.java
index d2144f07b46..0eb4fe058ed 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/query/OutOfTTLException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/query/OutOfTTLException.java
@@ -32,8 +32,8 @@ public class OutOfTTLException extends WriteProcessException {
super(
String.format(
"Insertion time [%s] is less than ttl time bound [%s]",
- DateTimeUtils.convertMillsecondToZonedDateTime(insertionTime),
- DateTimeUtils.convertMillsecondToZonedDateTime(timeLowerBound)),
+ DateTimeUtils.convertLongToDate(insertionTime),
+ DateTimeUtils.convertLongToDate(timeLowerBound)),
TSStatusCode.OUT_OF_TTL.getStatusCode(),
true);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java b/server/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java
index b9cd280fcac..b3999965d0a 100644
--- a/server/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java
+++ b/server/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java
@@ -151,9 +151,9 @@ public class IoTDBDataDirViewer {
"| | | | |--device %s, start time %d (%s), end time %d (%s)",
device,
resource.getStartTime(device),
- DateTimeUtils.convertMillsecondToZonedDateTime(resource.getStartTime(device)),
+ DateTimeUtils.convertLongToDate(resource.getStartTime(device)),
resource.getEndTime(device),
- DateTimeUtils.convertMillsecondToZonedDateTime(resource.getEndTime(device))));
+ DateTimeUtils.convertLongToDate(resource.getEndTime(device))));
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java b/server/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java
index 94a6ab05dee..f86b8c75422 100644
--- a/server/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java
+++ b/server/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java
@@ -78,9 +78,9 @@ public class TsFileResourcePrinter {
"device %s, start time %d (%s), end time %d (%s)%n",
device,
resource.getStartTime(device),
- DateTimeUtils.convertMillsecondToZonedDateTime(resource.getStartTime(device)),
+ DateTimeUtils.convertLongToDate(resource.getStartTime(device)),
resource.getEndTime(device),
- DateTimeUtils.convertMillsecondToZonedDateTime(resource.getEndTime(device)));
+ DateTimeUtils.convertLongToDate(resource.getEndTime(device)));
}
System.out.println();
}