This is an automated email from the ASF dual-hosted git repository.

jiangtian pushed a commit to branch fix_insert_long_min_max
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 160b6aa19c2b1e89cc79ca93f78d6dee3ba6e9b2
Merge: bffdbf235ba 2076bf6b86c
Author: Tian Jiang <[email protected]>
AuthorDate: Wed Dec 18 19:19:37 2024 +0800

    Merge branch 'master' into fix_insert_long_min_max
    
    # Conflicts:
    #       
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java

 .../it/env/cluster/config/MppCommonConfig.java     |   6 +
 .../env/cluster/config/MppSharedCommonConfig.java  |   7 +
 .../org/apache/iotdb/itbase/env/CommonConfig.java  |   4 +
 .../iotdb/db/it/IoTDBSetConfigurationIT.java       |  52 +++
 .../db/it/query/IoTDBEncryptionValueQueryIT.java   |   2 +-
 .../it/session}/IoTDBSessionRelationalIT.java      | 372 ++++++++++++++++++++-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  14 +-
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  20 +-
 .../exception/sql/StatementAnalyzeException.java   |   4 +
 .../common/tsfile/PipeTsFileInsertionEvent.java    |  17 +-
 .../protocol/thrift/IoTDBDataNodeReceiver.java     |   3 +
 .../resource/memory/InsertNodeMemoryEstimator.java |   3 +
 .../db/pipe/resource/memory/PipeMemoryBlock.java   |  14 +-
 .../analyze/cache/partition/PartitionCache.java    |   2 +-
 .../queryengine/plan/execution/QueryExecution.java |   4 +-
 .../db/queryengine/plan/planner/IPlanner.java      |   4 +-
 .../queryengine/plan/planner/TreeModelPlanner.java |   5 +-
 .../plan/relational/planner/TableModelPlanner.java |   5 +-
 .../relational/sql/ast/WrappedInsertStatement.java |  20 +-
 .../plan/statement/crud/InsertBaseStatement.java   |   2 +-
 .../plan/statement/crud/InsertRowStatement.java    |   4 +-
 .../plan/statement/crud/InsertTabletStatement.java |   5 +-
 .../schemaengine/schemaregion/utils/MetaUtils.java |   9 +-
 .../dataregion/memtable/AbstractMemTable.java      |   4 +-
 .../memtable/AlignedWritableMemChunk.java          |   6 +-
 .../memtable/AlignedWritableMemChunkGroup.java     |   5 +
 .../memtable/IWritableMemChunkGroup.java           |   2 +
 .../dataregion/memtable/WritableMemChunkGroup.java |   5 +
 .../response/SubscriptionEventTsFileResponse.java  |   2 +-
 .../org/apache/iotdb/db/utils/CommonUtils.java     |  86 -----
 .../db/utils/datastructure/AlignedTVList.java      |  26 +-
 .../apache/iotdb/db/metadata/MetaUtilsTest.java    |   9 +-
 .../plan/statement/InsertStatementTest.java        |   2 +-
 .../conf/iotdb-system.properties.template          |   7 +-
 34 files changed, 590 insertions(+), 142 deletions(-)

diff --cc 
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 4d0705f108a,d0ffc118085..127eee66463
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@@ -2882,15 -2886,14 +2886,23 @@@ public class IoTDBDescriptor 
          BinaryAllocator.getInstance().close(true);
        }
  
 +      commonDescriptor
 +          .getConfig()
 +          .setTimestampPrecisionCheckEnabled(
 +              Boolean.parseBoolean(
 +                  properties.getProperty(
 +                      "timestamp_precision_check_enabled",
 +                      ConfigurationFileUtils.getConfigurationDefaultValue(
 +                          "timestamp_precision_check_enabled"))));
 +
+       conf.setEnablePartialInsert(
+           Boolean.parseBoolean(
+               Optional.ofNullable(
+                       properties.getProperty(
+                           "enable_partial_insert", 
String.valueOf(conf.isEnablePartialInsert())))
+                   .map(String::trim)
+                   .orElse(String.valueOf(conf.isEnablePartialInsert()))));
+ 
        // update query_sample_throughput_bytes_per_sec
        loadQuerySampleThroughput(properties);
        // update trusted_uri_pattern

Reply via email to