Merge commit 'c04be637d2991afb3a97eac59c333e4ce28f5a43'
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/2ca82411 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/2ca82411 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/2ca82411 Branch: refs/heads/master Commit: 2ca82411c33271261ce7d2df1d2de953b391e05b Parents: dbc513e c04be63 Author: Li Yang <liy...@apache.org> Authored: Sun Oct 8 21:13:09 2017 +0800 Committer: Li Yang <liy...@apache.org> Committed: Sun Oct 8 21:13:09 2017 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/cube/CubeSegment.java | 2 +- .../org/apache/kylin/cube/model/CubeDesc.java | 2 +- .../dict/MultipleDictionaryValueEnumerator.java | 50 ++++++++++-------- .../org/apache/kylin/dict/TrieDictionary.java | 2 +- .../MultipleDictionaryValueEnumeratorTest.java | 54 ++++++++++++-------- .../kylin/metadata/model/TableExtDesc.java | 26 +++++++--- pom.xml | 2 +- .../adhoc/JdbcPushDownConnectionManager.java | 2 +- .../HiveColumnCardinalityUpdateJob.java | 6 ++- .../apache/kylin/source/jdbc/JdbcExplorer.java | 1 + .../source/kafka/config/KafkaClusterConfig.java | 5 +- 11 files changed, 95 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/2ca82411/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/2ca82411/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/2ca82411/source-hive/src/main/java/org/apache/kylin/source/hive/cardinality/HiveColumnCardinalityUpdateJob.java ---------------------------------------------------------------------- diff --cc source-hive/src/main/java/org/apache/kylin/source/hive/cardinality/HiveColumnCardinalityUpdateJob.java index be7b901,023ebfd..5ffa2f6 --- a/source-hive/src/main/java/org/apache/kylin/source/hive/cardinality/HiveColumnCardinalityUpdateJob.java +++ b/source-hive/src/main/java/org/apache/kylin/source/hive/cardinality/HiveColumnCardinalityUpdateJob.java @@@ -122,7 -122,11 +122,11 @@@ public class HiveColumnCardinalityUpdat tableExt.setCardinality(scardi); metaMgr.saveTableExt(tableExt, prj); } else { - throw new IllegalArgumentException("No cardinality data is collected for table " + tableName); + // it gets here when ColumnCardinalityReducer output no record, which means empty table - MetadataManager metaMgr = MetadataManager.getInstance(KylinConfig.getInstanceFromEnv()); ++ TableMetadataManager metaMgr = TableMetadataManager.getInstance(KylinConfig.getInstanceFromEnv()); + TableExtDesc tableExt = metaMgr.getTableExt(tableName, prj); + tableExt.resetCardinality(); + metaMgr.saveTableExt(tableExt, prj); } }
