You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by su...@apache.org on 2019/07/15 12:02:14 UTC
[incubator-iotdb] 03/04: merge master
This is an automated email from the ASF dual-hosted git repository.
suyue pushed a commit to branch feature_query_cache
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit c37b8d0a81757de950460dd949fc868b902b2591
Merge: e580a29 e734368
Author: suyue <23...@qq.com>
AuthorDate: Mon Jul 15 16:31:16 2019 +0800
merge master
docs/Community-Powered By.md | 8 +-
docs/Development.md | 55 +--
docs/Documentation-CHN/QuickStart.md | 17 +
.../4-Deployment and Management/2-Configuration.md | 12 +-
.../4-Performance Monitor.md | 78 ++++
.../{4-System log.md => 5-System log.md} | 0
.../{5-Data Management.md => 6-Data Management.md} | 0
...e.md => 7-Build and use IoTDB by Dockerfile.md} | 0
.../UserGuideV0.7.0/7-Tools-Cli.md | 8 +
.../UserGuideV0.7.0/7-Tools-Grafana.md | 17 +
docs/Documentation/Frequently asked questions.md | 20 +-
.../OtherMaterial-ReleaseNotesV0.7.0.md | 16 +-
docs/Documentation/OtherMaterial-Sample Data.md | 8 +-
docs/Documentation/QuickStart.md | 22 +-
.../4-Deployment and Management/2-Configuration.md | 14 +-
.../4-Performance Monitor.md | 79 ++++
.../{4-System log.md => 5-System log.md} | 0
.../{5-Data Management.md => 6-Data Management.md} | 0
...e.md => 7-Build and use IoTDB by Dockerfile.md} | 0
docs/Documentation/UserGuideV0.7.0/7-Tools-Cli.md | 8 +-
.../UserGuideV0.7.0/7-Tools-Grafana.md | 25 +-
.../UserGuideV0.7.0/7-Tools-Hadoop.md | 3 +-
docs/Documentation/UserGuideV0.7.0/7-Tools-Sync.md | 20 +-
.../Documentation/UserGuideV0.7.0/7-Tools-spark.md | 59 +--
.../iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 3 +-
iotdb/iotdb/conf/iotdb-engine.properties | 12 +
iotdb/iotdb/conf/logback.xml | 20 +
iotdb/pom.xml | 20 +
.../org/apache/iotdb/db/concurrent/ThreadName.java | 3 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 38 ++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 10 +
.../directories/strategy/DirectoryStrategy.java | 31 +-
.../strategy/MaxDiskUsableSpaceFirstStrategy.java | 8 +-
.../MinFolderOccupiedSpaceFirstStrategy.java | 35 +-
.../directories/strategy/SequenceStrategy.java | 12 +-
.../db/cost/statistic/ConcurrentCircularArray.java | 69 ++++
.../iotdb/db/cost/statistic/Measurement.java | 458 +++++++++++++++++++++
.../iotdb/db/cost/statistic/MeasurementMBean.java | 72 ++++
.../statistic/Operation.java} | 28 +-
.../engine/storagegroup/StorageGroupProcessor.java | 7 +-
.../db/engine/storagegroup/TsFileProcessor.java | 6 +-
.../db/engine/storagegroup/TsFileResource.java | 4 +
.../org/apache/iotdb/db/metadata/MManager.java | 5 +
.../org/apache/iotdb/db/qp/QueryProcessor.java | 3 +-
.../qp/executor/AbstractQueryProcessExecutor.java | 13 -
.../db/qp/executor/IQueryProcessExecutor.java | 4 -
.../iotdb/db/qp/strategy/LogicalGenerator.java | 6 +-
.../org/apache/iotdb/db/rescon/MemTablePool.java | 2 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 +
.../org/apache/iotdb/db/service/ServiceType.java | 1 +
.../org/apache/iotdb/db/service/TSServiceImpl.java | 37 +-
.../org/apache/iotdb/db/utils/CommonUtils.java | 20 +
.../writelog/recover/TsFileRecoverPerformer.java | 35 +-
.../strategy/DirectoryStrategyTest.java | 177 ++++++++
.../db/cost/statistic/PerformanceStatTest.java | 107 +++++
.../db/engine/memtable/MemTableFlushTaskTest.java | 6 +-
.../engine/storagegroup/TsFileProcessorTest.java | 84 +++-
.../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 10 +-
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 10 +-
.../apache/iotdb/db/qp/utils/MemIntQpExecutor.java | 4 -
.../apache/iotdb/db/utils/EnvironmentUtils.java | 2 +-
.../iotdb/db/writelog/WriteLogNodeManagerTest.java | 6 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 14 +-
pom.xml | 2 +-
spark/README.md | 2 +-
.../scala/org/apache/iotdb/tsfile/Converter.scala | 24 +-
.../apache/iotdb/tsfile/TsFileOutputWriter.scala | 6 +-
.../apache/iotdb/tsfile/TsFileWriterFactory.scala | 5 +-
.../org/apache/iotdb/tsfile/ConverterTest.scala | 7 +-
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 6 +-
.../{SystemConstant.java => TsFileConstant.java} | 4 +-
.../iotdb/tsfile/file/metadata/ChunkMetaData.java | 26 +-
.../iotdb/tsfile/file/metadata/TsDigest.java | 24 ++
.../file/metadata/statistics/Statistics.java | 14 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 19 +-
.../org/apache/iotdb/tsfile/read/common/Path.java | 30 +-
.../java/org/apache/iotdb/tsfile/utils/Binary.java | 2 +-
.../write/writer/RestorableTsFileIOWriter.java | 57 ++-
.../tsfile/file/metadata/utils/TestHelper.java | 5 +-
.../write/writer/RestorableTsFileIOWriterTest.java | 22 +
80 files changed, 1768 insertions(+), 340 deletions(-)
diff --cc iotdb/pom.xml
index 32d7a5e,44fb7d2..6965929
--- a/iotdb/pom.xml
+++ b/iotdb/pom.xml
@@@ -70,11 -70,25 +70,31 @@@
<artifactId>commons-lang3</artifactId>
<version>${common.lang3.version}</version>
</dependency>
++
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <!-- for mocked test-->
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-core</artifactId>
+ <version>2.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>2.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito2</artifactId>
+ <version>2.0.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>