[iotdb] branch ZYBug updated: optimize for tw

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jackietien pushed a commit to branch ZYBug
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/ZYBug by this push:
     new f23b05f  optimize for tw
f23b05f is described below

commit f23b05fed9a430b9365393122736328ffefb63fd
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Thu Nov 5 16:07:10 2020 +0800

    optimize for tw
---
 server/src/assembly/resources/conf/iotdb-engine.properties          | 2 +-
 server/src/assembly/resources/conf/logback.xml                      | 3 ---
 server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java | 2 --
 server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java | 3 ++-
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index 1216f9a..a834ba7 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -176,7 +176,7 @@ wal_buffer_size=16777216
 time_zone=+08:00
 
 # When a TsFile's file size (in byte) exceeds this, the TsFile is forced closed. The default threshold is 256 MB.
-tsfile_size_threshold=268435456
+tsfile_size_threshold=536870912
 
 # When a memTable's size (in byte) exceeds this, the memtable is flushed to disk. The default threshold is 256 GB.
 memtable_size_threshold=268435456
diff --git a/server/src/assembly/resources/conf/logback.xml b/server/src/assembly/resources/conf/logback.xml
index e510fef..d02757a 100644
--- a/server/src/assembly/resources/conf/logback.xml
+++ b/server/src/assembly/resources/conf/logback.xml
@@ -263,7 +263,4 @@
     <logger level="info" name="QUERY-FREQUENCY">
         <appender-ref ref="QUERY-FREQUENCY"/>
     </logger>
-    <logger level="info" name="ALL-SQL">
-        <appender-ref ref="ALL_SQL"/>
-    </logger>
 </configuration>
diff --git a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
index 2e03a28..026b294 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
@@ -137,7 +137,6 @@ import org.slf4j.LoggerFactory;
 public class TSServiceImpl implements TSIService.Iface, ServerContext {
 
   private static final Logger logger = LoggerFactory.getLogger(TSServiceImpl.class);
-  private static final Logger ALL_SQL_LOGGER = LoggerFactory.getLogger("ALL-SQL");
   private static final Logger SLOW_SQL_LOGGER = LoggerFactory.getLogger("SLOW-SQL");
   private static final Logger QUERY_FREQUENCY_LOGGER = LoggerFactory.getLogger("QUERY-FREQUENCY");
   private static final String INFO_NOT_LOGIN = "{}: Not login.";
@@ -564,7 +563,6 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
   private TSExecuteStatementResp internalExecuteQueryStatement(String statement,
       long statementId, PhysicalPlan plan, int fetchSize, String username) {
     queryCount.incrementAndGet();
-    ALL_SQL_LOGGER.info(statement);
     long startTime = System.currentTimeMillis();
     long queryId = -1;
     try {
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java
index 245c4f4..11abc44 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java
@@ -19,6 +19,7 @@
 package org.apache.iotdb.db.utils;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -89,7 +90,7 @@ public class FileLoaderUtils {
     if (resource.isClosed()) {
       timeSeriesMetadata = TimeSeriesMetadataCache.getInstance()
           .get(new TimeSeriesMetadataCache.TimeSeriesMetadataCacheKey(resource.getPath(),
-              seriesPath.getDevice(), seriesPath.getMeasurement()), allSensors);
+              seriesPath.getDevice(), seriesPath.getMeasurement()), Collections.singleton(seriesPath.getMeasurement()));
       if (timeSeriesMetadata != null) {
         timeSeriesMetadata.setChunkMetadataLoader(
             new DiskChunkMetadataLoader(resource, seriesPath, context, filter));