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/06/17 23:13:55 UTC
kylin git commit: fix CI
Repository: kylin
Updated Branches:
refs/heads/master 67e9f8981 -> 1b1e39770
fix CI
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/1b1e3977
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/1b1e3977
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/1b1e3977
Branch: refs/heads/master
Commit: 1b1e3977053a6568c424533f20e90cd4d44715ee
Parents: 67e9f89
Author: Yang Li <li...@apache.org>
Authored: Sat Jun 18 07:13:42 2016 +0800
Committer: Yang Li <li...@apache.org>
Committed: Sat Jun 18 07:13:42 2016 +0800
----------------------------------------------------------------------
.../org/apache/kylin/storage/translate/HBaseKeyRange.java | 8 ++++----
.../kylin/storage/hbase/util/ExtendCubeToHybridCLI.java | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/1b1e3977/core-storage/src/main/java/org/apache/kylin/storage/translate/HBaseKeyRange.java
----------------------------------------------------------------------
diff --git a/core-storage/src/main/java/org/apache/kylin/storage/translate/HBaseKeyRange.java b/core-storage/src/main/java/org/apache/kylin/storage/translate/HBaseKeyRange.java
index 4f39cf6..bfddb1f 100644
--- a/core-storage/src/main/java/org/apache/kylin/storage/translate/HBaseKeyRange.java
+++ b/core-storage/src/main/java/org/apache/kylin/storage/translate/HBaseKeyRange.java
@@ -113,7 +113,7 @@ public class HBaseKeyRange implements Comparable<HBaseKeyRange> {
TblColRef partitionDateColumnRef = cubeSeg.getCubeDesc().getModel().getPartitionDesc().getPartitionDateColumnRef();
if (column.equals(partitionDateColumnRef)) {
- initPartitionRange(dimRange, cubeSeg.getCubeDesc().getModel().getPartitionDesc().getPartitionDateFormat());
+ initPartitionRange(dimRange);
}
}
@@ -128,12 +128,12 @@ public class HBaseKeyRange implements Comparable<HBaseKeyRange> {
this.fuzzyKeys = buildFuzzyKeys(fuzzyValues);
}
- private void initPartitionRange(ColumnValueRange dimRange, String partitionDateFormat) {
+ private void initPartitionRange(ColumnValueRange dimRange) {
if (null != dimRange.getBeginValue()) {
- this.partitionColumnStartDate = DateFormat.stringToMillis(dimRange.getBeginValue(), partitionDateFormat);
+ this.partitionColumnStartDate = DateFormat.stringToMillis(dimRange.getBeginValue());
}
if (null != dimRange.getEndValue()) {
- this.partitionColumnEndDate = DateFormat.stringToMillis(dimRange.getEndValue(), partitionDateFormat);
+ this.partitionColumnEndDate = DateFormat.stringToMillis(dimRange.getEndValue());
}
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/1b1e3977/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ExtendCubeToHybridCLI.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ExtendCubeToHybridCLI.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ExtendCubeToHybridCLI.java
index c55bde4..a5a85fa 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ExtendCubeToHybridCLI.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ExtendCubeToHybridCLI.java
@@ -132,8 +132,7 @@ public class ExtendCubeToHybridCLI {
}
String owner = cubeInstance.getOwner();
- String dateFormat = dataModelDesc.getPartitionDesc().getPartitionDateFormat();
- long partitionDate = partitionDateStr != null ? DateFormat.stringToMillis(partitionDateStr, dateFormat) : 0;
+ long partitionDate = partitionDateStr != null ? DateFormat.stringToMillis(partitionDateStr) : 0;
// get new name for old cube and cube_desc
String newCubeDescName = renameCube(cubeDesc.getName());