This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch dev_merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from e5e6cbb clean an import
add ab7d2db Add micro and nano timestamp precision (#285)
add 43af5fe Merge branch 'master' into dev_merge
No new revisions were added by this update.
Summary of changes:
.../apache/iotdb/cli/client/AbstractClient.java | 63 ++++-
.../java/org/apache/iotdb/cli/client/Client.java | 2 +
.../org/apache/iotdb/cli/client/WinClient.java | 2 +
.../org/apache/iotdb/jdbc/IoTDBConnectionTest.java | 4 +-
server/iotdb/conf/iotdb-engine.properties | 9 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 34 ++-
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 94 +++++++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 5 +
.../apache/iotdb/db/qp/constant/DatetimeUtils.java | 297 +++++++++++++++++++--
.../iotdb/db/qp/strategy/LogicalGenerator.java | 2 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 +
.../org/apache/iotdb/db/service/TSServiceImpl.java | 1 +
.../db/sql/DatetimeQueryDataSetUtilsTest.java | 8 +-
service-rpc/src/main/thrift/rpc.thrift | 1 +
14 files changed, 494 insertions(+), 30 deletions(-)
create mode 100644
server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
