You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ni...@apache.org on 2020/02/07 14:26:13 UTC

[kylin] 18/44: fix bug in KYLIN-4243

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

nic pushed a commit to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit b8c5252cb15e9f1aa685a6387b7ba15378b1bd5a
Author: zengruios <57...@qq.com>
AuthorDate: Mon Dec 16 22:19:33 2019 +0800

    fix bug in KYLIN-4243
---
 .../kylin/stream/core/storage/columnar/ColumnarStoreDimDesc.java    | 5 +++--
 .../stream/core/storage/columnar/ColumnarStoreMetricsDesc.java      | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/stream-core/src/main/java/org/apache/kylin/stream/core/storage/columnar/ColumnarStoreDimDesc.java b/stream-core/src/main/java/org/apache/kylin/stream/core/storage/columnar/ColumnarStoreDimDesc.java
index 0406ecb..971d137 100644
--- a/stream-core/src/main/java/org/apache/kylin/stream/core/storage/columnar/ColumnarStoreDimDesc.java
+++ b/stream-core/src/main/java/org/apache/kylin/stream/core/storage/columnar/ColumnarStoreDimDesc.java
@@ -78,7 +78,7 @@ public class ColumnarStoreDimDesc {
         } else if (compression == Compression.RUN_LENGTH) {
             return new RunLengthCompressedColumnReader(dataBuffer, columnDataStartOffset, columnDataLength, rowCount);
         }
-        return new NoCompressedColumnReader(dataBuffer, columnDataStartOffset, columnDataLength, rowCount);
+        return new NoCompressedColumnReader(dataBuffer, columnDataStartOffset, columnDataLength / rowCount, rowCount);
     }
 
     public ColumnDataReader getDimReaderFromFSInput(FSDataInputStream inputStream, int columnDataStartOffset,
@@ -88,6 +88,7 @@ public class ColumnarStoreDimDesc {
         } else if (compression == Compression.RUN_LENGTH) {
             return new FSInputRLECompressedColumnReader(inputStream, columnDataStartOffset, columnDataLength, rowCount);
         }
-        return new FSInputNoCompressedColumnReader(inputStream, columnDataStartOffset, columnDataLength, rowCount);
+        return new FSInputNoCompressedColumnReader(inputStream, columnDataStartOffset, columnDataLength / rowCount,
+                rowCount);
     }
 }
diff --git a/stream-core/src/main/java/org/apache/kylin/stream/core/storage/columnar/ColumnarStoreMetricsDesc.java b/stream-core/src/main/java/org/apache/kylin/stream/core/storage/columnar/ColumnarStoreMetricsDesc.java
index 098134d..eca5ae7 100644
--- a/stream-core/src/main/java/org/apache/kylin/stream/core/storage/columnar/ColumnarStoreMetricsDesc.java
+++ b/stream-core/src/main/java/org/apache/kylin/stream/core/storage/columnar/ColumnarStoreMetricsDesc.java
@@ -68,7 +68,8 @@ public class ColumnarStoreMetricsDesc {
             return new LZ4CompressedColumnReader(dataBuffer, columnDataStartOffset, columnDataLength, rowCount);
         }
         if (fixLen != -1) {
-            return new NoCompressedColumnReader(dataBuffer, columnDataStartOffset, columnDataLength, rowCount);
+            return new NoCompressedColumnReader(dataBuffer, columnDataStartOffset, columnDataLength / rowCount,
+                    rowCount);
         }
         return new GeneralColumnDataReader(dataBuffer, columnDataStartOffset, columnDataLength);
     }
@@ -79,7 +80,8 @@ public class ColumnarStoreMetricsDesc {
             return new FSInputLZ4CompressedColumnReader(inputStream, columnDataStartOffset, columnDataLength, rowCount);
         }
         if (fixLen != -1) {
-            return new FSInputNoCompressedColumnReader(inputStream, columnDataStartOffset, columnDataLength, rowCount);
+            return new FSInputNoCompressedColumnReader(inputStream, columnDataStartOffset, columnDataLength / rowCount,
+                    rowCount);
         }
         return new FSInputGeneralColumnDataReader(inputStream, columnDataStartOffset, columnDataLength);
     }