[incubator-iotdb] branch ty-debug created (now 7340887)

[ja...@apache.org]

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

jackietien pushed a change to branch ty-debug
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


      at 7340887  fix bug

This branch includes the following new commits:

     new 7340887  fix bug

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[incubator-iotdb] 01/01: fix bug

[ja...@apache.org]

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

jackietien pushed a commit to branch ty-debug
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit 734088757247d5e2803ae006e0e6c48967c42143
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Tue Feb 11 10:41:10 2020 +0800

    fix bug
---
 .../assembly/resources/conf/iotdb-engine.properties    | 18 +++++++++++-------
 .../seriesRelated/SeriesReaderWithoutValueFilter.java  | 15 ++++++++++-----
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index 8dd795f..2614df8 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -45,7 +45,7 @@ rpc_max_concurrent_client_num=65535
 # 2. memtable_size_threshold which is introduced below.
 # By dynamically adjusting these two parameters, the probability of system memory explosion is greatly reduced.
 # When this parameter is set true, it will refuse to create time series or add storage groups under high system load.
-enable_parameter_adapter=true
+enable_parameter_adapter=false
 
 ####################
 ### Write Ahead Log Configuration
@@ -189,10 +189,14 @@ 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 512 MB.
-tsfile_size_threshold=536870912
+# tsfile_size_threshold=536870912
+#2G
+tsfile_size_threshold=2048000000
 
 # When a memTable's size (in byte) exceeds this, the memtable is flushed to disk. The default threshold is 128 MB.
-memtable_size_threshold=134217728
+#memtable_size_threshold=134217728
+#1G
+memtable_size_threshold=1024000000 
 
 # How many threads can concurrently flush. When <= 0, use CPU core number.
 concurrent_flush_thread=0
@@ -361,7 +365,7 @@ enable_auto_create_schema=true
 # Storage group level when creating schema automatically is enabled
 # e.g. root.sg0.d1.s2
 #      we will set root.sg0 as the storage group if storage group level is 2
-default_storage_group_level=2
+default_storage_group_level=3
 
 # BOOLEAN encoding when creating schema automatically is enabled
 default_boolean_encoding=RLE
@@ -373,10 +377,10 @@ default_int32_encoding=RLE
 default_int64_encoding=RLE
 
 # FLOAT encoding when creating schema automatically is enabled
-default_float_encoding=GORILLA
+default_float_encoding=RLE
 
 # DOUBLE encoding when creating schema automatically is enabled
-default_double_encoding=GORILLA
+default_double_encoding=RLE
 
 # TEXT encoding when creating schema automatically is enabled
 default_text_encoding=PLAIN
@@ -428,4 +432,4 @@ partition_interval = 604800
 # For example, your partitionInterval is 86400 and you want to insert data in 3 different days,
 # you should set this param >= 6 (for sequence and unsequence)
 # default number is 10
-memtable_num_in_each_storage_group = 10
\ No newline at end of file
+memtable_num_in_each_storage_group = 2
diff --git a/server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilter.java b/server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilter.java
index 65d4585..27bd19c 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilter.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilter.java
@@ -138,12 +138,15 @@ public class SeriesReaderWithoutValueFilter implements ManagedSeriesReader {
 
   private boolean hasNextInSeq() throws IOException {
     // has next point in cached seqBatchData
-    if (seqBatchData != null && seqBatchData.hasCurrent())
+    if (seqBatchData != null && seqBatchData.hasCurrent()) {
       return true;
+    }
     // has next batch in seq reader
-    if (seqResourceIterateReader.hasNextBatch()) {
+    while (seqResourceIterateReader.hasNextBatch()) {
       seqBatchData = seqResourceIterateReader.nextBatch();
-      return true;
+      if (seqBatchData != null && seqBatchData.hasCurrent()) {
+        return true;
+      }
     }
     return false;
   }
@@ -153,9 +156,11 @@ public class SeriesReaderWithoutValueFilter implements ManagedSeriesReader {
     if (unseqBatchData != null && unseqBatchData.hasCurrent())
       return true;
     // has next batch in unseq reader
-    if (unseqResourceMergeReader != null && unseqResourceMergeReader.hasNextBatch()) {
+    while (unseqResourceMergeReader != null && unseqResourceMergeReader.hasNextBatch()) {
       unseqBatchData = unseqResourceMergeReader.nextBatch();
-      return true;
+      if (unseqBatchData != null && unseqBatchData.hasCurrent()) {
+        return true;
+      }
     }
     return false;
   }