You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xu...@apache.org on 2020/02/08 05:28:17 UTC

[incubator-iotdb] branch new_series_reader updated (46542d3 -> 2ea5ff7)

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

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


    from 46542d3  delete useless local variable in groupby
     add 3ae6c17  fix bug using "both condition 2 and 3 should respond with error message"
     add d437c5e  Revert "fix bug using "both condition 2 and 3 should respond with error message""
     add 82e95cf  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     add fc97378  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     add c02a584  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     add f7886a9  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     add 7e48518  enable user to set environment variable
     add bffecf3  Revert "enable user to set environment variable"
     add f1806d4  Revert "Revert "enable user to set environment variable""
     add ed808c1  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     add 6211fa9  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     add 36694ad  merge
     add d3dd556  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     add 52ca919  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     add a247e1c  Merge branch 'master' of https://github.com/SilverNarcissus/incubator-iotdb
     add e3070dd  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     add a8ff3ca  merge
     add 1602a93  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     add ed2e485  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     add a5ef853  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     add 57f5126  merge
     add 77a84fd  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     add cc207a8  merge
     add 16b619c  merge
     add d044a23  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     add 43f67d3  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     add c5c20f0  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     add 1645ccc  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     add 0b82b29  init
     add 1e95c05  Add constant and not exist column
     add b87bfc7  Merge branch 'master' of https://github.com/apache/incubator-iotdb into IOTDB-447-query-as-much-as-possible
     add 979fe85  fix bug and add more tests
     add cc383cd  merge
     add 9daae58  add more test
     add d04339d  enable session handle duplicate columns
     add f4b7629  remove unused code
     add 2ea5ff7  Resolve conflict from IOTDB-447

No new revisions were added by this update.

Summary of changes:
 .../db/engine/storagegroup/TsFileProcessor.java    |   1 +
 .../iotdb/db/qp/physical/crud/QueryPlan.java       |  70 ++
 .../iotdb/db/qp/strategy/LogicalGenerator.java     |   9 +
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |  95 ++-
 .../qp/strategy/optimizer/ConcatPathOptimizer.java |  12 +-
 .../qp/strategy/optimizer/RemoveNotOptimizer.java  |   6 +
 .../db/query/dataset/DeviceIterateDataSet.java     |  47 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java | 149 +++-
 .../iotdb/db/integration/IoTDBGroupbyDeviceIT.java | 823 ++++++++++++++++++++-
 .../iotdb/db/integration/IoTDBMultiSeriesIT.java   |  20 +-
 .../org/apache/iotdb/session/SessionDataSet.java   | 141 ++--
 .../org/apache/iotdb/session/IoTDBSessionIT.java   |  53 ++
 .../org/apache/iotdb/tsfile/read/common/Field.java |  30 +
 .../apache/iotdb/tsfile/read/common/RowRecord.java |   5 +
 14 files changed, 1329 insertions(+), 132 deletions(-)