This is an automated email from the ASF dual-hosted git repository. shaofengshi pushed a change to branch 2.5.x in repository https://gitbox.apache.org/repos/asf/kylin.git.
from b81b8f7 KYLIN-3604 Can't build cube with spark in HBase standalone mode new 542720e KYLIN-3633 Avoid potential dead lock when building global dictionary new 3cf84fe KYLIN-2200 Verify CompileException on UNION ALL query when result only contains one column and add IT. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/kylin/dict/DictionaryGenerator.java | 47 +++++++++-- .../apache/kylin/dict/GlobalDictionaryBuilder.java | 8 +- .../org/apache/kylin/dict/IDictionaryBuilder.java | 3 + .../dict/global/SegmentAppendTrieDictBuilder.java | 5 ++ .../kylin/dict/ITGlobalDictionaryBuilderTest.java | 68 +++++++++++++--- .../org/apache/kylin/query/ITKylinQueryTest.java | 5 ++ .../test/resources/query/sql_unionall/query01.sql | 7 ++ .../test/resources/query/sql_unionall/query02.sql | 8 ++ .../test/resources/query/sql_unionall/query03.sql | 10 +++ .../kylin/query/relnode/KylinEnumerableUnion.java | 95 ++++++++++++++++++++++ .../apache/kylin/query/relnode/OLAPUnionRel.java | 5 +- 11 files changed, 239 insertions(+), 22 deletions(-) create mode 100644 kylin-it/src/test/resources/query/sql_unionall/query01.sql create mode 100644 kylin-it/src/test/resources/query/sql_unionall/query02.sql create mode 100644 kylin-it/src/test/resources/query/sql_unionall/query03.sql create mode 100644 query/src/main/java/org/apache/kylin/query/relnode/KylinEnumerableUnion.java