[incubator-iotdb] branch new_series_reader updated (9e7a076 -> c45fbbb)

[qi...@apache.org]

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

qiaojialin pushed a change to branch new_series_reader
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 9e7a076  add doc
     add 776da3b  fix sync schema pos bug (#767)
     add db7e8eb  [IOTDB-448]Add IN operation (#763)
     add 17f3a42  [IOTDB-459]Fix calmem tool bug (#770)
     add c45fbbb  resolve conflict after merging master

No new revisions were added by this update.

Summary of changes:
 .../org/apache/iotdb/db/qp/strategy/SqlBase.g4     |   6 +
 .../db/conf/adapter/IoTDBConfigDynamicAdapter.java |   4 +-
 .../apache/iotdb/db/qp/constant/SQLConstant.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   |  12 +-
 .../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 +-
 .../qp/strategy/optimizer/RemoveNotOptimizer.java  |  15 +-
 .../receiver/recover/ISyncReceiverLogAnalyzer.java |   1 -
 .../iotdb/db/sync/sender/transfer/SyncClient.java  |   7 +-
 .../iotdb/db/integration/IoTDBQueryDemoIT.java     | 135 +++++++++++++-
 .../apache/iotdb/db/qp/plan/PhysicalPlanTest.java  |  37 ++++
 .../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 +-
 37 files changed, 588 insertions(+), 219 deletions(-)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/InOperator.java
 copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/{NotFilter.java => In.java} (54%)
 mode change 100755 => 100644