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/11/30 01:21:11 UTC
[iotdb] branch memtable_sort_in_query updated (03969d7 -> cfd2ca2)
This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a change to branch memtable_sort_in_query
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 03969d7 Merge branch 'master' of https://github.com/apache/iotdb into memtable_sort_in_query
add 1491050 Fix python path (#2127)
add afa6ecd The existing timePartitionId variable should be passed to the `insertToTsFileProcessor` method in the logic of inserting tsfile (#2111)
add 2735fa1 unlock mutil locks sequential (#2117)
add f9a972d fix import errors in Session.py and SessionExample.py
add abc6999 catch NullPointerException and log error (#2129)
add 875817b fix grafana value-time position bug (#2016)
add de4536a Declare the type of result of Future in StorageEngine (#2097)
add cfd2ca2 Merge branch 'master' of https://github.com/apache/iotdb into memtable_sort_in_query
No new revisions were added by this update.
Summary of changes:
client-py/compile.bat | 29 ----
client-py/compile.sh | 28 ----
client-py/pom.xml | 4 +-
client-py/pypi/README.md | 34 +++--
client-py/readme.md | 46 ++++---
client-py/src/SessionExample.py | 10 +-
client-py/src/{ => iotdb}/Session.py | 28 ++--
client-py/src/{utils => iotdb}/__init__.py | 0
client-py/src/{ => iotdb}/utils/Field.py | 5 +-
client-py/src/{ => iotdb}/utils/IoTDBConstants.py | 0
client-py/src/{ => iotdb}/utils/IoTDBRpcDataSet.py | 13 +-
client-py/src/{ => iotdb}/utils/RowRecord.py | 8 +-
client-py/src/{ => iotdb}/utils/SessionDataSet.py | 16 ++-
client-py/src/{ => iotdb}/utils/Tablet.py | 7 +-
client-py/src/{ => iotdb/utils}/__init__.py | 0
.../controller/DatabaseConnectController.java | 4 +-
.../iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 29 ++--
.../web/grafana/dao/impl/BasicDaoImplTest.java | 55 ++++++++
pom.xml | 2 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 7 +-
.../engine/storagegroup/StorageGroupProcessor.java | 8 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 147 +++++++++++++++------
thrift/src/main/thrift/cluster.thrift | 1 +
thrift/src/main/thrift/rpc.thrift | 1 +
thrift/src/main/thrift/sync.thrift | 1 +
25 files changed, 308 insertions(+), 175 deletions(-)
delete mode 100644 client-py/compile.bat
delete mode 100644 client-py/compile.sh
rename client-py/src/{ => iotdb}/Session.py (95%)
rename client-py/src/{utils => iotdb}/__init__.py (100%)
rename client-py/src/{ => iotdb}/utils/Field.py (98%)
rename client-py/src/{ => iotdb}/utils/IoTDBConstants.py (100%)
rename client-py/src/{ => iotdb}/utils/IoTDBRpcDataSet.py (97%)
rename client-py/src/{ => iotdb}/utils/RowRecord.py (91%)
rename client-py/src/{ => iotdb}/utils/SessionDataSet.py (92%)
rename client-py/src/{ => iotdb}/utils/Tablet.py (98%)
rename client-py/src/{ => iotdb/utils}/__init__.py (100%)
create mode 100644 grafana/src/test/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImplTest.java