This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch OOMImprove
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from e329b25 resolve conflicts
add 084bf02 remove useless limit in logical plan generating
No new revisions were added by this update.
Summary of changes:
.../main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 3 +++
.../main/java/org/apache/iotdb/db/metadata/MManager.java | 4 ++--
.../src/main/java/org/apache/iotdb/db/metadata/MTree.java | 3 +--
server/src/main/java/org/apache/iotdb/db/qp/Planner.java | 14 ++++++--------
.../db/qp/strategy/optimizer/ConcatPathOptimizer.java | 14 +++++++-------
.../iotdb/db/qp/strategy/optimizer/ILogicalOptimizer.java | 2 +-
.../test/java/org/apache/iotdb/db/metadata/MTreeTest.java | 6 +++---
.../org/apache/iotdb/db/qp/plan/LogicalPlanSmallTest.java | 2 +-
8 files changed, 24 insertions(+), 24 deletions(-)