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/17 02:32:09 UTC
[iotdb] branch fix_log_issue_about_precision created (now fcbc5ff212)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch fix_log_issue_about_precision
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at fcbc5ff212 [IOTDB-5888] Fix some logs didn't consider timestamp precision
This branch includes the following new commits:
new fcbc5ff212 [IOTDB-5888] Fix some logs didn't consider timestamp precision
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: [IOTDB-5888] Fix some logs didn't consider timestamp precision
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch fix_log_issue_about_precision
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit fcbc5ff2121f87a7c6eff75dc954080678f7d67e
Author: HTHou <hh...@outlook.com>
AuthorDate: Wed May 17 10:26:51 2023 +0800
[IOTDB-5888] Fix some logs didn't consider timestamp precision
---
.../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 7da25c217f..b82fc128ba 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
@@ -1003,9 +1003,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 {
@@ -3168,9 +3167,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 d2144f07b4..0eb4fe058e 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 b9cd280fca..b3999965d0 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 94a6ab05de..f86b8c7542 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();
}