KYLIN-2314 more CI fixes

solversa · Dec 25, 2016 · ed8b168 · ed8b168
1 parent 73fbbb9
commit ed8b168
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git 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",

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
@@ -203,7 +203,7 @@ private List<ColumnDesc> listSourceColumns() {
                 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());
                 }
             }

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
@@ -101,8 +101,8 @@ public static Properties extractKafkaConfigToProperties(Configuration configurat
     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 @@ private Properties loadKafkaConsumerProperties() {
             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 String getKafkaConsumerHadoopJobConf() {
     }
 
     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 @@ private File getKafkaConsumerFile() {
 
         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");