Repository: kylin Updated Branches: refs/heads/master ba7254a34 -> b8258e43e
KYLIN-1719 Get kylinConfig from env Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/b8258e43 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/b8258e43 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/b8258e43 Branch: refs/heads/master Commit: b8258e43e45490eb272c0c96f5110b89e9d0b982 Parents: ba7254a Author: lidongsjtu <lid...@apache.org> Authored: Mon Jun 6 11:04:45 2016 +0800 Committer: lidongsjtu <lid...@apache.org> Committed: Mon Jun 6 11:05:20 2016 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/storage/hbase/HBaseConnection.java | 2 +- .../kylin/storage/hbase/cube/v2/CubeHBaseEndpointRPC.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/b8258e43/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java index 31773a0..c1fd1ce 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java @@ -100,7 +100,7 @@ public class HBaseConnection { Threads.newDaemonThreadFactory("kylin-coproc-")); tpe.allowCoreThreadTimeOut(true); - logger.info("Creating coprocessor thread pool with max of " + maxThreads); + logger.info("Creating coprocessor thread pool with max of {}, core of {}", maxThreads, coreThreads); coprocessorPool = tpe; return coprocessorPool; http://git-wip-us.apache.org/repos/asf/kylin/blob/b8258e43/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseEndpointRPC.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseEndpointRPC.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseEndpointRPC.java index 0c6a053..9cc1bee 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseEndpointRPC.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseEndpointRPC.java @@ -321,7 +321,11 @@ public class CubeHBaseEndpointRPC extends CubeHBaseRPC { final AtomicInteger totalScannedCount = new AtomicInteger(0); final ExpectedSizeIterator epResultItr = new ExpectedSizeIterator(shardNum); - final boolean compressionResult = cubeSeg.getCubeDesc().getConfig().getCompressionResult(); + + // KylinConfig: use env instance instead of CubeSegment, because KylinConfig will share among queries + // for different cubes until redeployment of coprocessor jar. + final KylinConfig kylinConfig = KylinConfig.getInstanceFromEnv(); + final boolean compressionResult = kylinConfig.getCompressionResult(); final CubeVisitProtos.CubeVisitRequest.Builder builder = CubeVisitProtos.CubeVisitRequest.newBuilder(); builder.setGtScanRequest(scanRequestByteString).setHbaseRawScan(rawScanByteString); for (IntList intList : hbaseColumnsToGTIntList) { @@ -331,9 +335,7 @@ public class CubeHBaseEndpointRPC extends CubeHBaseRPC { builder.setBehavior(toggle); builder.setStartTime(System.currentTimeMillis()); builder.setTimeout(epResultItr.getTimeout()); - // KylinConfig: use env instance instead of CubeSegment, because KylinConfig will share among queries - // for different cubes until redeployment of coprocessor jar. - builder.setKylinProperties(KylinConfig.getInstanceFromEnv().getConfigAsString()); + builder.setKylinProperties(kylinConfig.getConfigAsString()); for (final Pair<byte[], byte[]> epRange : getEPKeyRanges(cuboidBaseShard, shardNum, totalShards)) { executorService.submit(new Runnable() {
