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/01/23 09:32:32 UTC
[45/50] [abbrv] incubator-kylin git commit: Small issue.
Small issue.
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/d4a64412
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/d4a64412
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/d4a64412
Branch: refs/heads/inverted-index
Commit: d4a644128c9af86770c21f417176bd0a1fc38063
Parents: 62a7b38
Author: Shao Feng, Shi <sh...@hotmail.com>
Authored: Fri Jan 23 16:19:55 2015 +0800
Committer: Shao Feng, Shi <sh...@hotmail.com>
Committed: Fri Jan 23 16:19:55 2015 +0800
----------------------------------------------------------------------
.../java/com/kylinolap/cube/CubeManager.java | 4 +++-
.../java/com/kylinolap/job/ExportHBaseData.java | 19 +++++++++++++------
2 files changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d4a64412/cube/src/main/java/com/kylinolap/cube/CubeManager.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/com/kylinolap/cube/CubeManager.java b/cube/src/main/java/com/kylinolap/cube/CubeManager.java
index be22ea0..11c7be4 100644
--- a/cube/src/main/java/com/kylinolap/cube/CubeManager.java
+++ b/cube/src/main/java/com/kylinolap/cube/CubeManager.java
@@ -455,7 +455,9 @@ public class CubeManager implements IRealizationProvider {
String incrementalSegName = CubeSegment.getSegmentName(startDate, endDate);
segment.setUuid(UUID.randomUUID().toString());
segment.setName(incrementalSegName);
- segment.setCreateTime(DateStrDictionary.dateToString(new Date()));
+ Date creatTime = new Date();
+ segment.setCreateTime(DateStrDictionary.dateToString(creatTime));
+ segment.setCreateTimeUTC(creatTime.getTime());
segment.setDateRangeStart(startDate);
segment.setDateRangeEnd(endDate);
segment.setStatus(SegmentStatusEnum.NEW);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d4a64412/job/src/test/java/com/kylinolap/job/ExportHBaseData.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/com/kylinolap/job/ExportHBaseData.java b/job/src/test/java/com/kylinolap/job/ExportHBaseData.java
index af06c90..9905b07 100644
--- a/job/src/test/java/com/kylinolap/job/ExportHBaseData.java
+++ b/job/src/test/java/com/kylinolap/job/ExportHBaseData.java
@@ -1,11 +1,13 @@
package com.kylinolap.job;
+import java.io.File;
import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HConnection;
+import org.codehaus.plexus.util.FileUtils;
import com.kylinolap.common.KylinConfig;
import com.kylinolap.common.persistence.HBaseConnection;
@@ -111,12 +113,17 @@ public class ExportHBaseData {
}
public void downloadToLocal() throws IOException {
-
- SSHClient ssh = new SSHClient(kylinConfig.getRemoteHadoopCliHostname(), kylinConfig.getRemoteHadoopCliUsername(), kylinConfig.getRemoteHadoopCliPassword());
- try {
- ssh.scpFileToLocal(backupArchive, "../examples/test_case_data/minicluster/hbase-export.tar.gz");
- } catch (Exception e) {
- e.printStackTrace();
+ String localArchive = "../examples/test_case_data/minicluster/hbase-export.tar.gz";
+
+ if (kylinConfig.getRunAsRemoteCommand()) {
+ SSHClient ssh = new SSHClient(kylinConfig.getRemoteHadoopCliHostname(), kylinConfig.getRemoteHadoopCliUsername(), kylinConfig.getRemoteHadoopCliPassword());
+ try {
+ ssh.scpFileToLocal(backupArchive, localArchive);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ } else {
+ FileUtils.copyFile(new File(backupArchive), new File(localArchive));
}
}