This is an automated email from the ASF dual-hosted git repository. lta pushed a commit to branch fix_calmem_bug in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 959d1b33f82cef54f7255856f0182406e5b38fbf Merge: d7ac815 db7e8eb Author: lta <[email protected]> AuthorDate: Wed Feb 5 16:20:31 2020 +0800 Merge branch 'master' of github.com:apache/incubator-iotdb .../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 6 + .../apache/iotdb/db/qp/constant/SQLConstant.java | 2 + .../db/qp/executor/IQueryProcessExecutor.java | 2 - .../org/apache/iotdb/db/qp/logical/Operator.java | 2 +- .../db/qp/logical/crud/BasicFunctionOperator.java | 62 ++----- .../iotdb/db/qp/logical/crud/FilterOperator.java | 11 +- .../iotdb/db/qp/logical/crud/FunctionOperator.java | 7 + .../iotdb/db/qp/logical/crud/InOperator.java | 200 +++++++++++++++++++++ .../iotdb/db/qp/strategy/LogicalGenerator.java | 83 ++++++--- .../iotdb/db/qp/strategy/PhysicalGenerator.java | 2 +- .../qp/strategy/optimizer/ConcatPathOptimizer.java | 6 +- .../qp/strategy/optimizer/DnfFilterOptimizer.java | 2 +- .../db/qp/strategy/optimizer/IFilterOptimizer.java | 3 +- .../qp/strategy/optimizer/RemoveNotOptimizer.java | 15 +- .../groupby/GroupByWithValueFilterDataSet.java | 3 +- .../groupby/GroupByWithoutValueFilterDataSet.java | 1 - .../receiver/recover/ISyncReceiverLogAnalyzer.java | 1 - .../iotdb/db/integration/IoTDBQueryDemoIT.java | 134 +++++++++++++- .../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 40 +++++ .../read/expression/impl/GlobalTimeExpression.java | 2 +- .../expression/impl/SingleSeriesExpression.java | 2 +- .../iotdb/tsfile/read/filter/GroupByFilter.java | 2 +- .../iotdb/tsfile/read/filter/TimeFilter.java | 16 ++ .../iotdb/tsfile/read/filter/ValueFilter.java | 16 ++ .../tsfile/read/filter/basic/BinaryFilter.java | 2 +- .../iotdb/tsfile/read/filter/basic/Filter.java | 2 +- .../tsfile/read/filter/basic/UnaryFilter.java | 3 +- .../tsfile/read/filter/factory/FilterFactory.java | 2 - .../read/filter/factory/FilterSerializeId.java | 2 +- .../tsfile/read/filter/operator/AndFilter.java | 4 +- .../iotdb/tsfile/read/filter/operator/Eq.java | 6 +- .../iotdb/tsfile/read/filter/operator/Gt.java | 13 +- .../iotdb/tsfile/read/filter/operator/GtEq.java | 13 +- .../filter/operator/{NotFilter.java => In.java} | 92 +++++----- .../iotdb/tsfile/read/filter/operator/Lt.java | 13 +- .../iotdb/tsfile/read/filter/operator/LtEq.java | 13 +- .../iotdb/tsfile/read/filter/operator/NotEq.java | 13 +- .../tsfile/read/filter/operator/NotFilter.java | 4 +- .../tsfile/read/filter/operator/OrFilter.java | 4 +- 39 files changed, 585 insertions(+), 221 deletions(-)
