This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch optimize_query in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 547993a remove some unnecessary codes add 49af5b3 [IOTDB-311]Generate anything in test to the target directory. (#578) add 8c7b51a Bump jetty.version from 9.4.22.v20191022 to 9.4.24.v20191120 (#613) add 927239b [IOTDB-190] upgrade from antlr3 to antlr4 (#564) add a77f6b8 merge master No new revisions were added by this update. Summary of changes: client/src/test/resources/logback.xml | 2 +- .../apache/iotdb/hadoop/tsfile/TSFHadoopTest.java | 3 +- .../iotdb/hadoop/tsfile/constant/TestConstant.java | 12 +- hadoop/src/test/resources/logback.xml | 2 +- hive-connector/pom.xml | 6 + .../apache/iotdb/hive/TSFHiveInputFormatTest.java | 9 +- .../apache/iotdb/hive/TSFHiveRecordReaderTest.java | 3 +- .../apache/iotdb/hive/constant/TestConstant.java | 12 +- pom.xml | 8 +- server/pom.xml | 13 +- .../org/apache/iotdb/db/sql/parse/TqlLexer.g | 577 ------ .../org/apache/iotdb/db/sql/parse/TqlParser.g | 824 -------- .../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 830 ++++++++ .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 13 - .../exception/query/IllegalASTFormatException.java | 68 - ...ilureException.java => SQLParserException.java} | 18 +- .../org/apache/iotdb/db/qp/QueryProcessor.java | 46 +- .../apache/iotdb/db/qp/constant/SQLConstant.java | 17 +- .../iotdb/db/qp/constant/TqlParserConstant.java | 71 - .../db/qp/logical/crud/BasicFunctionOperator.java | 5 +- .../db/qp/logical/crud/BasicOperatorType.java | 5 +- .../iotdb/db/qp/strategy/LogicalGenerator.java | 1858 ++++++++---------- .../apache/iotdb/db/qp/strategy/ParseDriver.java | 72 + .../qp/strategy/optimizer/ConcatPathOptimizer.java | 3 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 9 +- .../org/apache/iotdb/db/sql/ParseGenerator.java | 43 - .../apache/iotdb/db/sql/parse/AstErrorNode.java | 58 - .../org/apache/iotdb/db/sql/parse/AstNode.java | 362 ---- .../apache/iotdb/db/sql/parse/AstNodeOrigin.java | 110 -- .../java/org/apache/iotdb/db/sql/parse/Node.java | 42 - .../org/apache/iotdb/db/sql/parse/ParseDriver.java | 192 -- .../org/apache/iotdb/db/sql/parse/ParseError.java | 52 - .../apache/iotdb/db/sql/parse/ParseException.java | 48 - .../org/apache/iotdb/db/sql/parse/ParseUtils.java | 43 - .../iotdb/db/auth/LocalFIleRoleAccessorTest.java | 3 +- .../iotdb/db/auth/LocalFileRoleManagerTest.java | 3 +- .../iotdb/db/auth/LocalFileUserAccessorTest.java | 3 +- .../iotdb/db/auth/LocalFileUserManagerTest.java | 3 +- .../strategy/DirectoryStrategyTest.java | 4 +- .../org/apache/iotdb/db/constant/TestConstant.java | 13 +- .../db/engine/cache/DeviceMetaDataCacheTest.java | 5 +- .../db/engine/memtable/MemTableFlushTaskTest.java | 5 +- .../apache/iotdb/db/engine/merge/MergeLogTest.java | 3 +- .../iotdb/db/engine/merge/MergeOverLapTest.java | 19 +- .../iotdb/db/engine/merge/MergePerfTest.java | 3 +- .../iotdb/db/engine/merge/MergeTaskTest.java | 3 +- .../apache/iotdb/db/engine/merge/MergeTest.java | 13 +- .../iotdb/db/engine/merge/MergeUpgradeTest.java | 13 +- .../engine/modification/ModificationFileTest.java | 6 +- .../io/LocalTextModificationAccessorTest.java | 6 +- .../storagegroup/StorageGroupProcessorTest.java | 5 +- .../engine/storagegroup/TsFileProcessorTest.java | 6 +- .../version/SimpleFileVersionControllerTest.java | 3 +- .../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 130 +- .../iotdb/db/qp/plan/TestConcatOptimizer.java | 5 +- .../iotdb/db/qp/strategy/LogicalGeneratorTest.java | 5 +- .../db/query/control/FileReaderManagerTest.java | 3 +- .../query/externalsort/ExternalSortEngineTest.java | 4 +- ...ExternalSortFileSerializerDeserializerTest.java | 3 +- .../iotdb/db/query/reader/ReaderTestHelper.java | 3 +- .../org/apache/iotdb/db/sql/TqlParserTest.java | 2021 -------------------- .../apache/iotdb/db/tools/IoTDBWatermarkTest.java | 5 +- .../org/apache/iotdb/db/tools/WalCheckerTest.java | 9 +- .../apache/iotdb/db/utils/EnvironmentUtils.java | 5 +- .../apache/iotdb/db/utils/OpenFileNumUtilTest.java | 3 +- server/src/test/resources/iotdb-engine.properties | 21 + server/src/test/resources/logback.xml | 2 +- .../org/apache/iotdb/session/IoTDBSessionIT.java | 2 + .../iotdb/session/utils/EnvironmentUtils.java | 4 - session/src/test/resources/iotdb-engine.properties | 20 + .../src/test/resources/iotdb-engine.properties | 21 + .../apache/iotdb/spark/db/EnvironmentUtils.java | 5 +- .../org/apache/iotdb/spark/db/IoTDBTest.scala | 2 + .../apache/iotdb/spark/constant/TestConstant.java | 9 +- .../apache/iotdb/spark/tsfile/ConverterTest.scala | 3 +- .../apache/iotdb/spark/tsfile/HDFSInputTest.java | 4 +- .../org/apache/iotdb/spark/tsfile/TSFileSuit.scala | 3 +- ...meseriesTestConstant.java => TestConstant.java} | 14 +- .../iotdb/tsfile/file/header/PageHeaderTest.java | 6 +- .../file/metadata/ChunkGroupMetaDataTest.java | 3 +- .../file/metadata/TimeSeriesMetadataTest.java | 4 +- .../file/metadata/TsDeviceMetadataIndexTest.java | 4 +- .../tsfile/file/metadata/TsFileMetaDataTest.java | 202 +- .../org/apache/iotdb/tsfile/read/ReadTest.java | 750 ++++---- .../iotdb/tsfile/read/TimePlainEncodeReadTest.java | 733 +++---- .../TsFileGeneratorForSeriesReaderByTimestamp.java | 451 ++--- .../apache/iotdb/tsfile/utils/BytesUtilsTest.java | 22 +- .../iotdb/tsfile/utils/CommonTestConstant.java | 31 - .../apache/iotdb/tsfile/utils/FileGenerator.java | 429 ++--- .../apache/iotdb/tsfile/utils/FileUtilsTest.java | 10 +- .../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 7 +- .../org/apache/iotdb/tsfile/write/PerfTest.java | 7 +- .../iotdb/tsfile/write/ReadPageInMemTest.java | 3 +- .../iotdb/tsfile/write/TsFileIOWriterTest.java | 3 +- .../iotdb/tsfile/write/TsFileReadWriteTest.java | 3 +- .../org/apache/iotdb/tsfile/write/WriteTest.java | 7 +- .../iotdb/tsfile/write/writer/PageWriterTest.java | 4 +- .../write/writer/RestorableTsFileIOWriterTest.java | 4 +- tsfile/src/test/resources/logback.xml | 2 +- 99 files changed, 3374 insertions(+), 7172 deletions(-) copy client/src/main/java/org/apache/iotdb/exception/ArgsErrorException.java => hadoop/src/test/java/org/apache/iotdb/hadoop/tsfile/constant/TestConstant.java (74%) copy client/src/main/java/org/apache/iotdb/exception/ArgsErrorException.java => hive-connector/src/test/java/org/apache/iotdb/hive/constant/TestConstant.java (74%) delete mode 100644 server/src/main/antlr3/org/apache/iotdb/db/sql/parse/TqlLexer.g delete mode 100644 server/src/main/antlr3/org/apache/iotdb/db/sql/parse/TqlParser.g create mode 100644 server/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4 delete mode 100644 server/src/main/java/org/apache/iotdb/db/exception/query/IllegalASTFormatException.java copy server/src/main/java/org/apache/iotdb/db/exception/runtime/{StorageEngineFailureException.java => SQLParserException.java} (65%) delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/constant/TqlParserConstant.java create mode 100644 server/src/main/java/org/apache/iotdb/db/qp/strategy/ParseDriver.java delete mode 100644 server/src/main/java/org/apache/iotdb/db/sql/ParseGenerator.java delete mode 100644 server/src/main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java delete mode 100644 server/src/main/java/org/apache/iotdb/db/sql/parse/AstNode.java delete mode 100644 server/src/main/java/org/apache/iotdb/db/sql/parse/AstNodeOrigin.java delete mode 100644 server/src/main/java/org/apache/iotdb/db/sql/parse/Node.java delete mode 100644 server/src/main/java/org/apache/iotdb/db/sql/parse/ParseDriver.java delete mode 100644 server/src/main/java/org/apache/iotdb/db/sql/parse/ParseError.java delete mode 100644 server/src/main/java/org/apache/iotdb/db/sql/parse/ParseException.java delete mode 100644 server/src/main/java/org/apache/iotdb/db/sql/parse/ParseUtils.java copy client/src/main/java/org/apache/iotdb/exception/ArgsErrorException.java => server/src/test/java/org/apache/iotdb/db/constant/TestConstant.java (73%) delete mode 100644 server/src/test/java/org/apache/iotdb/db/sql/TqlParserTest.java create mode 100644 server/src/test/resources/iotdb-engine.properties create mode 100644 session/src/test/resources/iotdb-engine.properties create mode 100644 spark-iotdb-connector/src/test/resources/iotdb-engine.properties copy server/src/main/java/org/apache/iotdb/db/rescon/TVListAllocatorMBean.java => spark-tsfile/src/test/scala/org/apache/iotdb/spark/constant/TestConstant.java (80%) rename tsfile/src/test/java/org/apache/iotdb/tsfile/constant/{TimeseriesTestConstant.java => TestConstant.java} (72%) mode change 100755 => 100644 delete mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/utils/CommonTestConstant.java