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 2016/12/18 13:29:13 UTC
kylin git commit: fix H2 load data
Repository: kylin
Updated Branches:
refs/heads/KYLIN-2295 1e7665de5 -> 73804e335
fix H2 load data
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/73804e33
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/73804e33
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/73804e33
Branch: refs/heads/KYLIN-2295
Commit: 73804e3352753aa5e992152f2eea429b906d0b8a
Parents: 1e7665d
Author: Yang Li <li...@apache.org>
Authored: Sun Dec 18 21:28:51 2016 +0800
Committer: Yang Li <li...@apache.org>
Committed: Sun Dec 18 21:28:51 2016 +0800
----------------------------------------------------------------------
.../test/java/org/apache/kylin/query/H2Database.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/73804e33/kylin-it/src/test/java/org/apache/kylin/query/H2Database.java
----------------------------------------------------------------------
diff --git a/kylin-it/src/test/java/org/apache/kylin/query/H2Database.java b/kylin-it/src/test/java/org/apache/kylin/query/H2Database.java
index 7cf072f..3919246 100644
--- a/kylin-it/src/test/java/org/apache/kylin/query/H2Database.java
+++ b/kylin-it/src/test/java/org/apache/kylin/query/H2Database.java
@@ -28,6 +28,7 @@ import java.sql.Statement;
import java.util.HashMap;
import java.util.Map;
+import org.apache.commons.io.IOUtils;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.metadata.MetadataManager;
import org.apache.kylin.metadata.model.ColumnDesc;
@@ -72,10 +73,10 @@ public class H2Database {
try {
tempFile = File.createTempFile("tmp_h2", ".csv");
FileOutputStream tempFileStream = new FileOutputStream(tempFile);
- String normalPath = "/data/" + tableDesc.getIdentity() + ".csv";
- InputStream csvStream = metaMgr.getStore().getResource(normalPath).inputStream;
+ String path = path(tableDesc);
+ InputStream csvStream = metaMgr.getStore().getResource(path).inputStream;
- org.apache.commons.io.IOUtils.copy(csvStream, tempFileStream);
+ IOUtils.copy(csvStream, tempFileStream);
csvStream.close();
tempFileStream.close();
@@ -97,6 +98,13 @@ public class H2Database {
tempFile.delete();
}
+ private String path(TableDesc tableDesc) {
+ if ("EDW.TEST_SELLER_TYPE_DIM".equals(tableDesc)) // it is a view of table below
+ return "/data/" + "EDW.TEST_SELLER_TYPE_DIM_TABLE" + ".csv";
+ else
+ return "/data/" + tableDesc.getIdentity() + ".csv";
+ }
+
private String generateCreateH2TableSql(TableDesc tableDesc, String csvFilePath) {
StringBuilder ddl = new StringBuilder();
StringBuilder csvColumns = new StringBuilder();