KYLIN-2418 drop unused useSandbox
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/546f88f3 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/546f88f3 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/546f88f3 Branch: refs/heads/spark-it Commit: 546f88f38ca017773c17ccaf2cf4812b0c7c4666 Parents: 0582512 Author: Yang Li <liy...@apache.org> Authored: Mon Jan 30 09:07:29 2017 +0800 Committer: Yang Li <liy...@apache.org> Committed: Tue Jan 31 08:11:41 2017 +0800 ---------------------------------------------------------------------- .../kylin/common/persistence/FileResourceStore.java | 4 ++++ .../org/apache/kylin/common/persistence/ResourceTool.java | 10 ++++++---- kylin-it/pom.xml | 6 ------ pom.xml | 8 -------- .../apache/kylin/storage/hbase/HBaseResourceStore.java | 5 +++++ 5 files changed, 15 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/546f88f3/core-common/src/main/java/org/apache/kylin/common/persistence/FileResourceStore.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/persistence/FileResourceStore.java b/core-common/src/main/java/org/apache/kylin/common/persistence/FileResourceStore.java index dcd3f38..3e012f5 100644 --- a/core-common/src/main/java/org/apache/kylin/common/persistence/FileResourceStore.java +++ b/core-common/src/main/java/org/apache/kylin/common/persistence/FileResourceStore.java @@ -160,4 +160,8 @@ public class FileResourceStore extends ResourceStore { return new File(root, resPath); } + @Override + public String toString() { + return root.getAbsolutePath(); + } } http://git-wip-us.apache.org/repos/asf/kylin/blob/546f88f3/core-common/src/main/java/org/apache/kylin/common/persistence/ResourceTool.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/persistence/ResourceTool.java b/core-common/src/main/java/org/apache/kylin/common/persistence/ResourceTool.java index b3aac09..6ba68ae 100644 --- a/core-common/src/main/java/org/apache/kylin/common/persistence/ResourceTool.java +++ b/core-common/src/main/java/org/apache/kylin/common/persistence/ResourceTool.java @@ -133,22 +133,24 @@ public class ResourceTool { ResourceStore src = ResourceStore.getStore(srcConfig); ResourceStore dst = ResourceStore.getStore(dstConfig); + logger.info("Copy from {} to {}", src, dst); + copyR(src, dst, path); } public static void copy(KylinConfig srcConfig, KylinConfig dstConfig, List<String> paths) throws IOException { ResourceStore src = ResourceStore.getStore(srcConfig); ResourceStore dst = ResourceStore.getStore(dstConfig); + + logger.info("Copy from {} to {}", src, dst); + for (String path : paths) { copyR(src, dst, path); } } public static void copy(KylinConfig srcConfig, KylinConfig dstConfig) throws IOException { - - ResourceStore src = ResourceStore.getStore(srcConfig); - ResourceStore dst = ResourceStore.getStore(dstConfig); - copyR(src, dst, "/"); + copy(srcConfig, dstConfig, "/"); } public static void copyR(ResourceStore src, ResourceStore dst, String path) throws IOException { http://git-wip-us.apache.org/repos/asf/kylin/blob/546f88f3/kylin-it/pom.xml ---------------------------------------------------------------------- diff --git a/kylin-it/pom.xml b/kylin-it/pom.xml index f88db9f..9662806 100644 --- a/kylin-it/pom.xml +++ b/kylin-it/pom.xml @@ -272,10 +272,6 @@ </excludes> <systemProperties> <property> - <name>useSandbox</name> - <value>true</value> - </property> - <property> <name>log4j.configuration</name> <value>file:${project.basedir}/..//build/conf/kylin-tools-log4j.properties</value> </property> @@ -298,7 +294,6 @@ <classpathScope>test</classpathScope> <executable>java</executable> <arguments> - <argument>-DuseSandbox=true</argument> <argument>-Dhdp.version=${hdp.version}</argument> <argument>-DfastBuildMode=${fastBuildMode}</argument> <argument>-Dlog4j.configuration=file:${project.basedir}/..//build/conf/kylin-tools-log4j.properties</argument> @@ -320,7 +315,6 @@ <classpathScope>test</classpathScope> <executable>java</executable> <arguments> - <argument>-DuseSandbox=true</argument> <argument>-Dhdp.version=${hdp.version}</argument> <argument>-DfastBuildMode=${fastBuildMode}</argument> <argument>-Dlog4j.configuration=file:${project.basedir}/..//build/conf/kylin-tools-log4j.properties</argument> http://git-wip-us.apache.org/repos/asf/kylin/blob/546f88f3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index bd1882e..bf33e07 100644 --- a/pom.xml +++ b/pom.xml @@ -1159,10 +1159,6 @@ </excludes> <systemProperties> <property> - <name>useSandbox</name> - <value>false</value> - </property> - <property> <name>buildCubeUsingProvidedData</name> <value>false</value> </property> @@ -1263,10 +1259,6 @@ </excludes> <systemProperties> <property> - <name>useSandbox</name> - <value>false</value> - </property> - <property> <name>buildCubeUsingProvidedData</name> <value>false</value> </property> http://git-wip-us.apache.org/repos/asf/kylin/blob/546f88f3/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseResourceStore.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseResourceStore.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseResourceStore.java index 501f1e4..74ab017 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseResourceStore.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseResourceStore.java @@ -371,4 +371,9 @@ public class HBaseResourceStore extends ResourceStore { return put; } + + @Override + public String toString() { + return getAllInOneTableName() + "@hbase"; + } }