You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2015/11/05 02:54:44 UTC
[30/31] incubator-kylin git commit: KYLIN-942 fix bug in DebugTomcat
pom and Backdoor toggles
KYLIN-942 fix bug in DebugTomcat pom and Backdoor toggles
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/b0b43cfc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/b0b43cfc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/b0b43cfc
Branch: refs/heads/KYLIN-1112
Commit: b0b43cfcfa21f01f2284c1552bc5f1fd040b5401
Parents: 9105774
Author: honma <ho...@ebay.com>
Authored: Tue Nov 3 11:34:43 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Nov 5 09:53:17 2015 +0800
----------------------------------------------------------------------
server/pom.xml | 4 ++++
.../kylin/storage/hbase/cube/v2/CubeHBaseEndpointRPC.java | 9 ++-------
2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b0b43cfc/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 96d874a..f2f9e32 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -108,6 +108,10 @@
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b0b43cfc/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 77a5db5..6ad30e2 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
@@ -161,6 +161,8 @@ public class CubeHBaseEndpointRPC extends CubeHBaseRPC {
}
final AtomicInteger totalScannedCount = new AtomicInteger(0);
+ final String toggle = BackdoorToggles.getCoprocessorBehavior() == null ? CoprocessorBehavior.SCAN_FILTER_AGGR_CHECKMEM.toString() : BackdoorToggles.getCoprocessorBehavior();
+ logger.info("The execution of this query will use " + toggle + " as endpoint's behavior");
for (int i = 0; i < rawScans.size(); ++i) {
final int shardIndex = i;
@@ -176,13 +178,6 @@ public class CubeHBaseEndpointRPC extends CubeHBaseRPC {
builder.addHbaseColumnsToGT(intList);
}
- // debug/profiling purpose
- String toggle = BackdoorToggles.getCoprocessorBehavior();
- if (toggle == null) {
- toggle = CoprocessorBehavior.SCAN_FILTER_AGGR_CHECKMEM.toString(); //default behavior
- } else {
- logger.info("The execution of this query will use " + toggle + " as endpoint's behavior");
- }
builder.setBehavior(toggle);
Collection<CubeVisitProtos.CubeVisitResponse> results;