This is an automated email from the ASF dual-hosted git repository. xxyu pushed a change to branch kylin5 in repository https://gitbox.apache.org/repos/asf/kylin.git
from d5dac0f4b4 KYLIN-5518 export tds add add fields new 0152ac9e04 KYLIN-5490 prometheus api add auth new 6d032894b0 [DIRTY] ignore case with project name in resource group filter new dded9d64a5 KYLIN-5491 Partial Log Governance new 67ed3bed4e KYLIN-5492 service modules refactor new 187bb21fa8 KYLIN-5492 fix compile issue new 531a25f207 [DIRTY] fix upgrade in resource group new d8cd3cd95c KYLIN-5493 set epoch_target as primary key of epoch table new b3f7cf32ae [DIRTY] fix jdbc connection not close new bcdbf5fb08 KYLIN-5494 fix diag api security new 552f8f8fd4 KYLIN-5495 add async query count limit new 8f38936d58 KYLIN-5496 Fix the query result is incorrect after the character type in the 'yyyy-mm-dd' format is converted to the timestamp type and then filtered new 2e9b3175f1 [DIRTY] fix issue when /tmp dir with noexec new f61397f172 [DIRTY] fix start streaming job throw NPE new 11115c1c33 KYLIN-5497 fix snyk vulnerabilities, upgrade org.yaml:snakeyaml from 1.31 to 1.32 new 95ef154a3e KYLIN-5497 fix snyk vulnerabilities, upgrade ant from 1.9.16 to1.10.11 new 141eb4a7c3 KYLIN-5454 add UT for Async Query Result new b61ce536d0 KYLIN-5498 Fixed a bug where click Save and build btn and not pull up a build-task after changing the multil partition model to a full model new 08dc9f9b35 KYLIN-5499 fix partition col format mismatch with type new 75db3c0b2c KYLIN-5497 fix snyk vulnerabilities, upgrade hadoop-yarn-server-resourcemanager from 2.10.1 to 2.10.2 new c67ba03c63 [DIRTY] run sparder with local mode when proposing recommendations new 66fd4c6efe [DIRTY] Release spark 3.2.0-kylin-4.6.5.0 new be4e981b42 [DIRTY] fix maven package error The 22 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 | 11 +-- .../src/main/resources/kylinSecurity.xml | 2 - .../kylin/rest/controller/NBasicController.java | 30 ++++++++ .../kylin/rest/controller/NSystemController.java | 12 ++- .../src/main/resources/kylinSecurity.xml | 2 - .../rest/controller/NSystemControllerTest.java | 39 +++++++++- src/common-service/pom.xml | 21 +++++- .../apache/kylin/rest/config/AppInitializer.java | 4 +- .../initialize/DataSourceAppInitializer.java | 0 .../apache/kylin/rest/constant/JobInfoEnum.java | 0 .../kylin/rest/request/AWSTableLoadRequest.java | 0 .../kylin/rest/request/AutoMergeRequest.java | 0 .../org/apache/kylin/rest/request/DDLRequest.java | 0 .../kylin/rest/request/DateRangeRequest.java | 0 .../kylin/rest/request/ExportTableRequest.java | 0 .../kylin/rest/request/OpenReloadTableRequest.java | 0 .../kylin/rest/request/PartitionKeyRequest.java | 0 .../kylin/rest/request/ReloadTableRequest.java | 0 .../apache/kylin/rest/request/S3TableExtInfo.java | 0 .../apache/kylin/rest/request/SamplingRequest.java | 0 .../kylin/rest/request/StreamingRequest.java | 0 .../kylin/rest/request/StreamingTableRequest.java | 0 .../kylin/rest/request/TableDescRequest.java | 0 .../kylin/rest/request/TableLoadRequest.java | 0 .../apache/kylin/rest/request/TopTableRequest.java | 0 .../rest/request/UpdateAWSTableExtDescRequest.java | 0 .../org/apache/kylin/rest/request/ViewRequest.java | 0 .../rest/response/AutoMergeConfigResponse.java | 0 .../rest/response/BatchLoadTableResponse.java | 0 .../apache/kylin/rest/response/DDLResponse.java | 0 .../rest/response/ExistedDataRangeResponse.java | 0 .../kylin/rest/response/ExportTablesResponse.java | 0 .../kylin/rest/response/LoadTableResponse.java | 0 .../rest/response/NHiveTableNameResponse.java | 0 .../kylin/rest/response/NInitTablesResponse.java | 0 .../rest/response/OpenPreReloadTableResponse.java | 0 .../rest/response/PreReloadTableResponse.java | 0 .../rest/response/PreUnloadTableResponse.java | 0 ...serResponse.java => ServerExtInfoResponse.java} | 24 +++--- .../kylin/rest/response/TableDescResponse.java | 0 .../kylin/rest/response/TableNameResponse.java | 0 .../apache/kylin/rest/response/TableRefresh.java | 0 .../kylin/rest/response/TableRefreshAll.java | 0 .../rest/response/TablesAndColumnsResponse.java | 0 .../response/UpdateAWSTableExtDescResponse.java | 0 .../apache/kylin/rest/service/BasicService.java | 2 +- .../kylin/rest/service/CustomFileService.java | 0 .../apache/kylin/rest/service/JobSupporter.java | 0 .../rest/service/TableFusionModelSupporter.java | 0 .../rest/service/TableIndexPlanSupporter.java | 0 .../kylin/rest/service/TableModelSupporter.java | 0 .../kylin/rest/service/TableSamplingSupporter.java | 0 .../apache/kylin/rest/source/DataSourceState.java | 0 .../apache/kylin/rest/source/NHiveSourceInfo.java | 0 .../org/apache/kylin/rest/util/TableUtils.java | 0 .../kylin/rest/service/CustomFileServiceTest.java | 0 .../apache/kylin/rest/service/ServiceTestBase.java | 6 +- .../apache/kylin/rest/service/SourceTestCase.java | 12 +-- .../kylin/rest/source/DataSourceStateTest.java | 0 .../src/test/resources/kylinSecurity.xml | 2 - .../org/apache/kylin/common/KylinConfigBase.java | 5 ++ .../kylin/common/exception/QueryErrorCode.java | 1 + .../org/apache/kylin/common/msg/CnMessage.java | 8 +- .../java/org/apache/kylin/common/msg/Message.java | 4 + .../apache/kylin/loader/AddToClassPathAction.java | 0 .../org/apache/kylin/loader/ParserClassLoader.java | 0 .../kylin/loader/ParserClassLoaderState.java | 0 .../kylin/loader/utils/ClassLoaderUtils.java | 0 .../resources/kylin_errorcode_conf_en.properties | 1 + .../resources/kylin_errorcode_conf_zh.properties | 1 + .../kylin/loader/AddToClassPathActionTest.java | 0 .../kylin/loader/ParserClassLoaderStateTest.java | 0 .../apache/kylin/engine/spark/ExecutableUtils.java | 36 +++------ .../resourcegroup/ResourceGroupManager.java | 4 +- .../src/main/resources/kylinSecurity.xml | 2 - src/data-loading-service/pom.xml | 2 +- .../kylin/rest/service/KafkaServiceTest.java | 5 -- .../rest/service/StreamingTableServiceTest.java | 4 +- .../rest/config/initialize/JobSchedulerTest.java | 46 ++++++------ .../org/apache/kylin/event/ModelSemanticTest.java | 4 +- .../kylin/query/routing/RealizationPrunerTest.java | 86 ++++++++++++++++++++++ .../springframework/conf/kylinSecurity.xml | 2 - .../kylin/rest/service/ModelSemanticHelper.java | 36 ++++++--- .../service/ModelServiceSemanticUpdateTest.java | 4 +- .../service/ModelTdsServiceColumnNameTest.java | 4 +- .../src/main/resources/kylinSecurity.xml | 2 - .../kylin/query/routing/RealizationPruner.java | 66 ++++++++++++++--- .../rest/controller/NAsyncQueryController.java | 63 ++++++++-------- .../kylin/rest/controller/NQueryController.java | 8 +- .../rest/controller/NAsyncQueryControllerTest.java | 74 +++++++++++++++++++ .../rest/controller/NQueryControllerTest.java | 16 ++++ .../apache/kylin/rest/service/QueryService.java | 13 ++-- .../kylin/rest/util/AsyncQueryRequestLimits.java | 68 +++++++++++++++++ .../kylin/rest/service/AysncQueryServiceTest.java | 19 +++++ .../rest/service/LocalFileMetadataTestCase.java | 6 +- .../kylin/rest/service/ModelServiceQueryTest.java | 4 +- .../rest/util/AsyncQueryRequestLimitsTest.java | 77 +++++++++++++++++++ .../newten/clickhouse/ClickHouseSimpleITTest.java | 4 +- .../kap/secondstorage/test/EnableScheduler.java | 4 +- .../service/ModelServiceWithSecondStorageTest.java | 4 +- .../spark/merger/AfterBuildResourceMerger.java | 4 +- .../merger/AfterMergeOrRefreshResourceMerger.java | 3 +- .../SparkJobFactoryUtils.java} | 55 +++----------- .../engine/spark/NLocalWithSparkSessionTest.java | 3 +- .../kylin/engine/spark/job/JobManagerTest.java | 4 +- .../scala/org/apache/spark/sql/SparderEnv.scala | 22 +++--- .../sql/execution/datasource/FilePruner.scala | 31 +++++--- .../kylin/rest/service/StreamingJobService.java | 14 ++-- .../src/test/resources/kylinSecurity.xml | 2 - .../jobs/impl/StreamingJobLauncherTest.java | 5 +- src/tool/pom.xml | 6 ++ 111 files changed, 734 insertions(+), 265 deletions(-) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/config/initialize/DataSourceAppInitializer.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/constant/JobInfoEnum.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/request/AWSTableLoadRequest.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/request/AutoMergeRequest.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/request/DDLRequest.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/request/DateRangeRequest.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/request/ExportTableRequest.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/request/OpenReloadTableRequest.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/request/PartitionKeyRequest.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/request/ReloadTableRequest.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/request/S3TableExtInfo.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/request/SamplingRequest.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/request/StreamingRequest.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/request/StreamingTableRequest.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/request/TableDescRequest.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/request/TableLoadRequest.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/request/TopTableRequest.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/request/UpdateAWSTableExtDescRequest.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/request/ViewRequest.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/response/AutoMergeConfigResponse.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/response/BatchLoadTableResponse.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/response/DDLResponse.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/response/ExistedDataRangeResponse.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/response/ExportTablesResponse.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/response/LoadTableResponse.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/response/NHiveTableNameResponse.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/response/NInitTablesResponse.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/response/OpenPreReloadTableResponse.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/response/PreReloadTableResponse.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/response/PreUnloadTableResponse.java (100%) copy src/common-service/src/main/java/org/apache/kylin/rest/response/{OpenAccessUserResponse.java => ServerExtInfoResponse.java} (72%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/response/TableDescResponse.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/response/TableNameResponse.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/response/TableRefresh.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/response/TableRefreshAll.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/response/TablesAndColumnsResponse.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/response/UpdateAWSTableExtDescResponse.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/service/CustomFileService.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/service/JobSupporter.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/service/TableFusionModelSupporter.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/service/TableIndexPlanSupporter.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/service/TableModelSupporter.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/service/TableSamplingSupporter.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/source/DataSourceState.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/source/NHiveSourceInfo.java (100%) rename src/{datasource-service => common-service}/src/main/java/org/apache/kylin/rest/util/TableUtils.java (100%) rename src/{datasource-service => common-service}/src/test/java/org/apache/kylin/rest/service/CustomFileServiceTest.java (100%) rename src/{datasource-service => common-service}/src/test/java/org/apache/kylin/rest/service/SourceTestCase.java (98%) rename src/{datasource-service => common-service}/src/test/java/org/apache/kylin/rest/source/DataSourceStateTest.java (100%) rename src/{streaming => core-common}/src/main/java/org/apache/kylin/loader/AddToClassPathAction.java (100%) rename src/{streaming => core-common}/src/main/java/org/apache/kylin/loader/ParserClassLoader.java (100%) rename src/{streaming => core-common}/src/main/java/org/apache/kylin/loader/ParserClassLoaderState.java (100%) rename src/{streaming => core-common}/src/main/java/org/apache/kylin/loader/utils/ClassLoaderUtils.java (100%) rename src/{streaming => core-common}/src/test/java/org/apache/kylin/loader/AddToClassPathActionTest.java (100%) rename src/{streaming => core-common}/src/test/java/org/apache/kylin/loader/ParserClassLoaderStateTest.java (100%) copy src/{spark-project/engine-spark => core-job}/src/main/java/org/apache/kylin/engine/spark/ExecutableUtils.java (71%) create mode 100644 src/kylin-it/src/test/java/org/apache/kylin/query/routing/RealizationPrunerTest.java create mode 100644 src/query-service/src/main/java/org/apache/kylin/rest/util/AsyncQueryRequestLimits.java create mode 100644 src/query-service/src/test/java/org/apache/kylin/rest/util/AsyncQueryRequestLimitsTest.java rename src/spark-project/engine-spark/src/main/java/org/apache/kylin/engine/spark/{ExecutableUtils.java => utils/SparkJobFactoryUtils.java} (52%)