You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/05/11 13:07:29 UTC
[iotdb] branch xingtanzjr/0511_test updated (43aad05646 -> 9e4749ae46)
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a change to branch xingtanzjr/0511_test
in repository https://gitbox.apache.org/repos/asf/iotdb.git
discard 43aad05646 add log and error handle when send fragment instance
discard 0c5e8fd3e8 add send fragmentinstance log
add c9e006a585 Implement CommonDescriptor and refactor CommonConfig usage (#5860)
add 4713668ab8 [IOTDB-3068] Cache datatype/isConstant to reduce redundant function calls when calculating expressions (#5844)
add 89ab2805a5 [IOTDB-3155] Optimize the schedule of MPP framework (#5863)
add 542ba05ee4 [IOTDB-3143] Potential bug fix for library-udf (#5857)
new e75fc7bb5f add send fragmentinstance log
new 96d0b95419 add log and error handle when send fragment instance
add ee335be10a Fix cached client error after node restarting
new 9e4749ae46 Merge branch 'BrokenPipe' into xingtanzjr/0511_test
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (43aad05646)
\
N -- N -- N refs/heads/xingtanzjr/0511_test (9e4749ae46)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 3 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:
.../iotdb/confignode/conf/ConfigNodeConf.java | 13 +-
.../confignode/conf/ConfigNodeDescriptor.java | 28 ++-
.../confignode/conf/ConfigNodeStartupCheck.java | 3 +-
.../iotdb/confignode/manager/ConfigManager.java | 3 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 3 +-
.../iotdb/db/integration/IoTDBArithmeticIT.java | 4 +-
.../apache/iotdb/db/integration/IoTDBTtlIT.java | 6 +-
library-udf/pom.xml | 5 +
.../apache/iotdb/library/dprofile/UDTFPACF.java | 2 +-
.../org/apache/iotdb/library/dprofile/UDTFQLB.java | 2 +-
.../iotdb/library/dprofile/util/MADSketch.java | 12 +-
.../iotdb/library/dprofile/util/Resampler.java | 17 --
.../library/dquality/util/TimeSeriesQuality.java | 30 +---
.../apache/iotdb/library/drepair/util/ARFill.java | 19 +-
.../iotdb/library/drepair/util/LikelihoodFill.java | 8 +-
.../iotdb/library/drepair/util/LsGreedy.java | 5 -
.../apache/iotdb/library/drepair/util/Screen.java | 5 -
.../iotdb/library/drepair/util/ScreenFill.java | 3 +-
.../library/drepair/util/TimestampRepair.java | 33 +++-
.../iotdb/library/drepair/util/ValueFill.java | 9 +-
.../iotdb/library/drepair/util/ValueRepair.java | 26 ---
.../iotdb/library/frequency/util/FFTUtil.java | 8 +-
.../iotdb/library/util/LinearRegression.java | 8 +
.../java/org/apache/iotdb/library/util/Util.java | 8 +-
.../commons/auth/authorizer/BasicAuthorizer.java | 7 +-
.../auth/authorizer/LocalFileAuthorizer.java | 3 +-
.../commons/auth/authorizer/OpenIdAuthorizer.java | 3 +-
.../iotdb/commons/auth/user/BasicUserManager.java | 9 +-
.../client/sync/SyncConfigNodeIServiceClient.java | 19 +-
.../sync/SyncDataNodeDataBlockServiceClient.java | 19 +-
.../sync/SyncDataNodeInternalServiceClient.java | 21 ++-
.../commons/client/sync/SyncThriftClient.java | 6 +
.../sync/SyncThriftClientWithErrorHandler.java | 21 ++-
.../apache/iotdb/commons/conf/CommonConfig.java | 29 ++--
.../iotdb/commons/conf/CommonDescriptor.java | 81 +++++++++
.../iotdb/commons/file/SystemFileFactory.java | 5 +-
.../org/apache/iotdb/commons/utils/AuthUtils.java | 10 +-
.../rocksdb/mnode/RStorageGroupMNode.java | 4 +-
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 5 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 18 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 44 +----
.../mpp/FragmentInstanceDispatchException.java | 9 +-
.../iotdb/db/metadata/mtree/MTreeAboveSG.java | 9 +-
.../db/metadata/mtree/store/MemMTreeStore.java | 4 +-
.../store/disk/schemafile/MockSchemaFile.java | 4 +-
.../mtree/store/disk/schemafile/SchemaFile.java | 3 +-
.../apache/iotdb/db/mpp/common/PlanFragmentId.java | 2 +-
.../db/mpp/common/schematree/PathPatternTree.java | 1 +
.../execution/fragment/FragmentInstanceInfo.java | 11 +-
.../fragment/FragmentInstanceManager.java | 2 +-
.../org/apache/iotdb/db/mpp/plan/Coordinator.java | 11 ++
.../db/mpp/plan/execution/QueryExecution.java | 6 +-
.../node/metedata/read/SchemaFetchScanNode.java | 1 +
.../planner/plan/node/process/ExchangeNode.java | 2 +-
.../db/mpp/plan/scheduler/ClusterScheduler.java | 6 +-
.../scheduler/FragmentInstanceDispatcherImpl.java | 191 +++++++++++++++++++++
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 4 +-
.../qp/physical/crud/InsertMultiTabletsPlan.java | 4 +-
...InputColumnMultiReferenceIntermediateLayer.java | 32 ++--
.../binary/ArithmeticBinaryTransformer.java | 19 +-
.../core/transformer/binary/BinaryTransformer.java | 32 +++-
.../binary/CompareBinaryTransformer.java | 20 ++-
.../binary/CompareEqualToTransformer.java | 27 ++-
.../binary/CompareNonEqualTransformer.java | 30 ++--
.../transformer/binary/LogicBinaryTransformer.java | 17 +-
.../transformer/multi/UDFQueryTransformer.java | 38 ++--
.../unary/ArithmeticNegationTransformer.java | 4 +-
.../udf/core/transformer/unary/InTransformer.java | 9 +-
.../transformer/unary/LogicNotTransformer.java | 11 +-
.../core/transformer/unary/RegularTransformer.java | 11 +-
.../transformer/unary/TransparentTransformer.java | 4 +-
.../core/transformer/unary/UnaryTransformer.java | 9 +-
.../auth/authorizer/LocalFileAuthorizerTest.java | 4 +-
.../db/auth/authorizer/OpenIdAuthorizerTest.java | 3 +-
.../db/auth/user/LocalFileUserManagerTest.java | 4 +-
.../iotdb/db/mpp/plan/plan/QueryPlannerTest.java | 1 +
.../security/encrypt/MessageDigestEncryptTest.java | 4 +-
77 files changed, 713 insertions(+), 400 deletions(-)
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java
copy cluster/src/main/java/org/apache/iotdb/cluster/exception/LogExecutionException.java => server/src/main/java/org/apache/iotdb/db/exception/mpp/FragmentInstanceDispatchException.java (81%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java
[iotdb] 03/03: Merge branch 'BrokenPipe' into xingtanzjr/0511_test
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch xingtanzjr/0511_test
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 9e4749ae469e575e9040f65a9e4c63d8bfe0992e
Merge: 96d0b95419 ee335be10a
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Wed May 11 21:07:17 2022 +0800
Merge branch 'BrokenPipe' into xingtanzjr/0511_test
.../client/sync/SyncConfigNodeIServiceClient.java | 19 ++++++++++++-------
.../sync/SyncDataNodeDataBlockServiceClient.java | 19 ++++++++++++-------
.../sync/SyncDataNodeInternalServiceClient.java | 21 +++++++++++++--------
.../iotdb/commons/client/sync/SyncThriftClient.java | 6 ++++++
.../sync/SyncThriftClientWithErrorHandler.java | 21 ++++++++++++++++++---
5 files changed, 61 insertions(+), 25 deletions(-)
[iotdb] 01/03: add send fragmentinstance log
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch xingtanzjr/0511_test
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit e75fc7bb5f308e04690a69ec4accf4bcca833b3d
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Wed May 11 16:05:35 2022 +0800
add send fragmentinstance log
---
.../apache/iotdb/db/mpp/plan/scheduler/SimpleFragInstanceDispatcher.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/SimpleFragInstanceDispatcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/SimpleFragInstanceDispatcher.java
index 969ff3cca1..c91f0bc313 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/SimpleFragInstanceDispatcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/SimpleFragInstanceDispatcher.java
@@ -69,6 +69,7 @@ public class SimpleFragInstanceDispatcher implements IFragInstanceDispatcher {
TSendFragmentInstanceReq req =
new TSendFragmentInstanceReq(
new TFragmentInstance(buffer), groupId, instance.getType().toString());
+ LOGGER.info("send FragmentInstance[{}] to {}", instance.getId(), endPoint);
resp = client.sendFragmentInstance(req);
} catch (IOException e) {
LOGGER.error("can't connect to node {}", endPoint, e);
[iotdb] 02/03: add log and error handle when send fragment instance
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch xingtanzjr/0511_test
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 96d0b95419096ffd5aad7a601c5f11c07da31383
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Wed May 11 16:42:23 2022 +0800
add log and error handle when send fragment instance
---
.../iotdb/db/mpp/plan/scheduler/SimpleFragInstanceDispatcher.java | 3 ++-
.../org/apache/iotdb/db/service/thrift/impl/InternalServiceImpl.java | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/SimpleFragInstanceDispatcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/SimpleFragInstanceDispatcher.java
index c91f0bc313..ba53e4fe2d 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/SimpleFragInstanceDispatcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/SimpleFragInstanceDispatcher.java
@@ -28,6 +28,7 @@ import org.apache.iotdb.mpp.rpc.thrift.TFragmentInstance;
import org.apache.iotdb.mpp.rpc.thrift.TSendFragmentInstanceReq;
import org.apache.iotdb.mpp.rpc.thrift.TSendFragmentInstanceResp;
+import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,7 +72,7 @@ public class SimpleFragInstanceDispatcher implements IFragInstanceDispatcher {
new TFragmentInstance(buffer), groupId, instance.getType().toString());
LOGGER.info("send FragmentInstance[{}] to {}", instance.getId(), endPoint);
resp = client.sendFragmentInstance(req);
- } catch (IOException e) {
+ } catch (IOException | TException e) {
LOGGER.error("can't connect to node {}", endPoint, e);
throw e;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/InternalServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/InternalServiceImpl.java
index e2a1fff0c3..54b9f82278 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/InternalServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/InternalServiceImpl.java
@@ -87,6 +87,7 @@ public class InternalServiceImpl implements InternalService.Iface {
@Override
public TSendFragmentInstanceResp sendFragmentInstance(TSendFragmentInstanceReq req) {
+ LOGGER.info("receive FragmentInstance to group[{}]", req.getConsensusGroupId());
QueryType type = QueryType.valueOf(req.queryType);
ConsensusGroupId groupId =
ConsensusGroupId.Factory.createFromTConsensusGroupId(req.getConsensusGroupId());