kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mahong...@apache.org
Subject [1/2] incubator-kylin git commit: KYLIN-942 fix bug in DebugTomcat pom and Backdoor toggles
Date Tue, 03 Nov 2015 07:32:29 GMT
Repository: incubator-kylin
Updated Branches:
  refs/heads/2.x-staging 101ef86ac -> b62e73b76


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/8970f221
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/8970f221
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/8970f221

Branch: refs/heads/2.x-staging
Commit: 8970f221816de85378d88653df769c68e7e4cae7
Parents: 101ef86
Author: honma <honma@ebay.com>
Authored: Tue Nov 3 11:34:43 2015 +0800
Committer: honma <honma@ebay.com>
Committed: Tue Nov 3 11:34:43 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/8970f221/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 14a90d3..d51638f 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -103,6 +103,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/8970f221/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;


Mime
View raw message