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/01/14 11:35:33 UTC
[1/3] kylin git commit: don't do storage cleaning at
buildcubewithengine
Repository: kylin
Updated Branches:
refs/heads/2.x-staging 08f42c0d5 -> d2bc9d140
don't do storage cleaning at buildcubewithengine
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/32cb630d
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/32cb630d
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/32cb630d
Branch: refs/heads/2.x-staging
Commit: 32cb630d746e5f0948591fec0d5f52bbc8ef6dfb
Parents: 08f42c0
Author: honma <ho...@ebay.com>
Authored: Thu Jan 14 17:39:23 2016 +0800
Committer: honma <ho...@ebay.com>
Committed: Thu Jan 14 17:41:10 2016 +0800
----------------------------------------------------------------------
.../src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/32cb630d/assembly/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
----------------------------------------------------------------------
diff --git a/assembly/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java b/assembly/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
index 46bf1bb..331e21d 100644
--- a/assembly/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
+++ b/assembly/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
@@ -107,7 +107,6 @@ public class BuildCubeWithEngineTest {
public void before() throws Exception {
HBaseMetadataTestCase.staticCreateTestMetadata(AbstractKylinTestCase.SANDBOX_TEST_DATA);
- cleanupOldStorage();
DeployUtil.initCliWorkDir();
DeployUtil.deployMetadata();
DeployUtil.overrideJobJarLocations();
[3/3] kylin git commit: KYLIN-1297 remove unnecessary log
Posted by ma...@apache.org.
KYLIN-1297 remove unnecessary log
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/d2bc9d14
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/d2bc9d14
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/d2bc9d14
Branch: refs/heads/2.x-staging
Commit: d2bc9d140a663367e7f1e5148d215c4b208f4c04
Parents: b4ea1b3
Author: honma <ho...@ebay.com>
Authored: Thu Jan 14 18:32:01 2016 +0800
Committer: honma <ho...@ebay.com>
Committed: Thu Jan 14 18:34:44 2016 +0800
----------------------------------------------------------------------
.../kylin/storage/hbase/cube/v2/SequentialCubeTupleIterator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/d2bc9d14/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/SequentialCubeTupleIterator.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/SequentialCubeTupleIterator.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/SequentialCubeTupleIterator.java
index dcc3aba..77509e9 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/SequentialCubeTupleIterator.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/SequentialCubeTupleIterator.java
@@ -56,7 +56,6 @@ public class SequentialCubeTupleIterator implements ITupleIterator {
@Override
public boolean hasNext() {
- logger.info("hasNext called");
if (next != null)
return true;
@@ -118,6 +117,7 @@ public class SequentialCubeTupleIterator implements ITupleIterator {
advMeasureRowIndex = 0;
return hasNext();
}
+
@Override
public ITuple next() {
[2/3] kylin git commit: KYLIN-1297 avoid unnecessary converter
creation
Posted by ma...@apache.org.
KYLIN-1297 avoid unnecessary converter creation
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/b4ea1b39
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/b4ea1b39
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/b4ea1b39
Branch: refs/heads/2.x-staging
Commit: b4ea1b3915c70daf44a871a39d65282e9089b77c
Parents: 32cb630
Author: honma <ho...@ebay.com>
Authored: Thu Jan 14 18:34:35 2016 +0800
Committer: honma <ho...@ebay.com>
Committed: Thu Jan 14 18:34:35 2016 +0800
----------------------------------------------------------------------
.../storage/hbase/cube/v2/SequentialCubeTupleIterator.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/b4ea1b39/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/SequentialCubeTupleIterator.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/SequentialCubeTupleIterator.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/SequentialCubeTupleIterator.java
index 7e70a4d..dcc3aba 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/SequentialCubeTupleIterator.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/SequentialCubeTupleIterator.java
@@ -56,6 +56,7 @@ public class SequentialCubeTupleIterator implements ITupleIterator {
@Override
public boolean hasNext() {
+ logger.info("hasNext called");
if (next != null)
return true;
@@ -75,7 +76,10 @@ public class SequentialCubeTupleIterator implements ITupleIterator {
if (scannerIterator.hasNext()) {
curScanner = scannerIterator.next();
curRecordIterator = curScanner.iterator();
- curTupleConverter = new CubeTupleConverter(curScanner.cubeSeg, cuboid, selectedDimensions, selectedMetrics, tupleInfo);
+ if (curRecordIterator.hasNext()) {
+ //if the segment does not has any tuples, don't bother to create a converter
+ curTupleConverter = new CubeTupleConverter(curScanner.cubeSeg, cuboid, selectedDimensions, selectedMetrics, tupleInfo);
+ }
} else {
return false;
}