remove TblColRef.isSameAs()
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/9b4209be Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/9b4209be Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/9b4209be Branch: refs/heads/KYLIN-1971 Commit: 9b4209bedfb76eb770a22dd5a86fa7874500b38a Parents: 5c23699 Author: Yang Li <liy...@apache.org> Authored: Tue Oct 25 06:16:15 2016 +0800 Committer: Yang Li <liy...@apache.org> Committed: Tue Oct 25 06:16:15 2016 +0800 ---------------------------------------------------------------------- .../apache/kylin/metadata/model/ColumnDesc.java | 8 +----- .../kylin/metadata/model/FunctionDesc.java | 18 ------------- .../apache/kylin/metadata/model/TableRef.java | 4 +-- .../apache/kylin/metadata/model/TblColRef.java | 16 ++++------- .../apache/kylin/query/ITKylinQueryTest.java | 4 +-- .../kylin/query/routing/ModelChooser.java | 28 ++++++++++++++++++++ 6 files changed, 38 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/9b4209be/core-metadata/src/main/java/org/apache/kylin/metadata/model/ColumnDesc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ColumnDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ColumnDesc.java index 772297f..3bf0de9 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ColumnDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ColumnDesc.java @@ -20,12 +20,11 @@ package org.apache.kylin.metadata.model; import java.io.Serializable; -import com.fasterxml.jackson.annotation.JsonInclude; -import org.apache.commons.lang.StringUtils; import org.apache.kylin.metadata.datatype.DataType; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; /** @@ -154,11 +153,6 @@ public class ColumnDesc implements Serializable { } } - public boolean isSameAs(String tableName, String columnName) { - return StringUtils.equalsIgnoreCase(table.getIdentity(), tableName) && // - StringUtils.equalsIgnoreCase(name, columnName); - } - @Override public int hashCode() { final int prime = 31; http://git-wip-us.apache.org/repos/asf/kylin/blob/9b4209be/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java index a2c5756..e7d5186 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java @@ -19,7 +19,6 @@ package org.apache.kylin.metadata.model; import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Set; @@ -238,23 +237,6 @@ public class FunctionDesc { this.returnDataType = DataType.getType(returnType); } - public TblColRef selectTblColRef(Collection<TblColRef> metricColumns, String factTableName) { - if (this.isCount()) - return null; // count is not about any column but the whole row - - ParameterDesc parameter = this.getParameter(); - if (parameter == null) - return null; - - String columnName = parameter.getValue(); - for (TblColRef col : metricColumns) { - if (col.isSameAs(factTableName, columnName)) { - return col; - } - } - return null; - } - public HashMap<String, String> getConfiguration() { return configuration; } http://git-wip-us.apache.org/repos/asf/kylin/blob/9b4209be/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableRef.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableRef.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableRef.java index 186ff35..254ce18 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableRef.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableRef.java @@ -86,9 +86,9 @@ public class TableRef { TableRef t = (TableRef) o; - if (!model.equals(t.model)) + if ((model == null ? t.model == null : model.getName().equals(t.model.getName())) == false) return false; - if (!alias.equals(t.alias)) + if ((alias == null ? t.alias == null : alias.equals(t.alias)) == false) return false; if (!table.getIdentity().equals(t.table.getIdentity())) return false; http://git-wip-us.apache.org/repos/asf/kylin/blob/9b4209be/core-metadata/src/main/java/org/apache/kylin/metadata/model/TblColRef.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/TblColRef.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TblColRef.java index 69569dd..79cd961 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/TblColRef.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TblColRef.java @@ -64,6 +64,9 @@ public class TblColRef implements Serializable { } private static final DataModelDesc UNKNOWN_MODEL = new DataModelDesc(); + static { + UNKNOWN_MODEL.setName("UNKNOWN_MODEL"); + } public static TableRef tableForUnknownModel(String tempTableAlias, TableDesc table) { return new TableRef(UNKNOWN_MODEL, tempTableAlias, table); @@ -152,17 +155,6 @@ public class TblColRef implements Serializable { return InnerDataTypeEnum.DERIVED.getDataType().equals(getDatatype()); } - /** - * - * @param tableName full name : db.table - * @param columnName columnname - * @return - */ - public boolean isSameAs(String tableName, String columnName) { - return column.isSameAs(tableName, columnName); - } - - @Override public int hashCode() { // NOTE: tableRef MUST NOT participate in hashCode(). // Because fixUnknownModel() can change tableRef while TblColRef is held as set/map keys. @@ -187,6 +179,8 @@ public class TblColRef implements Serializable { return false; if (!StringUtils.equals(column.getName(), other.column.getName())) return false; +// if ((table == null ? other.table == null : table.equals(other.table)) == false) +// return false; return true; } http://git-wip-us.apache.org/repos/asf/kylin/blob/9b4209be/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java b/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java index 2ec5324..f9fbffb 100644 --- a/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java @@ -45,7 +45,7 @@ import org.junit.rules.ExpectedException; import com.google.common.collect.Maps; -@Ignore("KylinQueryTest is contained by ITCombinationTest") +//@Ignore("KylinQueryTest is contained by ITCombinationTest") public class ITKylinQueryTest extends KylinTestBase { @Rule @@ -150,7 +150,7 @@ public class ITKylinQueryTest extends KylinTestBase { } - @Ignore + //@Ignore @Test public void testSingleRunQuery() throws Exception { http://git-wip-us.apache.org/repos/asf/kylin/blob/9b4209be/query/src/main/java/org/apache/kylin/query/routing/ModelChooser.java ---------------------------------------------------------------------- diff --git a/query/src/main/java/org/apache/kylin/query/routing/ModelChooser.java b/query/src/main/java/org/apache/kylin/query/routing/ModelChooser.java new file mode 100644 index 0000000..623866b --- /dev/null +++ b/query/src/main/java/org/apache/kylin/query/routing/ModelChooser.java @@ -0,0 +1,28 @@ +/* + * 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.query.routing; + +import org.apache.kylin.query.relnode.OLAPContext; + +public class ModelChooser { + + public static void chooseModel(OLAPContext context) { + + } +}
