You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2017/01/07 01:38:17 UTC
[1/2] kylin git commit: KYLIN-2337 Remove expensive toString in
SortedIteratorMergerWithLimit
Repository: kylin
Updated Branches:
refs/heads/master 1087f7ad4 -> 122b15a2a
KYLIN-2337 Remove expensive toString in SortedIteratorMergerWithLimit
Signed-off-by: Yang Li <li...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/7509beee
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/7509beee
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/7509beee
Branch: refs/heads/master
Commit: 7509beeeaaf1d4a50bb82fd83dff5516276b9b9e
Parents: 1087f7a
Author: kangkaisen <ka...@live.com>
Authored: Thu Dec 29 21:37:26 2016 +0800
Committer: Yang Li <li...@apache.org>
Committed: Sat Jan 7 09:35:00 2017 +0800
----------------------------------------------------------------------
core-cube/src/main/java/org/apache/kylin/gridtable/GTRecord.java | 1 +
.../kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/7509beee/core-cube/src/main/java/org/apache/kylin/gridtable/GTRecord.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/gridtable/GTRecord.java b/core-cube/src/main/java/org/apache/kylin/gridtable/GTRecord.java
index 4d26029..f4480c8 100644
--- a/core-cube/src/main/java/org/apache/kylin/gridtable/GTRecord.java
+++ b/core-cube/src/main/java/org/apache/kylin/gridtable/GTRecord.java
@@ -234,6 +234,7 @@ public class GTRecord implements Comparable<GTRecord>, Cloneable {
return toString(info.colAll);
}
+ /** toString for MemoryHungry Measure is expensive, please invoke carefully */
public String toString(ImmutableBitSet selectedColumns) {
Object[] values = new Object[selectedColumns.cardinality()];
getValues(selectedColumns, values);
http://git-wip-us.apache.org/repos/asf/kylin/blob/7509beee/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java
----------------------------------------------------------------------
diff --git a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java
index 2f2691e..6a7e713 100644
--- a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java
+++ b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java
@@ -126,7 +126,7 @@ public class SortedIteratorMergerWithLimit<E extends Cloneable> extends SortedIt
//TODO: remove this check when validated
if (last != null) {
- Preconditions.checkState(comparator.compare(last, fetched) <= 0, "Not sorted! last: " + last + " fetched: " + fetched);
+ Preconditions.checkState(comparator.compare(last, fetched) <= 0, "Not sorted!");
}
last = fetched;
[2/2] kylin git commit: KYLIN-2337 minor improvement,
still give good error info
Posted by li...@apache.org.
KYLIN-2337 minor improvement, still give good error info
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/122b15a2
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/122b15a2
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/122b15a2
Branch: refs/heads/master
Commit: 122b15a2a5fb7385e64839edfb9cbdaec5fde841
Parents: 7509bee
Author: Yang Li <li...@apache.org>
Authored: Sat Jan 7 09:38:06 2017 +0800
Committer: Yang Li <li...@apache.org>
Committed: Sat Jan 7 09:38:06 2017 +0800
----------------------------------------------------------------------
.../kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/122b15a2/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java
----------------------------------------------------------------------
diff --git a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java
index 6a7e713..c5c95a6 100644
--- a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java
+++ b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java
@@ -126,7 +126,8 @@ public class SortedIteratorMergerWithLimit<E extends Cloneable> extends SortedIt
//TODO: remove this check when validated
if (last != null) {
- Preconditions.checkState(comparator.compare(last, fetched) <= 0, "Not sorted!");
+ if (comparator.compare(last, fetched) > 0)
+ throw new IllegalStateException("Not sorted! last: " + last + " fetched: " + fetched);
}
last = fetched;