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/12/30 08:10:31 UTC
[06/50] [abbrv] kylin git commit: KYLIN-2314 more CI fixes
KYLIN-2314 more CI fixes
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ed8b1683
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ed8b1683
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ed8b1683
Branch: refs/heads/master-hbase1.x
Commit: ed8b1683a35488ffb8dd222c7bbe0fa84600aa5d
Parents: 73fbbb9
Author: Yang Li <li...@apache.org>
Authored: Sat Dec 24 21:09:21 2016 +0800
Committer: Yang Li <li...@apache.org>
Committed: Mon Dec 26 07:25:54 2016 +0800
----------------------------------------------------------------------
examples/test_case_data/localmeta/project/default.json | 9 ++++++++-
.../main/java/org/apache/kylin/query/schema/OLAPTable.java | 2 +-
.../kylin/source/kafka/config/KafkaConsumerProperties.java | 8 +++-----
3 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/ed8b1683/examples/test_case_data/localmeta/project/default.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/project/default.json b/examples/test_case_data/localmeta/project/default.json
index 1ecc7cc..75d7ec9 100644
--- a/examples/test_case_data/localmeta/project/default.json
+++ b/examples/test_case_data/localmeta/project/default.json
@@ -31,11 +31,18 @@
"tables": [
"DEFAULT.TEST_KYLIN_FACT",
"DEFAULT.TEST_ORDER",
+ "DEFAULT.TEST_ACCOUNT",
+ "DEFAULT.TEST_COUNTRY",
"EDW.TEST_CAL_DT",
"DEFAULT.TEST_CATEGORY_GROUPINGS",
"EDW.TEST_SITES",
"EDW.TEST_SELLER_TYPE_DIM",
- "DEFAULT.STREAMING_TABLE"
+ "DEFAULT.STREAMING_TABLE",
+ "SSB.CUSTOMER",
+ "SSB.DATES",
+ "SSB.PART",
+ "SSB.SUPPLIER",
+ "SSB.V_LINEORDER"
],
"models": [
"ssb",
http://git-wip-us.apache.org/repos/asf/kylin/blob/ed8b1683/query/src/main/java/org/apache/kylin/query/schema/OLAPTable.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/schema/OLAPTable.java b/query/src/main/java/org/apache/kylin/query/schema/OLAPTable.java
index c33c4ed..85996f4 100644
--- a/query/src/main/java/org/apache/kylin/query/schema/OLAPTable.java
+++ b/query/src/main/java/org/apache/kylin/query/schema/OLAPTable.java
@@ -203,7 +203,7 @@ public class OLAPTable extends AbstractQueryableTable implements TranslatableTab
DataModelDesc model = realization.getModel();
for (String metricColumn : model.getMetrics()) {
TblColRef col = model.findColumn(metricColumn);
- if (col.getType().isIntegerFamily() && !col.getType().isBigInt())
+ if (col.getTable().equals(sourceTable.getIdentity()) && col.getType().isIntegerFamily() && !col.getType().isBigInt())
updateColumns.add(col.getColumnDesc());
}
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/ed8b1683/source-kafka/src/main/java/org/apache/kylin/source/kafka/config/KafkaConsumerProperties.java
----------------------------------------------------------------------
diff --git a/source-kafka/src/main/java/org/apache/kylin/source/kafka/config/KafkaConsumerProperties.java b/source-kafka/src/main/java/org/apache/kylin/source/kafka/config/KafkaConsumerProperties.java
index 8f0dd42..5b3dd87 100644
--- a/source-kafka/src/main/java/org/apache/kylin/source/kafka/config/KafkaConsumerProperties.java
+++ b/source-kafka/src/main/java/org/apache/kylin/source/kafka/config/KafkaConsumerProperties.java
@@ -101,8 +101,8 @@ public class KafkaConsumerProperties {
private Properties loadKafkaConsumerProperties() {
File propFile = getKafkaConsumerFile();
if (propFile == null || !propFile.exists()) {
- logger.error("fail to locate " + KAFKA_CONSUMER_FILE);
- throw new RuntimeException("fail to locate " + KAFKA_CONSUMER_FILE);
+ logger.warn("fail to locate " + KAFKA_CONSUMER_FILE + ", use empty kafka consumer properties");
+ return new Properties();
}
Properties properties = new Properties();
try {
@@ -115,7 +115,6 @@ public class KafkaConsumerProperties {
File propOverrideFile = new File(propFile.getParentFile(), propFile.getName() + ".override");
if (propOverrideFile.exists()) {
FileInputStream ois = new FileInputStream(propOverrideFile);
- Properties propOverride = new Properties();
Configuration oconf = new Configuration();
oconf.addResource(ois);
properties.putAll(extractKafkaConfigToProperties(oconf));
@@ -134,7 +133,6 @@ public class KafkaConsumerProperties {
}
private File getKafkaConsumerFile() {
- KylinConfig kylinConfig = KylinConfig.getInstanceFromEnv();
String kylinConfHome = System.getProperty(KylinConfig.KYLIN_CONF);
if (!StringUtils.isEmpty(kylinConfHome)) {
logger.info("Use KYLIN_CONF=" + kylinConfHome);
@@ -143,7 +141,7 @@ public class KafkaConsumerProperties {
logger.warn("KYLIN_CONF property was not set, will seek KYLIN_HOME env variable");
- String kylinHome = kylinConfig.getKylinHome();
+ String kylinHome = KylinConfig.getKylinHome();
if (StringUtils.isEmpty(kylinHome))
throw new KylinConfigCannotInitException("Didn't find KYLIN_CONF or KYLIN_HOME, please set one of them");