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/03/14 01:01:22 UTC
[09/50] incubator-kylin git commit: Rename IIDimension to
DimensionDesc, and move it to metadata module.
Rename IIDimension to DimensionDesc, and move it to metadata module.
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/def5e7e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/def5e7e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/def5e7e6
Branch: refs/heads/streaming
Commit: def5e7e6c43d9fa619ebe6c94892c97e41162b79
Parents: 13f3260
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Fri Mar 6 15:46:47 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Fri Mar 6 15:46:47 2015 +0800
----------------------------------------------------------------------
.../kylin/invertedindex/model/IIDesc.java | 19 +++---
.../kylin/invertedindex/model/IIDimension.java | 69 --------------------
.../kylin/metadata/model/DimensionDesc.java | 69 ++++++++++++++++++++
3 files changed, 78 insertions(+), 79 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/def5e7e6/invertedindex/src/main/java/org/apache/kylin/invertedindex/model/IIDesc.java
----------------------------------------------------------------------
diff --git a/invertedindex/src/main/java/org/apache/kylin/invertedindex/model/IIDesc.java b/invertedindex/src/main/java/org/apache/kylin/invertedindex/model/IIDesc.java
index aae751b..e094dfc 100644
--- a/invertedindex/src/main/java/org/apache/kylin/invertedindex/model/IIDesc.java
+++ b/invertedindex/src/main/java/org/apache/kylin/invertedindex/model/IIDesc.java
@@ -26,7 +26,6 @@ import java.util.HashSet;
import java.util.List;
import org.apache.commons.net.util.Base64;
-import org.apache.hadoop.hbase.protobuf.generated.ClientProtos;
import org.apache.hadoop.hbase.util.Bytes;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
@@ -67,9 +66,9 @@ public class IIDesc extends RootPersistentEntity {
@JsonProperty("timestamp_dimension")
private String timestampDimension;
@JsonProperty("bitmap_dimensions")
- private List<IIDimension> bitmapDimensions;
+ private List<DimensionDesc> bitmapDimensions;
@JsonProperty("value_dimensions")
- private List<IIDimension> valueDimensions;
+ private List<DimensionDesc> valueDimensions;
@JsonProperty("metrics")
private String[] metricNames;
@JsonProperty("sharding")
@@ -107,17 +106,17 @@ public class IIDesc extends RootPersistentEntity {
timestampDimension = timestampDimension.toUpperCase();
// capitalize
- IIDimension.capicalizeStrings(bitmapDimensions);
- IIDimension.capicalizeStrings(valueDimensions);
+ DimensionDesc.capicalizeStrings(bitmapDimensions);
+ DimensionDesc.capicalizeStrings(valueDimensions);
StringUtil.toUpperCaseArray(metricNames, metricNames);
// retrieve all columns and all tables, and make available measure to ii
HashSet<String> allTableNames = Sets.newHashSet();
measureDescs = Lists.newArrayList();
measureDescs.add(makeCountMeasure());
- for (IIDimension iiDimension : Iterables.concat(bitmapDimensions, valueDimensions)) {
- TableDesc tableDesc = this.getTableDesc(iiDimension.getTable());
- for (String column : iiDimension.getColumns()) {
+ for (DimensionDesc dimensionDesc : Iterables.concat(bitmapDimensions, valueDimensions)) {
+ TableDesc tableDesc = this.getTableDesc(dimensionDesc.getTable());
+ for (String column : dimensionDesc.getColumns()) {
ColumnDesc columnDesc = tableDesc.findColumnByName(column);
TblColRef tcr = new TblColRef(columnDesc);
allColumns.add(tcr);
@@ -144,8 +143,8 @@ public class IIDesc extends RootPersistentEntity {
}
// indexing for each type of columns
- bitmapCols = new int[IIDimension.getColumnCount(bitmapDimensions)];
- valueCols = new int[IIDimension.getColumnCount(valueDimensions)];
+ bitmapCols = new int[DimensionDesc.getColumnCount(bitmapDimensions)];
+ valueCols = new int[DimensionDesc.getColumnCount(valueDimensions)];
metricsCols = new int[metricNames.length];
metricsColSet = new BitSet(this.getTableDesc(this.getFactTableName()).getColumnCount());
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/def5e7e6/invertedindex/src/main/java/org/apache/kylin/invertedindex/model/IIDimension.java
----------------------------------------------------------------------
diff --git a/invertedindex/src/main/java/org/apache/kylin/invertedindex/model/IIDimension.java b/invertedindex/src/main/java/org/apache/kylin/invertedindex/model/IIDimension.java
deleted file mode 100644
index ee8b6b9..0000000
--- a/invertedindex/src/main/java/org/apache/kylin/invertedindex/model/IIDimension.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-package org.apache.kylin.invertedindex.model;
-
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.kylin.common.util.StringUtil;
-
-/**
- * Created by Hongbin Ma(Binmahone) on 12/26/14.
- */
-@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE)
-public class IIDimension {
- @JsonProperty("table")
- private String table;
- @JsonProperty("columns")
- private String[] columns;
-
- public String getTable() {
- return table;
- }
-
- public void setTable(String table) {
- this.table = table;
- }
-
- public String[] getColumns() {
- return columns;
- }
-
- public void setColumns(String[] columns) {
- this.columns = columns;
- }
-
-
- public static void capicalizeStrings(List<IIDimension> dimensions) {
- for (IIDimension iiDimension : dimensions) {
- iiDimension.setTable(iiDimension.getTable().toUpperCase());
- StringUtil.toUpperCaseArray(iiDimension.getColumns(), iiDimension.getColumns());
- }
- }
-
- public static int getColumnCount(List<IIDimension> iiDimensions) {
- int count = 0;
- for (IIDimension iiDimension : iiDimensions) {
- count += iiDimension.getColumns().length;
- }
- return count;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/def5e7e6/metadata/src/main/java/org/apache/kylin/metadata/model/DimensionDesc.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/kylin/metadata/model/DimensionDesc.java b/metadata/src/main/java/org/apache/kylin/metadata/model/DimensionDesc.java
new file mode 100644
index 0000000..1cc6235
--- /dev/null
+++ b/metadata/src/main/java/org/apache/kylin/metadata/model/DimensionDesc.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+package org.apache.kylin.metadata.model;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.kylin.common.util.StringUtil;
+
+/**
+ * Created by Hongbin Ma(Binmahone) on 12/26/14.
+ */
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE)
+public class DimensionDesc {
+ @JsonProperty("table")
+ private String table;
+ @JsonProperty("columns")
+ private String[] columns;
+
+ public String getTable() {
+ return table;
+ }
+
+ public void setTable(String table) {
+ this.table = table;
+ }
+
+ public String[] getColumns() {
+ return columns;
+ }
+
+ public void setColumns(String[] columns) {
+ this.columns = columns;
+ }
+
+
+ public static void capicalizeStrings(List<DimensionDesc> dimensions) {
+ for (DimensionDesc dimensionDesc : dimensions) {
+ dimensionDesc.setTable(dimensionDesc.getTable().toUpperCase());
+ StringUtil.toUpperCaseArray(dimensionDesc.getColumns(), dimensionDesc.getColumns());
+ }
+ }
+
+ public static int getColumnCount(List<DimensionDesc> dimensionDescs) {
+ int count = 0;
+ for (DimensionDesc dimensionDesc : dimensionDescs) {
+ count += dimensionDesc.getColumns().length;
+ }
+ return count;
+ }
+
+}