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/01/31 07:18:22 UTC
[kylin] branch master updated: Revert "KYLIN-4322: set storage.hbase.endpoint-compress-result default value … (#1033)"
This is an automated email from the ASF dual-hosted git repository.
nic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push:
new 26cf1f8 Revert "KYLIN-4322: set storage.hbase.endpoint-compress-result default value … (#1033)"
26cf1f8 is described below
commit 26cf1f8ed217c96329d8dcbd8a00ef1d67023fca
Author: Kang <zh...@gmail.com>
AuthorDate: Fri Jan 31 11:21:15 2020 +0800
Revert "KYLIN-4322: set storage.hbase.endpoint-compress-result default value … (#1033)"
This reverts commit f41c6c8198e5cad295e9212c6a0047d83bd54ae2.
---
.../org/apache/kylin/common/KylinConfigBase.java | 2 +-
.../coprocessor/endpoint/CubeVisitServiceTest.java | 24 ++++++----------------
2 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
index d9561fd..44629e6 100644
--- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
@@ -1339,7 +1339,7 @@ public abstract class KylinConfigBase implements Serializable {
}
public boolean getCompressionResult() {
- return Boolean.parseBoolean(getOptional("kylin.storage.hbase.endpoint-compress-result", FALSE));
+ return Boolean.parseBoolean(getOptional("kylin.storage.hbase.endpoint-compress-result", TRUE));
}
public int getHBaseMaxConnectionThreads() {
diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitServiceTest.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitServiceTest.java
index be822f2..b3e5a93 100644
--- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitServiceTest.java
+++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitServiceTest.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.UUID;
-import java.util.zip.DataFormatException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.CoprocessorEnvironment;
@@ -172,20 +171,6 @@ public class CubeVisitServiceTest extends LocalFileMetadataTestCase {
service.start(env);
}
- private byte[] getResult(CubeVisitProtos.CubeVisitResponse result) throws IOException, DataFormatException {
- boolean compressionResult = KylinConfig.getInstanceFromEnv().getCompressionResult();
- byte[] rawData = HBaseZeroCopyByteString.zeroCopyGetBytes(result.getCompressedRows());
- byte[] resultData = null;
- if (compressionResult) {
- resultData = CompressionUtils.decompress(rawData);
- } else {
- resultData = rawData;
- }
-
- return resultData;
- }
-
-
@Test
public void testVisitCube() throws Exception {
RawScan rawScan = mockFullScan(gtInfo, getTestConfig());
@@ -207,7 +192,8 @@ public class CubeVisitServiceTest extends LocalFileMetadataTestCase {
Assert.assertEquals(dateList.size() * userList.size(), stats.getScannedRowCount());
try {
- byte[] rawData = getResult(result);
+ byte[] rawData = CompressionUtils
+ .decompress(HBaseZeroCopyByteString.zeroCopyGetBytes(result.getCompressedRows()));
PartitionResultIterator iterator = new PartitionResultIterator(rawData, gtInfo, setOf(0, 1, 2, 3));
int nReturn = 0;
while (iterator.hasNext()) {
@@ -240,7 +226,8 @@ public class CubeVisitServiceTest extends LocalFileMetadataTestCase {
@Override
public void run(CubeVisitProtos.CubeVisitResponse result) {
try {
- byte[] rawData = getResult(result);
+ byte[] rawData = CompressionUtils
+ .decompress(HBaseZeroCopyByteString.zeroCopyGetBytes(result.getCompressedRows()));
PartitionResultIterator iterator = new PartitionResultIterator(rawData, gtInfo, setOf(1, 3));
Map<String, BigDecimal> actRet = Maps.newHashMap();
while (iterator.hasNext()) {
@@ -298,7 +285,8 @@ public class CubeVisitServiceTest extends LocalFileMetadataTestCase {
@Override
public void run(CubeVisitProtos.CubeVisitResponse result) {
try {
- byte[] rawData = getResult(result);
+ byte[] rawData = CompressionUtils
+ .decompress(HBaseZeroCopyByteString.zeroCopyGetBytes(result.getCompressedRows()));
PartitionResultIterator iterator = new PartitionResultIterator(rawData, gtInfo, setOf(2, 3));
Map<BigDecimal, BigDecimal> actRet = Maps.newHashMap();
while (iterator.hasNext()) {