You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by zy...@apache.org on 2023/03/08 02:45:38 UTC
[iotdb] branch rc/1.1.0 updated (32f9db0108 -> 06eee5eca1)
This is an automated email from the ASF dual-hosted git repository.
zyk pushed a change to branch rc/1.1.0
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 32f9db0108 [To rel/1.1][IOTDB-5620] Fix flush stuck when there is a lot of time partitions in each DataRegion (#9225)
new 7ce56fe220 [To rel/1.1] [IOTDB-5487] Fix the problem that the timestamp is "null" when using jdbc(#9234)
new 06eee5eca1 [To rel/1.1] Fix memory calculation is not accurate in SystemInfo (#9238)
The 2 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.
Summary of changes:
.../main/java/org/apache/iotdb/db/rescon/SystemInfo.java | 16 ++++++++--------
.../main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 1 +
2 files changed, 9 insertions(+), 8 deletions(-)
[iotdb] 02/02: [To rel/1.1] Fix memory calculation is not accurate in SystemInfo (#9238)
Posted by zy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zyk pushed a commit to branch rc/1.1.0
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 06eee5eca14f5971d9be737553831e3a51a3db6a
Author: Haonan <hh...@outlook.com>
AuthorDate: Wed Mar 8 10:08:09 2023 +0800
[To rel/1.1] Fix memory calculation is not accurate in SystemInfo (#9238)
---
.../main/java/org/apache/iotdb/db/rescon/SystemInfo.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/rescon/SystemInfo.java b/server/src/main/java/org/apache/iotdb/db/rescon/SystemInfo.java
index a355add54e..cad4629046 100644
--- a/server/src/main/java/org/apache/iotdb/db/rescon/SystemInfo.java
+++ b/server/src/main/java/org/apache/iotdb/db/rescon/SystemInfo.java
@@ -74,9 +74,9 @@ public class SystemInfo {
public synchronized boolean reportStorageGroupStatus(
DataRegionInfo dataRegionInfo, TsFileProcessor tsFileProcessor)
throws WriteProcessRejectException {
+ long currentDataRegionMemCost = dataRegionInfo.getMemCost();
long delta =
- dataRegionInfo.getMemCost()
- - reportedStorageGroupMemCostMap.getOrDefault(dataRegionInfo, 0L);
+ currentDataRegionMemCost - reportedStorageGroupMemCostMap.getOrDefault(dataRegionInfo, 0L);
totalStorageGroupMemCost += delta;
if (logger.isDebugEnabled()) {
logger.debug(
@@ -84,8 +84,8 @@ public class SystemInfo {
delta,
totalStorageGroupMemCost);
}
- reportedStorageGroupMemCostMap.put(dataRegionInfo, dataRegionInfo.getMemCost());
- dataRegionInfo.setLastReportedSize(dataRegionInfo.getMemCost());
+ reportedStorageGroupMemCostMap.put(dataRegionInfo, currentDataRegionMemCost);
+ dataRegionInfo.setLastReportedSize(currentDataRegionMemCost);
if (totalStorageGroupMemCost < FLUSH_THERSHOLD) {
return true;
} else if (totalStorageGroupMemCost >= FLUSH_THERSHOLD
@@ -127,15 +127,15 @@ public class SystemInfo {
* @param dataRegionInfo database
*/
public synchronized void resetStorageGroupStatus(DataRegionInfo dataRegionInfo) {
+ long currentDataRegionMemCost = dataRegionInfo.getMemCost();
long delta = 0;
-
if (reportedStorageGroupMemCostMap.containsKey(dataRegionInfo)) {
- delta = reportedStorageGroupMemCostMap.get(dataRegionInfo) - dataRegionInfo.getMemCost();
+ delta = reportedStorageGroupMemCostMap.get(dataRegionInfo) - currentDataRegionMemCost;
this.totalStorageGroupMemCost -= delta;
- dataRegionInfo.setLastReportedSize(dataRegionInfo.getMemCost());
+ dataRegionInfo.setLastReportedSize(currentDataRegionMemCost);
// report after reset sg status, because slow write may not reach the report threshold
dataRegionInfo.setNeedToReportToSystem(true);
- reportedStorageGroupMemCostMap.put(dataRegionInfo, dataRegionInfo.getMemCost());
+ reportedStorageGroupMemCostMap.put(dataRegionInfo, currentDataRegionMemCost);
}
if (totalStorageGroupMemCost >= FLUSH_THERSHOLD
[iotdb] 01/02: [To rel/1.1] [IOTDB-5487] Fix the problem that the timestamp is "null" when using jdbc(#9234)
Posted by zy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zyk pushed a commit to branch rc/1.1.0
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 7ce56fe2204721eb18591f91aa1961359a6e946e
Author: 任宇华 <79...@users.noreply.github.com>
AuthorDate: Tue Mar 7 19:20:28 2023 +0800
[To rel/1.1] [IOTDB-5487] Fix the problem that the timestamp is "null" when using jdbc(#9234)
[To rel/1.1] [IOTDB-5487] Fix the problem that the timestamp is "null" when using jdbc(#9234)
---
service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java b/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java
index 58a32f5e95..49711ab559 100644
--- a/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java
+++ b/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java
@@ -272,6 +272,7 @@ public class IoTDBRpcDataSet {
public boolean next() throws StatementExecutionException, IoTDBConnectionException {
if (hasCachedBlock()) {
constructOneRow();
+ lastReadWasNull = false;
return true;
}
if (hasCachedByteBuffer()) {