You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2016/07/22 07:40:10 UTC
[1/2] kylin git commit: minor, change log levels
Repository: kylin
Updated Branches:
refs/heads/master 8e3d8d4f8 -> 2bab07db7
minor, change log levels
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/2bab07db
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/2bab07db
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/2bab07db
Branch: refs/heads/master
Commit: 2bab07db78e25b7eed7be45a3bce8954cbea4997
Parents: 59a0586
Author: Hongbin Ma <ma...@apache.org>
Authored: Fri Jul 22 15:39:44 2016 +0800
Committer: Hongbin Ma <ma...@apache.org>
Committed: Fri Jul 22 15:39:54 2016 +0800
----------------------------------------------------------------------
.../org/apache/kylin/common/util/MemoryBudgetController.java | 4 ++--
.../main/java/org/apache/kylin/gridtable/GTAggregateScanner.java | 2 +-
.../hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/2bab07db/core-common/src/main/java/org/apache/kylin/common/util/MemoryBudgetController.java
----------------------------------------------------------------------
diff --git a/core-common/src/main/java/org/apache/kylin/common/util/MemoryBudgetController.java b/core-common/src/main/java/org/apache/kylin/common/util/MemoryBudgetController.java
index 5e81941..fec045e 100644
--- a/core-common/src/main/java/org/apache/kylin/common/util/MemoryBudgetController.java
+++ b/core-common/src/main/java/org/apache/kylin/common/util/MemoryBudgetController.java
@@ -284,7 +284,7 @@ public class MemoryBudgetController {
int mb = MemoryBudgetController.getSystemAvailMB();
if (mb < lowAvail) {
lowAvail = mb;
- logger.debug("Lower system avail " + lowAvail + " MB in markHigh()");
+ logger.warn("Lower system avail " + lowAvail + " MB in markHigh()");
}
}
@@ -293,7 +293,7 @@ public class MemoryBudgetController {
int mb = MemoryBudgetController.gcAndGetSystemAvailMB();
if (mb > highAvail) {
highAvail = mb;
- logger.debug("Higher system avail " + highAvail + " MB in markLow()");
+ logger.warn("Higher system avail " + highAvail + " MB in markLow()");
}
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/2bab07db/core-cube/src/main/java/org/apache/kylin/gridtable/GTAggregateScanner.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/gridtable/GTAggregateScanner.java b/core-cube/src/main/java/org/apache/kylin/gridtable/GTAggregateScanner.java
index f27c6fa..103c8e5 100644
--- a/core-cube/src/main/java/org/apache/kylin/gridtable/GTAggregateScanner.java
+++ b/core-cube/src/main/java/org/apache/kylin/gridtable/GTAggregateScanner.java
@@ -239,7 +239,7 @@ public class GTAggregateScanner implements IGTScanner {
}
void aggregate(GTRecord r) {
- if (++aggregatedRowCount % 1000 == 0) {
+ if (++aggregatedRowCount % 100000 == 0) {
if (memTracker != null) {
memTracker.markHigh();
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/2bab07db/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java
index 6ded5f5..daec559 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java
@@ -258,7 +258,7 @@ public class CubeVisitService extends CubeVisitProtos.CubeVisitService implement
if (rowLimit > 0 && rowLimit <= counter)
return false;
- if (counter % 1000 == 1) {
+ if (counter % 100000 == 1) {
if (System.currentTimeMillis() - startTime > timeout) {
scanNormalComplete.setValue(false);
logger.error("scanner aborted because timeout");
@@ -302,7 +302,7 @@ public class CubeVisitService extends CubeVisitProtos.CubeVisitService implement
break;
}
- if (finalRowCount % 1000 == 1) {
+ if (finalRowCount % 100000 == 1) {
if (System.currentTimeMillis() - startTime > timeout) {
logger.error("aggregate iterator aborted because timeout");
break;
[2/2] kylin git commit: KYLIN-1913 query log printed abnormally if
the query contains r (not rn)
Posted by ma...@apache.org.
KYLIN-1913 query log printed abnormally if the query contains r (not rn)
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/59a0586c
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/59a0586c
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/59a0586c
Branch: refs/heads/master
Commit: 59a0586c9037cafc8112f43681766c78214210f0
Parents: 8e3d8d4
Author: Hongbin Ma <ma...@apache.org>
Authored: Fri Jul 22 11:08:59 2016 +0800
Committer: Hongbin Ma <ma...@apache.org>
Committed: Fri Jul 22 15:39:54 2016 +0800
----------------------------------------------------------------------
server-base/src/main/java/org/apache/kylin/rest/util/QueryUtil.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/59a0586c/server-base/src/main/java/org/apache/kylin/rest/util/QueryUtil.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/util/QueryUtil.java b/server-base/src/main/java/org/apache/kylin/rest/util/QueryUtil.java
index c15e5f9..0f9807f 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/util/QueryUtil.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/util/QueryUtil.java
@@ -102,6 +102,7 @@ public class QueryUtil {
public static String massageSql(SQLRequest sqlRequest) {
String sql = sqlRequest.getSql();
sql = sql.trim();
+ sql = sql.replace("\r", "").replace("\n", System.getProperty("line.separator"));
while (sql.endsWith(";"))
sql = sql.substring(0, sql.length() - 1);