You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2019/05/31 01:24:43 UTC
[incubator-iotdb] 02/05: merge master
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch cluster
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit f57d49f4c10ded893688ba61a085d25d07a8c1a6
Merge: 305906a 000891f
Author: lta <li...@163.com>
AuthorDate: Tue May 28 14:25:48 2019 +0800
merge master
README.md | 9 +
docs/Documentation/QuickStart.md | 10 +
.../UserGuideV0.7.0/4-Deployment and Management.md | 71 +++++-
.../UserGuideV0.7.0/5-SQL Documentation.md | 4 +-
.../iotdb/tsfile/hadoop/TSFRecordWriter.java | 11 +-
.../iotdb/tsfile/hadoop/example/TsFileHelper.java | 6 +-
.../cn/edu/thu/tsfile/hadoop/TsFileTestHelper.java | 6 +-
iotdb-cli/cli/bin/export-csv.bat | 10 +-
iotdb-cli/cli/bin/export-csv.sh | 8 +-
iotdb-cli/cli/bin/import-csv.bat | 10 +-
iotdb-cli/cli/bin/import-csv.sh | 8 +-
iotdb-cli/cli/bin/start-client.bat | 8 +-
iotdb-cli/cli/bin/start-client.sh | 6 +-
.../java/org/apache/iotdb/cli/tool/ImportCsv.java | 4 +-
.../iotdb/db/auth/authorizer/BasicAuthorizer.java | 3 +-
.../exception/BufferWriteProcessorException.java | 2 +-
.../db/exception/FileNodeProcessorException.java | 2 +-
.../db/exception/OverflowProcessorException.java | 2 +-
.../db/exception/qp/IllegalASTFormatException.java | 7 +
.../db/exception/qp/LogicalOperatorException.java | 7 +
.../db/exception/qp/LogicalOptimizeException.java | 7 +
.../db/exception/qp/QueryProcessorException.java | 4 +
.../org/apache/iotdb/db/qp/QueryProcessor.java | 2 +-
.../iotdb/db/qp/executor/QueryProcessExecutor.java | 2 +-
.../db/qp/logical/crud/BasicFunctionOperator.java | 2 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 2 +-
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 9 +-
.../db/query/aggregation/AggregateFunction.java | 1 -
.../db/query/aggregation/impl/MeanAggrFunc.java | 11 +-
.../db/query/aggregation/impl/SumAggrFunc.java | 10 +
.../apache/iotdb/db/service/CloseMergeService.java | 6 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 9 +-
.../org/apache/iotdb/db/service/JDBCService.java | 9 +-
.../org/apache/iotdb/db/service/JMXService.java | 5 +-
.../java/org/apache/iotdb/db/service/Monitor.java | 3 +-
.../apache/iotdb/db/service/RegisterManager.java | 2 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 13 +-
.../org/apache/iotdb/db/sql/parse/ParseDriver.java | 2 +-
.../org/apache/iotdb/db/utils/RecordUtils.java | 2 +-
.../writelog/manager/MultiFileLogNodeManager.java | 9 +-
.../db/writelog/node/ExclusiveWriteLogNode.java | 2 +-
.../recover/ExclusiveLogRecoverPerformer.java | 11 +-
.../db/writelog/replay/ConcreteLogReplayer.java | 2 +-
.../iotdb/db/integration/IoTDBAggregationIT.java | 86 +++++++-
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 6 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 6 +-
.../org/apache/iotdb/tsfile/DefaultSource.scala | 9 +-
.../tsfile/common/constant/QueryConstant.java | 6 -
.../tsfile/exception/write/PageException.java | 8 +
.../exception/write/WriteProcessException.java | 16 +-
.../apache/iotdb/tsfile/read/ReadOnlyTsFile.java | 17 +-
.../apache/iotdb/tsfile/read/common/TimeRange.java | 225 +++++++++++--------
.../tsfile/read/controller/MetadataQuerier.java | 39 +---
.../read/controller/MetadataQuerierByFileImpl.java | 189 ++++++++--------
.../tsfile/read/query/executor/TsFileExecutor.java | 100 ++++-----
.../iotdb/tsfile/write/chunk/ChunkBuffer.java | 7 +-
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 7 +-
.../iotdb/tsfile/read/ReadInPartitionTest.java | 244 ++++++++++++---------
.../iotdb/tsfile/read/common/TimeRangeTest.java | 42 +++-
.../controller/MetadataQuerierByFileImplTest.java | 156 ++++++++-----
60 files changed, 871 insertions(+), 611 deletions(-)
diff --cc iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
index 4614ade,592b009..3be00aa
--- a/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
@@@ -471,9 -465,10 +471,10 @@@ public class TSServiceImpl implements T
"Fail to generate physcial plan and execute for statement "
+ "%s beacuse %s",
statement, e.getMessage());
+ LOGGER.warn("Error occurred when executing {}", statement, e);
result.add(Statement.EXECUTE_FAILED);
isAllSuccessful = false;
- batchErrorMessage = errMessage;
+ batchErrorMessage.append(String.format(ERROR_MESSAGE_FORMAT_IN_BATCH, i, errMessage));
}
}
if (isAllSuccessful) {