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/30 02:06:25 UTC

kylin git commit: KYLIN-2418 add log in ResourceTool.copy()

Repository: kylin
Updated Branches:
  refs/heads/KYLIN-2418 e83281b88 -> 36cffb93d


KYLIN-2418 add log in ResourceTool.copy()


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/36cffb93
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/36cffb93
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/36cffb93

Branch: refs/heads/KYLIN-2418
Commit: 36cffb93d4a1780c05e3f268155fd7bc23285ddf
Parents: e83281b
Author: Yang Li <li...@apache.org>
Authored: Mon Jan 30 10:05:41 2017 +0800
Committer: Yang Li <li...@apache.org>
Committed: Mon Jan 30 10:05:41 2017 +0800

----------------------------------------------------------------------
 .../kylin/common/persistence/FileResourceStore.java       |  4 ++++
 .../org/apache/kylin/common/persistence/ResourceTool.java | 10 ++++++----
 .../apache/kylin/storage/hbase/HBaseResourceStore.java    |  5 +++++
 3 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/36cffb93/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/36cffb93/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/36cffb93/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";
+    }
 }