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 2015/03/14 01:01:24 UTC
[49/50] [abbrv] incubator-kylin git commit: fix ci
fix ci
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/effd8f8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/effd8f8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/effd8f8d
Branch: refs/heads/streaming-localdict
Commit: effd8f8d87fe57873a5473f87082c58356adcc2c
Parents: 5059723
Author: qianhao.zhou <qi...@ebay.com>
Authored: Fri Mar 13 21:43:10 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Fri Mar 13 21:43:10 2015 +0800
----------------------------------------------------------------------
.../apache/kylin/job/BuildIIWithStreamTest.java | 17 ++++++++++++++---
.../endpoint/HbaseServerKVIterator.java | 6 ------
.../org/apache/kylin/streaming/StreamBuilder.java | 3 ++-
3 files changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/effd8f8d/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java b/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
index c916bd8..014fd8b 100644
--- a/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
+++ b/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
@@ -71,8 +71,13 @@ import java.text.SimpleDateFormat;
import java.util.List;
import java.util.TimeZone;
import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
import java.util.concurrent.LinkedBlockingDeque;
+import static org.junit.Assert.fail;
+
/**
* Created by qianzhou on 3/9/15.
*/
@@ -196,6 +201,7 @@ public class BuildIIWithStreamTest {
private void buildII(String iiName) throws Exception {
final IIDesc desc = iiManager.getII(iiName).getDescriptor();
final String tableName = createIntermediateTable(desc, kylinConfig);
+ logger.info("intermediate table name:" + tableName);
final Configuration conf = new Configuration();
HCatInputFormat.setInput(conf, "default", tableName);
final HCatSchema tableSchema = HCatInputFormat.getTableSchema(conf);
@@ -215,14 +221,19 @@ public class BuildIIWithStreamTest {
ToolRunner.run(new IICreateHTableJob(), args);
+ ExecutorService executorService = Executors.newSingleThreadExecutor();
final IIStreamBuilder streamBuilder = new IIStreamBuilder(queue, segment.getStorageLocationIdentifier(), desc, 0);
- final Thread thread = new Thread(streamBuilder);
- thread.start();
while (reader.next()) {
queue.put(parse(reader.getRow()));
}
queue.put(new Stream(-1, null));
- thread.join();
+ final Future<?> future = executorService.submit(streamBuilder);
+ try {
+ future.get();
+ } catch (Exception e) {
+ logger.error("stream build failed", e);
+ fail("stream build failed");
+ }
logger.info("stream build finished, htable name:" + segment.getStorageLocationIdentifier());
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/effd8f8d/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/HbaseServerKVIterator.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/HbaseServerKVIterator.java b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/HbaseServerKVIterator.java
index d0cfeb0..a7b67d8 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/HbaseServerKVIterator.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/HbaseServerKVIterator.java
@@ -40,7 +40,6 @@ import java.util.List;
*/
public class HbaseServerKVIterator implements Iterable<IIRow>, Closeable {
- private TableRecordInfoDigest digest;
private RegionScanner innerScanner;
private Logger logger = LoggerFactory.getLogger(HbaseServerKVIterator.class);
@@ -48,11 +47,6 @@ public class HbaseServerKVIterator implements Iterable<IIRow>, Closeable {
this.innerScanner = innerScanner;
}
- public HbaseServerKVIterator(RegionScanner innerScanner, TableRecordInfoDigest digest) {
- this.innerScanner = innerScanner;
- this.digest = digest;
- }
-
@Override
public void close() throws IOException {
IOUtils.closeQuietly(this.innerScanner);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/effd8f8d/streaming/src/main/java/org/apache/kylin/streaming/StreamBuilder.java
----------------------------------------------------------------------
diff --git a/streaming/src/main/java/org/apache/kylin/streaming/StreamBuilder.java b/streaming/src/main/java/org/apache/kylin/streaming/StreamBuilder.java
index 39c3966..90aab25 100644
--- a/streaming/src/main/java/org/apache/kylin/streaming/StreamBuilder.java
+++ b/streaming/src/main/java/org/apache/kylin/streaming/StreamBuilder.java
@@ -103,8 +103,9 @@ public abstract class StreamBuilder implements Runnable {
continue;
}
}
- } catch (Exception e) {
+ } catch (Exception e) {
logger.error("build stream error, stop building", e);
+ throw new RuntimeException("build stream error, stop building", e);
}
}
}