This is an automated email from the ASF dual-hosted git repository. liyang pushed a change to branch kylin5 in repository https://gitbox.apache.org/repos/asf/kylin.git
from bcd4220ef2 update spark version to 3.2.0-kylin-4.6.12.0 new d977ce7bfc KYLIN-5757 No way to deselect query objects after selecting all of them new 71a7a52d66 KYLIN-5763 Fix query history model filter new 046c97f54c KYLIN-5759 Log governance of job building log new cd09148868 KYLIN-5764 Sum expression supports if condition new b7615c56bb KYLIN-5765 Optimization of registering udf operators new a8ad269b3c KYLIN-5766 Normalize query cache key new d3b4469484 KYLIN-5767 Calculate total rows wrongly when connecting jdbc datasource new 180ff07afe KYLIN-5745 Using a global thread pool to clean underlying storages new 60da9e0ce1 KYLIN-5768 Refine and adjust some code for localCache new 738cf4af01 KYLIN-5769 Support split function new 3dd581ecfa KYLIN-5770 Upgrade spring-security-config from 5.7.8 from 5.7.10 new 64b52dea66 KYLIN-5771 Query cannot be interrupted during segment pruning new 90aa1def3d KYLIN-5772 Fix vulnerability & excluding okio new ad52aada8f KYLIN-5773 update spark version to 3.2.0-kylin-4.6.13.0 The 14 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: pom.xml | 26 +- .../rest/controller/NBasicControllerTest.java | 2 +- .../apache/kylin/rest/config/AppInitializer.java | 7 + .../org/apache/kylin/rest/request/SQLRequest.java | 4 +- .../kylin/rest/service/AsyncTaskService.java | 9 +- .../apache/kylin/rest/service/ProjectService.java | 9 +- .../org/apache/kylin/common/KylinConfigBase.java | 16 + .../apache/kylin/common/constant/LogConstant.java | 1 + .../kylin/common/logging/SetLogCategory.java | 22 +- .../kylin/common/logging/SetLogCategoryTest.java | 131 +++++++++ .../kylin/job/execution/ExecutableThread.java | 3 +- .../org/apache/kylin/job/manager/JobManager.java | 30 +- .../runners/AbstractDefaultSchedulerRunner.java | 3 +- .../org/apache/kylin/job/runners/JobRunner.java | 3 +- .../kylin/metadata/cube/model/IndexPlan.java | 136 ++++++--- .../cube/optimization/AbstractOptStrategy.java | 4 +- .../cube/optimization/GarbageLayoutType.java | 2 +- .../optimization/IncludedLayoutOptStrategy.java | 2 +- .../metadata/cube/optimization/IndexOptimizer.java | 14 +- .../cube/optimization/IndexOptimizerFactory.java | 12 +- .../optimization/LowFreqLayoutOptStrategy.java | 2 +- .../cube/optimization/MergedLayoutOptStrategy.java | 59 ++++ .../optimization/SimilarLayoutOptStrategy.java | 2 +- .../cube/optimization/event/ApproveRecsEvent.java} | 13 +- .../cube/optimization/event/BuildIndexEvent.java} | 11 +- .../cube/storage/GarbageStorageCollector.java | 2 +- .../metadata/cube/utils/IndexPlanReduceUtil.java | 52 +++- .../apache/kylin/metadata/datatype/DataType.java | 2 +- .../metadata/query/JdbcQueryHistoryStore.java | 30 +- .../kylin/metadata/query/QueryHistoryDAO.java | 8 +- .../kylin/metadata/query/QueryHistoryRequest.java | 2 + .../kylin/metadata/query/RDBMSQueryHistoryDAO.java | 17 +- .../kylin/query/util/QueryInterruptChecker.java | 53 +++- .../apache/kylin/query/util/SlowQueryDetector.java | 2 +- .../storage/ProjectStorageInfoCollectorTest.java | 74 ++++- .../cube/utils/IndexPlanReduceUtilTest.java | 27 +- .../metadata/query/RDBMSQueryHistoryDaoTest.java | 44 ++- .../kylin/rest/initialize/BuildAppInitializer.java | 5 + .../rest/scheduler/AbstractSchedulerRunnable.java | 3 +- .../kylin/rest/service/ModelBuildService.java | 38 ++- .../scheduler/AbstractSchedulerRunnableTest.java | 3 +- .../kylin/rest/service/ModelServiceBuildTest.java | 36 ++- .../apache/kylin/rest/service/ScheduleService.java | 10 +- .../query/routing/PartitionPruningRuleTest.java | 313 ++++++++++++++++++++ .../query/routing/SegmentPruningRuleTest.java | 277 ++++++++++++++++++ .../kylin/query/engine/SumExprPlannerTest.xml | 63 ++++ .../sql_sum_expr/{query00.sql => query00-if.sql} | 8 +- .../rest/controller/NBuildAndQueryMetricsTest.java | 15 +- .../kylin/rest/controller/NProjectController.java | 14 +- .../rest/controller/NProjectControllerTest.java | 2 +- .../kylin/rest/service/AbstractModelService.java | 114 +++++++- .../kylin/rest/service/BaseIndexUpdateHelper.java | 17 +- .../kylin/rest/service/IndexPlanService.java | 66 +++-- .../kylin/rest/service/MetaStoreService.java | 10 +- .../apache/kylin/rest/service/ModelService.java | 33 ++- .../kylin/rest/service/IndexPlanServiceTest.java | 52 ++-- .../rest/service/MetaStoreTenantServiceTest.java | 10 +- .../kylin/rest/service/ProjectServiceTest.java | 2 +- .../util/{EscapeParser.jj => WhiteSpaceParser.jj} | 193 ++++++------ .../kylin/query/routing/PartitionPruningRule.java | 15 + .../kylin/query/routing/RealizationChooser.java | 3 +- .../kylin/query/routing/SegmentPruningRule.java | 33 ++- .../kylin/query/util/RexToTblColRefTranslator.java | 31 +- .../kylin/rest/controller/NQueryController.java | 49 ++-- .../rest/controller/NQueryControllerTest.java | 22 +- .../response/QueryHistoryFiltersResponse.java} | 29 +- .../kylin/rest/service/QueryHistoryService.java | 60 ++-- .../apache/kylin/rest/service/QueryService.java | 6 + .../rest/service/QueryHistoryServiceTest.java | 87 +++++- .../kylin/query/engine/QueryRoutingEngine.java | 80 +++-- .../org/apache/kylin/query/udf/SparkStringUDF.java | 7 +- .../apache/kylin/query/util/AggExpressionUtil.java | 215 +++----------- .../kylin/query/util/QueryContextCutter.java | 5 + .../kylin/query/util/WhiteSpaceParserTest.java | 110 +++++++ .../org/apache/kylin/rest/InitConfiguration.java | 1 - .../org/apache/kylin/rest/HAConfigurationTest.java | 6 +- .../kylin/engine/spark/NSparkCubingEngine.java | 4 + .../engine/spark/builder/CreateFlatTable.scala | 26 +- .../engine/spark/builder/SnapshotBuilder.scala | 7 +- .../job/stage/build/FlatTableAndDictBase.scala | 82 +++--- .../spark/smarter/IndexDependencyParser.scala | 7 +- .../engine/spark/job/NSparkCubingJobTest.java | 8 + .../spark/utils/ComputedColumnEvalUtilTest.java | 2 + .../kylin/source/jdbc/DefaultSourceConnector.java | 5 + .../apache/kylin/source/jdbc/ISourceConnector.java | 3 + .../apache/kylin/source/jdbc/JdbcSourceInput.java | 11 + .../kylin/source/jdbc/JdbcSourceInputTest.java | 24 ++ .../plugin/diagnose/DiagnoseExecutorPlugin.scala | 9 +- .../kylin/query/runtime/ExpressionConverter.scala | 2 +- .../kylin/query/runtime/plan/TableScanPlan.scala | 15 +- .../org/apache/spark/sql/SparderTypeUtilTest.scala | 29 +- .../common/logging/AbstractHdfsLogAppender.java | 7 +- .../common/logging/SparkDriverHdfsLogAppender.java | 2 +- .../logging/SparkExecutorHdfsLogAppender.java | 4 +- .../org/apache/spark/sql/SparderTypeUtil.scala | 107 ++++--- .../org/apache/spark/utils/SparkHadoopUtils.scala | 32 +- .../apache/spark/sql/common/SparderQueryTest.scala | 75 +++-- .../org/apache/kylin/helper/RoutineToolHelper.java | 63 +++- .../tool/garbage/AbstractComparableCleanTask.java | 93 ++++++ .../tool/garbage/CleanTaskExecutorService.java | 236 +++++++++++++++ .../kylin/tool/garbage/ExecutableCleaner.java | 10 + .../apache/kylin/tool/garbage/GarbageCleaner.java | 11 +- .../apache/kylin/tool/garbage/IndexCleaner.java | 129 +++++++- .../apache/kylin/tool/garbage/MetadataCleaner.java | 6 + .../kylin/tool/garbage/PriorityExecutor.java | 71 +++++ .../apache/kylin/tool/garbage/SnapshotCleaner.java | 10 + .../apache/kylin/tool/garbage/StorageCleaner.java | 28 +- .../kylin/tool/garbage/StorageCleanerCLI.java | 18 +- .../apache/kylin/tool/routine/FastRoutineTool.java | 1 + .../org/apache/kylin/tool/routine/RoutineTool.java | 24 +- .../org/apache/kylin/tool/util/MetadataUtil.java | 9 +- .../garbage/CleanTaskExecutorServiceTests.java | 324 +++++++++++++++++++++ 112 files changed, 3523 insertions(+), 850 deletions(-) create mode 100644 src/core-common/src/test/java/org/apache/kylin/common/logging/SetLogCategoryTest.java create mode 100644 src/core-metadata/src/main/java/org/apache/kylin/metadata/cube/optimization/MergedLayoutOptStrategy.java copy src/{core-common/src/main/java/org/apache/kylin/common/event/ModelAddEvent.java => core-metadata/src/main/java/org/apache/kylin/metadata/cube/optimization/event/ApproveRecsEvent.java} (75%) copy src/{streaming/src/main/java/org/apache/kylin/streaming/event/StreamingJobDropEvent.java => core-metadata/src/main/java/org/apache/kylin/metadata/cube/optimization/event/BuildIndexEvent.java} (82%) create mode 100644 src/kylin-it/src/test/java/org/apache/kylin/query/routing/PartitionPruningRuleTest.java copy src/kylin-it/src/test/resources/query/sql_sum_expr/{query00.sql => query00-if.sql} (91%) copy src/query-common/src/main/codegen/javacc/org/apache/kylin/query/util/{EscapeParser.jj => WhiteSpaceParser.jj} (84%) copy src/{common-service/src/main/java/org/apache/kylin/rest/response/ExcludedTableResponse.java => query-service/src/main/java/org/apache/kylin/rest/response/QueryHistoryFiltersResponse.java} (74%) create mode 100644 src/query/src/test/java/org/apache/kylin/query/util/WhiteSpaceParserTest.java create mode 100644 src/tool/src/main/java/org/apache/kylin/tool/garbage/AbstractComparableCleanTask.java create mode 100644 src/tool/src/main/java/org/apache/kylin/tool/garbage/CleanTaskExecutorService.java create mode 100644 src/tool/src/main/java/org/apache/kylin/tool/garbage/PriorityExecutor.java create mode 100644 src/tool/src/test/java/org/apache/kylin/tool/garbage/CleanTaskExecutorServiceTests.java