You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/12/16 13:20:06 UTC
[incubator-iotdb] branch f_batch_reader updated (79fb8d5 -> 787faff)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch f_batch_reader
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 79fb8d5 Original query process (#653)
add 025653a try to fix the batch error. (#639)
add b0fd6b1 fix bug of dead lock in compression ratio (#641)
add 901012a fix a bug of renaming tsfile while it has naming conflicts (#640)
add 597da57 fix null pointer exception in tsfile recover performer
add 122fba0 Merge pull request #642 from apache/fix_jira_357
add f951bd3 [IOTDB-306] new reader with ChunkMetaData for aggregateFunction (#614)
add 8bf3401 Revert "[IOTDB-306] new reader with ChunkMetaData for aggregateFunction (#614)" (#644)
add 06654ab [IOTDB-363] Correct the doc link error for `Development-Contributing.md` and `Development-Document.md`.
add c50c73f Correct typo in Development-Contributing.md. (#649)
add f18b9ad [IOTDB-365] Improve the link of confluence in Development-Document.md (#651)
add df5dd1b [IOTDB-361]Refactor session management (#650)
add 5043dce [IOTDB-370] fix a multi-thread problem. (#659)
add 787faff resolve conflict after merging master
No new revisions were added by this update.
Summary of changes:
.travis.yml | 16 +-
client-py/src/client_example.py | 51 +-
docs/Development-Contributing.md | 6 +-
docs/Development-Document.md | 2 +-
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 151 ++---
.../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 30 +-
.../apache/iotdb/jdbc/IoTDBPreparedStatement.java | 59 +-
.../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 65 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 81 ++-
.../test/java/org/apache/iotdb/jdbc/BatchTest.java | 34 +-
.../org/apache/iotdb/jdbc/IoTDBConnectionTest.java | 10 +-
.../iotdb/jdbc/IoTDBDatabaseMetadataTest.java | 4 +-
.../iotdb/jdbc/IoTDBPreparedStatementTest.java | 38 +-
.../apache/iotdb/jdbc/IoTDBQueryResultSetTest.java | 59 +-
.../org/apache/iotdb/jdbc/IoTDBStatementTest.java | 20 +-
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 17 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 4 +-
.../engine/storagegroup/StorageGroupProcessor.java | 6 +-
.../qp/executor/AbstractQueryProcessExecutor.java | 22 +-
.../iotdb/db/qp/executor/QueryProcessExecutor.java | 20 +-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 5 -
.../apache/iotdb/db/qp/strategy/ParseDriver.java | 9 +-
.../iotdb/db/query/context/QueryContext.java | 10 +-
.../{JobFileManager.java => QueryFileManager.java} | 50 +-
.../db/query/control/QueryResourceManager.java | 35 +-
.../dataset/groupby/GroupByEngineDataSet.java | 6 +-
.../groupby/GroupByWithValueFilterDataSet.java | 4 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 4 +-
.../iotdb/db/query/executor/EngineQueryRouter.java | 11 +-
.../db/query/executor/FillEngineExecutor.java | 4 +-
.../db/query/externalsort/ExternalSortJob.java | 9 +-
.../query/externalsort/ExternalSortJobEngine.java | 3 -
.../externalsort/ExternalSortJobScheduler.java | 10 +-
.../externalsort/SimpleExternalSortEngine.java | 15 +-
.../resourceRelated/UnseqResourceMergeReader.java | 4 +-
.../UnseqResourceReaderByTimestamp.java | 2 +-
.../org/apache/iotdb/db/service/StaticResps.java | 89 +++
.../org/apache/iotdb/db/service/TSServiceImpl.java | 657 ++++++++++-----------
.../engine/modification/DeletionFileNodeTest.java | 4 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 2 +-
.../apache/iotdb/db/integration/IoTDBCloseIT.java | 12 +-
.../integration/IoTDBLoadExternalTsfileTest.java | 16 +-
.../db/integration/IoTDBMultiStatementsIT.java | 12 +-
.../iotdb/db/integration/IoTDBPreparedStmtIT.java | 202 -------
.../db/integration/IoTDBSequenceDataQueryIT.java | 12 +-
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 16 +-
.../db/query/control/FileReaderManagerTest.java | 6 +-
.../query/executor/GroupByEngineDataSetTest.java | 20 +-
.../query/externalsort/ExternalSortEngineTest.java | 2 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 11 +-
service-rpc/rpc-changelist.md | 21 +
service-rpc/src/main/thrift/rpc.thrift | 161 ++---
.../java/org/apache/iotdb/session/Session.java | 34 +-
.../org/apache/iotdb/session/SessionDataSet.java | 17 +-
.../iotdb/session/utils/EnvironmentUtils.java | 14 +-
.../apache/iotdb/spark/db/EnvironmentUtils.java | 6 +-
56 files changed, 1015 insertions(+), 1175 deletions(-)
rename server/src/main/java/org/apache/iotdb/db/query/control/{JobFileManager.java => QueryFileManager.java} (66%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/service/StaticResps.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/integration/IoTDBPreparedStmtIT.java