You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2021/11/26 03:19:35 UTC
[iotdb] branch iotdb-2062 created (now ac835cb)
This is an automated email from the ASF dual-hosted git repository.
rong pushed a change to branch iotdb-2062
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at ac835cb fill exception instance into QueryProcessException if executor is down
This branch includes the following new commits:
new 529d6a5 fix leaks in SingleInputColumnSingleReferenceIntermediateLayer#constructRowSlidingSizeWindowReader() and SingleInputColumnSingleReferenceIntermediateLayer#constructRowSlidingTimeWindowReader()
new ac835cb fill exception instance into QueryProcessException if executor is down
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.
[iotdb] 02/02: fill exception instance into QueryProcessException if executor is down
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch iotdb-2062
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ac835cb70c327455ceae201c6296b8382606d5c3
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Fri Nov 26 11:17:53 2021 +0800
fill exception instance into QueryProcessException if executor is down
---
.../org/apache/iotdb/db/exception/query/QueryProcessException.java | 4 ++++
.../org/apache/iotdb/db/query/udf/core/executor/UDTFExecutor.java | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/query/QueryProcessException.java b/server/src/main/java/org/apache/iotdb/db/exception/query/QueryProcessException.java
index e36b67f..6ea4ad3 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/query/QueryProcessException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/query/QueryProcessException.java
@@ -38,6 +38,10 @@ public class QueryProcessException extends IoTDBException {
super(message, errorCode);
}
+ public QueryProcessException(String message, Throwable cause) {
+ super(message, cause, TSStatusCode.QUERY_PROCESS_ERROR.getStatusCode());
+ }
+
public QueryProcessException(IoTDBException e) {
super(e, e.getErrorCode(), e.isUserException());
}
diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/core/executor/UDTFExecutor.java b/server/src/main/java/org/apache/iotdb/db/query/udf/core/executor/UDTFExecutor.java
index 48b94f9..184e063 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/udf/core/executor/UDTFExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/udf/core/executor/UDTFExecutor.java
@@ -107,7 +107,8 @@ public class UDTFExecutor {
throw new QueryProcessException(
String.format(
"Error occurred during executing UDTF#%s: %s", methodName, System.lineSeparator())
- + e);
+ + e,
+ e);
}
public FunctionExpression getExpression() {
[iotdb] 01/02: fix leaks in SingleInputColumnSingleReferenceIntermediateLayer#constructRowSlidingSizeWindowReader() and SingleInputColumnSingleReferenceIntermediateLayer#constructRowSlidingTimeWindowReader()
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch iotdb-2062
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 529d6a58bd5415024cbce2c815dbcc28b8422f92
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Fri Nov 26 11:10:49 2021 +0800
fix leaks in SingleInputColumnSingleReferenceIntermediateLayer#constructRowSlidingSizeWindowReader() and SingleInputColumnSingleReferenceIntermediateLayer#constructRowSlidingTimeWindowReader()
---
.../core/layer/SingleInputColumnSingleReferenceIntermediateLayer.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputColumnSingleReferenceIntermediateLayer.java b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputColumnSingleReferenceIntermediateLayer.java
index 3dc3e34..be5d41c 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputColumnSingleReferenceIntermediateLayer.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputColumnSingleReferenceIntermediateLayer.java
@@ -144,6 +144,8 @@ public class SingleInputColumnSingleReferenceIntermediateLayer extends Intermedi
@Override
public void readyForNext() {
hasCached = false;
+
+ tvList.setEvictionUpperBound(beginIndex + 1);
}
@Override
@@ -234,6 +236,8 @@ public class SingleInputColumnSingleReferenceIntermediateLayer extends Intermedi
public void readyForNext() {
hasCached = false;
nextWindowTimeBegin += slidingStep;
+
+ tvList.setEvictionUpperBound(nextIndexBegin + 1);
}
@Override