This is an automated email from the ASF dual-hosted git repository. shaofengshi pushed a change to branch 2.5.x-hadoop3.1 in repository https://gitbox.apache.org/repos/asf/kylin.git.
discard 24a534f KYLIN-2565 Add cdh60 profile discard a4adb4b KYLIN-3517 Upadate coprocessor on HBase2.0 is avaliable. discard 30e1454 KYLIN-3518 Fix Coprocessor NPE problem on hbase 2 discard dcb160e Update scripts for HDP 3.0 discard e2e7d20 KYLIN-2565 upgrade to hadoop 3.0 hbase 2.0, pass UT discard d1d2a5d KYLIN-2565, upgrade to Hadoop3.0 add 7e2391d KYLIN-3527 fix hybrid couldn't save when there is only 1 cube add f3da677 KYLIN-3543 Export HBase configuration only for Spark engine add b62b457 KYLIN-3565 User login error message is inaccurate add 11387ab KYLIN-3439, make default kylin.web.timezone in KylinConfigBase the same with kylin-defaults.properties add 683b0d9 KYLIN-3531 Save uppercase of usernames to metadata add 01f45f0 KYLIN-3526 Add check for hybrid name with special character add 8a43777 KYLIN-3528 Add details page for hybrid add c40188f KYLIN-3515 Add uuid for materialized table of hive view add 186e576 minor, less log to enable travis-ci add 807dafc KYLIN-3546 Add column which belongs to root fact table in join relation but lost add 8b59a83 add import add fac0937 KYLIN-3541 clean ci meaningless messages add ce368b9 minor, uncomment scala-maven-plugin version to allow travis-ci add 2d1fe8b Update to fix KYLIN-3595 add 92957bf KYLIN-1239 change to htable owner tag to who...@kylin.apache.org add 70167cf KYLIN-3629 NullPointException throws when use preparedStatement cache in some case add 2a7019a KYLIN-3632 Add configuration that can switch on/off preparedStatement cache in Kylin server add 0cd2a4c KYLIN-3635 Percentile calculation on Spark engine is wrong add 263fd22 KYLIN-3634 when filter column has null value may cause incorrect query result add b81b8f7 KYLIN-3604 Can't build cube with spark in HBase standalone mode add 542720e KYLIN-3633 Avoid potential dead lock when building global dictionary add 3cf84fe KYLIN-2200 Verify CompileException on UNION ALL query when result only contains one column and add IT. add 76899aa KYLIN-3613, UnknownHostException at 'Create HTable' step when use standalone hbase cluster add 42c7338 KYLIN-3645 clean table metadata when drop project add 3e929fe KYLIN-3647 Fix inconsistent states of job and its sub-task add a084e7e KYLIN-3562, optimization the logic that updating the user when user logged in. add d41ae42 Minor, drop jdbc log table from mysql add d1d8706 KYLIN-3651 JDBCResourceStore doesn't list all resources add 9d0cedc KYLIN-3646 Add instruction about rowkey sequence in "Advanced setting" page new 581a529 KYLIN-2565, upgrade to Hadoop3.0 new 2eecd49 KYLIN-2565 upgrade to hadoop 3.0 hbase 2.0, pass UT new 4c1fa31 Update scripts for HDP 3.0 new 6ae921d KYLIN-3518 Fix Coprocessor NPE problem on hbase 2 new aba864f KYLIN-3517 Upadate coprocessor on HBase2.0 is avaliable. new f411935 KYLIN-2565 Add cdh60 profile This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (24a534f) \ N -- N -- N refs/heads/2.5.x-hadoop3.1 (f411935) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 6 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: build/bin/find-hive-dependency.sh | 2 +- .../org/apache/kylin/common/KylinConfigBase.java | 11 ++- .../common/persistence/FileResourceStore.java | 5 +- .../kylin/common/persistence/JDBCResourceDAO.java | 53 +++++++++--- .../src/main/resources/kylin-defaults.properties | 2 +- .../java/org/apache/kylin/cube/CubeManager.java | 8 +- .../kylin/cube/cli/DictionaryGeneratorCLI.java | 16 ++-- .../java/org/apache/kylin/gridtable/GTUtil.java | 12 ++- .../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 ++ .../org/apache/kylin/dict/lookup/SnapshotCLI.java | 5 +- .../kylin/job/execution/AbstractExecutable.java | 28 ++++--- .../job/execution/DefaultChainedExecutable.java | 38 ++------- .../kylin/job/execution/ExecutableManager.java | 30 ++++++- .../job/impl/threadpool/DefaultScheduler.java | 4 + ...utable.java => PersistExceptionExecutable.java} | 12 +-- .../job/impl/threadpool/DefaultSchedulerTest.java | 2 +- .../measure/percentile/PercentileMeasureType.java | 5 ++ .../org/apache/kylin/metadata/model/TableDesc.java | 8 ++ .../kylin/metadata/project/ProjectL2Cache.java | 7 -- .../main/java/org/apache/kylin/source/ISource.java | 2 +- .../org/apache/kylin/source/SourceManager.java | 4 +- .../kylin/storage/gtrecord/DictGridTableTest.java | 7 +- .../java/org/apache/kylin/engine/mr/IMRInput.java | 2 +- .../apache/kylin/engine/mr/JobBuilderSupport.java | 1 + .../java/org/apache/kylin/engine/mr/MRUtil.java | 8 +- .../kylin/engine/mr/steps/CreateDictionaryJob.java | 4 +- .../lookup/LookupSnapshotToMetaStoreStep.java | 2 +- .../kylin/dict/ITGlobalDictionaryBuilderTest.java | 68 +++++++++++++--- .../org/apache/kylin/query/ITKylinQueryTest.java | 5 ++ .../kylin/source/hive/ITSnapshotManagerTest.java | 2 +- .../storage/jdbc/ITJDBCResourceStoreTest.java | 13 ++- .../test/resources/query/sql_unionall/query01.sql | 7 ++ .../test/resources/query/sql_unionall/query02.sql | 8 ++ .../test/resources/query/sql_unionall/query03.sql | 10 +++ pom.xml | 3 +- .../kylin/query/relnode/KylinEnumerableUnion.java | 95 ++++++++++++++++++++++ .../apache/kylin/query/relnode/OLAPUnionRel.java | 5 +- .../kylin/rest/controller/JobController.java | 2 +- .../java/org/apache/kylin/rest/msg/CnMessage.java | 4 + .../java/org/apache/kylin/rest/msg/Message.java | 4 + .../rest/security/KylinAuthenticationProvider.java | 8 +- .../kylin/rest/security/KylinUserManager.java | 4 +- .../apache/kylin/rest/security/ManagedUser.java | 35 ++++---- .../org/apache/kylin/rest/service/CubeService.java | 10 ++- .../org/apache/kylin/rest/service/JobService.java | 33 +++++--- .../kylin/rest/service/KylinUserService.java | 2 +- .../apache/kylin/rest/service/ProjectService.java | 11 ++- .../apache/kylin/rest/service/QueryService.java | 5 +- .../apache/kylin/rest/service/TableService.java | 2 +- .../kylin/rest/controller/JobControllerTest.java | 12 --- .../kylin/rest/security/KylinUserManagerTest.java | 6 +- .../kylin/rest/security/TableACLManagerTest.java | 4 +- .../kylin/rest/service/AdminServiceTest.java | 3 +- .../kylin/rest/util/MultiNodeManagerTestBase.java | 6 +- .../apache/kylin/source/hive/HiveInputBase.java | 10 +-- .../org/apache/kylin/source/hive/HiveMRInput.java | 13 +-- .../org/apache/kylin/source/hive/HiveSource.java | 4 +- .../apache/kylin/source/hive/HiveSparkInput.java | 6 +- .../hive/cardinality/ColumnCardinalityMapper.java | 2 +- .../hive/cardinality/HiveColumnCardinalityJob.java | 6 +- .../org/apache/kylin/source/jdbc/JdbcSource.java | 2 +- .../apache/kylin/source/kafka/KafkaInputBase.java | 24 +++++- .../apache/kylin/source/kafka/KafkaMRInput.java | 2 +- .../org/apache/kylin/source/kafka/KafkaSource.java | 2 +- .../storage/hbase/lookup/HBaseLookupMRSteps.java | 2 +- .../hbase/lookup/LookupTableToHFileJob.java | 5 +- .../hbase/lookup/LookupTableToHFileMapper.java | 4 +- .../kylin/storage/hbase/steps/CreateHTableJob.java | 7 +- .../kylin/storage/hbase/steps/CubeHFileJob.java | 2 +- .../kylin/storage/hbase/steps/SparkCubeHFile.java | 8 +- .../kylin/storage/hbase/util/CleanHtableCLI.java | 2 +- webapp/app/js/controllers/auth.js | 4 +- webapp/app/js/controllers/hybridInstance.js | 26 +++++- webapp/app/js/controllers/hybridInstanceSchema.js | 4 +- webapp/app/less/app.less | 11 ++- .../partials/cubeDesigner/advanced_settings.html | 14 ++-- webapp/app/partials/cubes/hybrid_detail.html | 71 ++++++++++++++++ webapp/app/partials/cubes/hybrid_edit.html | 9 +- webapp/app/partials/models/models_tree.html | 3 +- 82 files changed, 708 insertions(+), 243 deletions(-) copy core-job/src/test/java/org/apache/kylin/job/{RunningTestExecutable.java => PersistExceptionExecutable.java} (81%) 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 create mode 100644 webapp/app/partials/cubes/hybrid_detail.html