You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ka...@apache.org on 2017/09/04 13:44:45 UTC
[34/50] [abbrv] kylin git commit: Revert "KYLIN-2790 Add extending
point for column family"
Revert "KYLIN-2790 Add extending point for column family"
This reverts commit 842dc4ca1dabb576aed40c55ebfc1cbabaaf3944.
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/363f858b
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/363f858b
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/363f858b
Branch: refs/heads/2622-2764
Commit: 363f858b890ea04c87ee7b081fc74805766e0b93
Parents: 32d346b
Author: Hongbin Ma <ma...@apache.org>
Authored: Thu Aug 31 22:43:36 2017 +0800
Committer: Hongbin Ma <ma...@apache.org>
Committed: Thu Aug 31 22:43:36 2017 +0800
----------------------------------------------------------------------
.../apache/kylin/common/KylinConfigBase.java | 4 ----
.../org/apache/kylin/cube/model/CubeDesc.java | 18 ++--------------
.../kylin/cube/model/HBaseMappingDesc.java | 18 ----------------
.../org/apache/kylin/gridtable/GTRecord.java | 22 --------------------
4 files changed, 2 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/363f858b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
----------------------------------------------------------------------
diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
index d32f08c..0e990df 100644
--- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
@@ -286,10 +286,6 @@ abstract public class KylinConfigBase implements Serializable {
"org.apache.kylin.storage.hbase.util.ZookeeperDistributedLock$Factory");
return (DistributedLockFactory) ClassUtil.newInstance(clsName);
}
-
- public String getHBaseMappingAdapter() {
- return getOptional("kylin.metadata.hbasemapping-adapter");
- }
// ============================================================================
// DICTIONARY & SNAPSHOT
http://git-wip-us.apache.org/repos/asf/kylin/blob/363f858b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
index d263e1f..0e22587 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
@@ -22,7 +22,6 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-import java.lang.reflect.Method;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
@@ -604,21 +603,8 @@ public class CubeDesc extends RootPersistentEntity implements IEngineAware {
validateAggregationGroups(); // check if aggregation group is valid
validateAggregationGroupsCombination();
- String hbaseMappingAdapterName = config.getHBaseMappingAdapter();
-
- if (hbaseMappingAdapterName != null) {
- try {
- Class<?> hbaseMappingAdapterClass = Class.forName(hbaseMappingAdapterName);
- Method initMethod = hbaseMappingAdapterClass.getMethod("initHBaseMapping", CubeDesc.class);
- initMethod.invoke(null, this);
- } catch (Exception e) {
- logger.error("Wrong configuration for kylin.metadata.hbasemapping-adapter: class "
- + hbaseMappingAdapterName + " not found. ");
- }
- } else {
- if (hbaseMapping != null) {
- hbaseMapping.init(this);
- }
+ if (hbaseMapping != null) {
+ hbaseMapping.init(this);
}
initMeasureReferenceToColumnFamily();
http://git-wip-us.apache.org/repos/asf/kylin/blob/363f858b/core-cube/src/main/java/org/apache/kylin/cube/model/HBaseMappingDesc.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/model/HBaseMappingDesc.java b/core-cube/src/main/java/org/apache/kylin/cube/model/HBaseMappingDesc.java
index 77b4b14..d1e5829 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/model/HBaseMappingDesc.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/model/HBaseMappingDesc.java
@@ -87,24 +87,6 @@ public class HBaseMappingDesc implements java.io.Serializable {
}
}
- public void initAsSeparatedColumns(CubeDesc cubeDesc) {
- cubeRef = cubeDesc;
-
- int cfNum = cubeDesc.getMeasures().size();
- columnFamily = new HBaseColumnFamilyDesc[cfNum];
-
- for (int i = 0; i < cfNum; i++) {
- HBaseColumnFamilyDesc cf = new HBaseColumnFamilyDesc();
- HBaseColumnDesc col = new HBaseColumnDesc();
- String measureRef = cubeDesc.getMeasures().get(i).getName();
- col.setMeasureRefs(new String[] { measureRef });
- col.setQualifier("M");
- cf.setColumns(new HBaseColumnDesc[] { col });
- cf.setName("F" + (i + 1));
- columnFamily[i] = cf;
- }
- }
-
@Override
public String toString() {
return "HBaseMappingDesc [columnFamily=" + Arrays.toString(columnFamily) + "]";
http://git-wip-us.apache.org/repos/asf/kylin/blob/363f858b/core-cube/src/main/java/org/apache/kylin/gridtable/GTRecord.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/gridtable/GTRecord.java b/core-cube/src/main/java/org/apache/kylin/gridtable/GTRecord.java
index d8c0fbd..f65e4b5 100644
--- a/core-cube/src/main/java/org/apache/kylin/gridtable/GTRecord.java
+++ b/core-cube/src/main/java/org/apache/kylin/gridtable/GTRecord.java
@@ -295,28 +295,6 @@ public class GTRecord implements Comparable<GTRecord>, Cloneable {
buf.position(pos);
}
}
-
- public void loadColumnsFromColumnBlocks(ImmutableBitSet[] selectedColumnBlocks, ImmutableBitSet selectedCols, ByteBuffer buf) {
-
- int pos = buf.position();
-
- for (ImmutableBitSet selectedColBlock : selectedColumnBlocks) {
-
- for (int i = 0; i < selectedColBlock.trueBitCount(); i++) {
-
- int c = selectedColBlock.trueBitAt(i);
-
- int len = info.codeSystem.codeLength(c, buf);
- if(selectedCols.get(c)) {
- cols[c].set(buf.array(), buf.arrayOffset() + pos, len);
- }
- pos += len;
- buf.position(pos);
- }
-
- }
-
- }
/** change pointers to point to data in given buffer, this
* method allows to defined specific column to load */