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 256414c3a0 revert KYLIN-5407 CH query total_scan_count issue new 82685b39a5 KYLIN-5420 ops plan query metric add constant tag new 6d642e7f05 KYLIN-5421 fix login user name the same as LDAP user new 76dc3a616a KYLIN-5422 fix ceil function codegen error new e4e59cd6b0 KYLIN-5425 fix api security new 4be76ac572 KYLIN-5426 fix spark collect ddl new 9006fc9236 KYLIN-5427 fix null password exception message new d0d0c7cb65 [DIRTY] ignore HdfsCapacityMetricsTest#testRegisterHdfsMetrics(), Will be fixed new b0c7326856 KYLIN-5428 Module refactor new 04e0397280 KYLIN-5429 upgrade spring-session new f67bc74bd6 KYLIN-5428 [FOLLOW UP] fix packaging issue new 1e08d51b75 KYLIN-5430 skip shard pruning for in expr new f0e2b90331 KYLIN-5431 enhanced aggregate push-down for runtime joining snapshot new b586547b78 KYLIN-5432 update kyarthas to 3.6.7 for vulnerabilities new fd95ac41cf KYLIN-5433 Add system level parameter, and the storage quota function is turned off by default new be6f0fd65b KYLIN-5434 Fix restart the build job, and the stage status displays abnormally new fd4f770e81 KYLIN-5435 Fix vulnerabilites new ac3459718d KYLIN-5436 Fix restart build job failed new 8e3844653a [DIRTY] adapt sql hint of CubePriority when transforming sql new ea4c009b65 KYLIN-5437 disable stage transfer states from DISCARDED to others new 4aabb62546 [DIRTY] update spark version to 3.2.0-kylin-4.6.3.0-SNAPSHOT new 68aa668a4c KYLIN-5438 remove systools module new 2e4167126c KYLIN-5439 fix read/write cluster db location error new 0f0f149bd5 KYLIN-5440 Follow up, optimize the speed of three datasource API new 5d1ed563bb KYLIN-5441 fix reset spark.sql.shuffle.partitions new c16c2e712c KYLIN-5442 Optimized for loading Kafka Kerberos keyTab new c00c312c3d KYLIN-5432 [FOLLOW UP] update kyarthas to 3.6.7 for vulnerabilities new 3111d4c94f [DIRTY] add management prefix to KylinConfigCheckCLI new c69296d453 KYLIN-5435 [FOLLOW UP] Fix vulnerabilites new b4496549e3 [DIRTY] Resolve missing code of metadata dump due to opencore merge new 00cfc75b40 [DIRTY] spark release 4.6.3.0 new 3e0348e2d9 [DIRTY] fix compile new f241c010e1 KYLIN-5438 [FOLLOW UP] remove systools module new cce7bc9733 fix sonar The 33 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 | 45 +- .../src/main/resources/kylinSecurity.xml | 10 +- src/common-server/pom.xml | 115 +- .../rest/config/IntegrationAppInitializer.java | 13 +- .../rest/config/initialize/BroadcastListener.java | 28 +- .../kylin/rest/controller/NAdminController.java | 1 + .../src/main/resources/kylinSecurity.xml | 10 +- src/common-service/pom.xml | 215 +--- .../kylin/rest/aspect/InsensitiveNameAspect.java | 0 .../apache/kylin/rest/aspect/RateLimitAspect.java | 0 .../kylin/rest/aspect/SchedulerEnhancer.java | 0 .../kylin/rest/aspect/TransactionAspect.java | 3 +- .../rest/broadcaster/BroadcastEventHandler.java} | 9 +- .../apache/kylin/rest/broadcaster/Broadcaster.java | 95 +- .../org/apache/kylin/rest/cache/KylinEhCache.java | 0 .../apache/kylin/rest/cluster/ClusterManager.java | 0 .../kylin/rest/cluster/DefaultClusterManager.java | 0 .../kylin/rest/cluster/MockClusterManager.java | 16 +- .../config/KylinPropertySourceConfiguration.java | 5 +- .../config/initialize/QueryMetricsListener.java | 1 + .../kylin/rest/controller/NBasicController.java | 9 + .../rest/handler/KapNoOpResponseErrorHandler.java | 0 .../apache/kylin/rest/interceptor/KEFilter.java | 7 +- .../apache/kylin/rest/interceptor/V2ApiFilter.java | 7 +- .../kylin/rest/request/OwnerChangeRequest.java | 0 .../apache/kylin/rest/response/AclTCRResponse.java | 11 +- .../org/apache/kylin/rest/response/DataResult.java | 7 + .../apache/kylin/rest/response/ErrorResponse.java | 13 +- .../kylin/rest/response/ServerInfoResponse.java | 0 .../kylin/rest/response/UserGroupResponse.java | 2 + .../kylin/rest/response/UserGroupResponseKI.java | 0 .../LdapCaseIgnoreUserDetailsContextMapper.java | 53 + .../apache/kylin/rest/security/LoginLogFilter.java | 0 .../kylin/rest/service/AclTCRServiceSupporter.java | 0 .../apache/kylin/rest/service/BasicService.java | 12 + .../kylin/rest/service/IUserGroupService.java | 0 .../kylin/rest/service/SnapshotSupporter.java | 6 +- .../rest/service/UserAclServiceSupporter.java | 0 .../org/apache/kylin/rest/util/AclEvaluate.java | 0 .../org/apache/kylin/rest/util/SerializeUtil.java | 23 +- .../rest/util/TimestampedRollingFileOutputDir.java | 19 +- .../apache/kylin/rest/cache/KylinEhCacheTest.java | 5 +- .../rest/controller/NBasicControllerTest.java | 19 + .../kylin/rest/service/LdapUserServiceTest.java | 15 +- .../apache/kylin/rest/util/AclEvaluateTest.java | 0 .../util/TimestampedRollingFileOutputDirTest.java | 0 .../apache/kylin/storage/cache/EhcacheTest.java | 0 src/common-service/src/test/resources/ehcache.xml | 2 +- .../src/test/resources/kylinSecurity.xml | 10 +- .../src/test/resources/user-defined-ehcache.xml | 0 .../src/test/resources/ut_ldap/ldap-server.ldif | 26 +- .../org/apache/kylin/common/KylinConfigBase.java | 18 +- .../java/org/apache/kylin/common/QueryContext.java | 12 + .../common/exception/code/ErrorCodeServer.java | 3 + .../transaction/TransactionException.java | 4 + .../org/apache/kylin/common/util/DateFormat.java | 1 - .../java/org/apache/kylin/common/util/Unsafe.java | 29 - .../kylin/job/exception/ExecuteException.java | 0 .../apache/kylin/rest/aspect/EnableRateLimit.java | 0 .../org/apache/kylin/rest/aspect/Transaction.java | 0 .../kylin/rest/aspect/TransactionProjectUnit.java | 0 .../org/apache/kylin/rest/cache/KylinCache.java | 0 .../exception/PasswordDecryptionException.java | 0 .../kylin/rest/response/EnvelopeResponse.java | 0 .../org/apache/kylin/rest/util/PagingUtil.java | 7 +- .../kylin/rest/util/SecurityLoggerUtils.java | 0 .../org/apache/kylin/rest/util/SpringContext.java | 2 +- .../apache/kylin/tool/restclient/RestClient.java | 13 +- .../resources/kylin_error_msg_conf_cn.properties | 3 + .../resources/kylin_error_msg_conf_en.properties | 5 +- .../kylin_error_suggestion_conf_cn.properties | 5 + .../kylin_error_suggestion_conf_en.properties | 6 + .../main/resources/kylin_errorcode_conf.properties | 4 + .../apache/kylin/common/KylinConfigBaseTest.java | 8 + .../kylin/common/persistence/UnitOfWorkTest.java | 15 +- .../apache/kylin/rest/service/PagingUtilTest.java | 0 src/core-job/pom.xml | 40 +- .../kylin/common/util/SystemInfoCollector.java | 6 +- .../kylin/job/execution/AbstractExecutable.java | 35 +- .../kylin/job/execution/ExecutableContext.java | 16 + .../kylin/job/execution/NExecutableManager.java | 20 +- .../job/impl/threadpool/NDefaultScheduler.java | 2 +- .../apache/kylin/job/runners/FetcherRunner.java | 10 +- .../org/apache/kylin/job/runners/JobRunner.java | 1 + .../kylin/job/execution/ExecutableContextTest.java | 14 + .../job/execution/NExecutableManagerTest.java | 2 +- .../job/impl/threadpool/NDefaultSchedulerTest.java | 2 +- src/core-metadata/pom.xml | 33 +- .../cube/storage/GarbageStorageCollector.java | 2 +- .../cube/storage/ProjectStorageInfoCollector.java | 6 +- .../cube/storage/StorageInfoCollector.java | 8 +- .../metadata/cube/storage/StorageInfoEnum.java | 0 .../cube/storage/StorageQuotaCollector.java | 2 +- .../metadata/cube/storage/StorageVolumeInfo.java | 0 .../cube/storage/TotalStorageCollector.java | 2 +- .../metadata/query/CuboidLayoutQueryTimes.java | 6 - .../kylin/metadata/query/QueryStatistics.java | 12 +- .../kylin/metadata/query/QueryTimesResponse.java | 3 - .../apache/kylin/metrics/HdfsCapacityMetrics.java | 38 +- .../kylin/rest/util/CreateTableFromJson.java | 12 +- .../storage/ProjectStorageInfoCollectorTest.java | 16 + .../streaming/StreamingJobRecordManagerTest.java | 2 + .../kylin/metrics/HdfsCapacityMetricsTest.java | 28 +- src/core-metrics/pom.xml | 5 - .../apache/kylin/common/metrics/MetricsTag.java | 1 + src/core-storage/pom.xml | 12 +- .../src/main/resources/kylinSecurity.xml | 10 +- src/data-loading-server/pom.xml | 4 + .../kylin/rest/controller/SnapshotController.java | 8 +- .../rest/controller/SnapshotControllerTest.java | 9 +- .../org/apache/kylin/rest/service/JobService.java | 12 +- .../apache/kylin/rest/service/SnapshotService.java | 104 +- .../kylin/rest/service/ModelServiceBuildTest.java | 3 +- .../kylin/rest/service/SnapshotServiceTest.java | 106 +- src/datasource-service/pom.xml | 9 +- .../kylin/rest/request/TableDescRequest.java | 88 ++ .../apache/kylin/rest/service/TableService.java | 117 +- .../org/apache/kylin/rest/util/TableUtils.java | 17 + .../apache/kylin/rest/service/SparkDDLTest.java | 11 +- .../kylin/rest/service/SparkSourceServiceTest.java | 28 +- .../rest/service/StreamingTableServiceTest.java | 14 +- src/integration-service/pom.xml | 125 --- .../apache/kylin/rest/service/JobServiceTest.java | 79 +- .../org/apache/kylin/rest/service/StageTest.java | 6 + src/kylin-it/pom.xml | 7 +- .../apache/kylin/newten/CalciteDynamicTest.java | 5 +- .../kylin/newten/EnhancedAggPushDownTest.java | 144 +++ .../org/apache/kylin/newten/NAggPushDownTest.java | 15 +- .../kylin/newten/NBuildAndQuerySnapshotTest.java | 5 +- .../org/apache/kylin/newten/TimeZoneQueryTest.java | 17 +- .../engine/EnhancedAggPushDownPlannerTest.java | 85 ++ .../kylin/query/rules/CalciteRuleTestBase.java | 16 + .../kylin/rest/broadcaster/BroadcasterTest.java | 20 +- .../engine/EnhancedAggPushDownPlannerTest.xml | 981 +++++++++++++++++ .../kylin/query/rules/AggPushdownRuleTest.xml | 14 +- .../query/enhanced_agg_pushdown/query00.sql | 25 + .../query/enhanced_agg_pushdown/query01.sql | 34 + .../query/enhanced_agg_pushdown/query02.sql | 26 + .../query/enhanced_agg_pushdown/query03.sql | 27 + .../query/enhanced_agg_pushdown/query04.sql | 26 + .../query/enhanced_agg_pushdown/query05.sql | 26 + .../query/enhanced_agg_pushdown/query06.sql | 26 + .../query/enhanced_agg_pushdown/query07.sql | 27 + .../query/enhanced_agg_pushdown/query08.sql | 28 + .../query/enhanced_agg_pushdown/query09.sql | 28 + .../query/enhanced_agg_pushdown/query10.sql | 25 + .../query/enhanced_agg_pushdown/query11.sql | 25 + .../query/enhanced_agg_pushdown/query12.sql | 25 + .../query/enhanced_agg_pushdown/query13.sql | 24 + .../query/enhanced_agg_pushdown/query14.sql | 34 + .../query/enhanced_agg_pushdown/query15.sql | 27 + .../query/enhanced_agg_pushdown/query16.sql | 27 + .../query/enhanced_agg_pushdown/query17.sql | 26 + .../query/enhanced_agg_pushdown/query18.sql | 26 + .../query/enhanced_agg_pushdown/query19.sql | 27 + .../query/enhanced_agg_pushdown/query20.sql | 28 + .../query/enhanced_agg_pushdown/query21.sql | 26 + .../springframework/conf/kylinSecurity.xml | 10 +- .../_global/project/test_agg_pushdown.json | 37 + .../1e74b613-6134-a986-810b-ac5b4f663af3.json | 137 +++ .../6051780b-2b91-81e7-94ba-d7e18e2aec1b.json | 130 +++ .../12e442b5-eee2-ca6d-90e2-bcf02406a223.json | 21 + .../3a8a45cd-de69-269e-9c45-f07d05a98d47.json | 34 + .../1e74b613-6134-a986-810b-ac5b4f663af3.json | 42 + .../6051780b-2b91-81e7-94ba-d7e18e2aec1b.json | 63 ++ .../1e74b613-6134-a986-810b-ac5b4f663af3.json | 1127 ++++++++++++++++++++ .../6051780b-2b91-81e7-94ba-d7e18e2aec1b.json | 611 +++++++++++ .../table/DEFAULT.KYLIN_CATEGORY_GROUPINGS.json | 208 ++++ .../table/DEFAULT.KYLIN_SALES.json | 98 ++ .../table/DEFAULT.TEST_CATEGORY_GROUPINGS.json | 208 ++++ .../table/DEFAULT.TEST_KYLIN_FACT.json | 88 ++ .../table/DEFAULT.TEST_ORDER.json | 53 + src/metadata-server/pom.xml | 4 + .../kylin/rest/controller/NTableController.java | 40 +- .../kylin/rest/controller/NUserController.java | 17 +- .../rest/controller/open/OpenTableController.java | 9 +- .../rest/controller/v2/NTableControllerV2.java | 11 +- .../rest/controller/NTableControllerTest.java | 17 +- .../rest/controller/NTableControllerV2Test.java | 7 +- .../kylin/rest/controller/NUserControllerTest.java | 11 + .../controller/open/OpenTableControllerTest.java | 23 +- src/modeling-service/pom.xml | 4 - .../kylin/rest/service/ModelServiceTest.java | 6 +- .../kylin/rest/service/ProjectServiceTest.java | 1 + .../kylin/rest/service/TableServiceTest.java | 90 +- .../src/main/resources/kylinSecurity.xml | 10 +- .../org/apache/kylin/query/util/EscapeParser.jj | 17 +- .../org/apache/kylin/query/util/RawSqlParser.jj | 7 +- .../kylin/query/routing/RealizationChooser.java | 3 + .../org/apache/kylin/query/util/QueryUtil.java | 11 +- .../kylin/query/util/RelAggPushDownUtil.java | 185 ++++ src/query-server/pom.xml | 10 +- src/query-service/pom.xml | 11 - .../rest/health/SparkContextHealthIndicator.java | 3 +- .../health/SparkSqlContextHealthIndicator.java | 3 +- .../apache/kylin/rest/service/MonitorService.java | 2 +- .../kylin/rest/service/AysncQueryServiceTest.java | 3 +- .../kylin/rest/service/MonitorServiceTest.java | 0 .../rest/service/QueryHistoryServiceTest.java | 9 +- .../query/optrule/KapAggFilterTransposeRule.java | 3 + .../kap/query/optrule/KapAggJoinTransposeRule.java | 146 ++- .../kap/query/optrule/KapAggProjectMergeRule.java | 31 +- .../query/optrule/KapAggProjectTransposeRule.java | 78 +- .../query/optrule/KapCountDistinctJoinRule.java | 63 +- .../org/apache/kylin/query/engine/QueryExec.java | 58 +- .../java/org/apache/kylin/query/util/HepUtils.java | 5 +- .../kylin/query/util/EscapeTransformerTest.java | 3 +- .../org/apache/kylin/query/util/QueryUtilTest.java | 19 + src/second-storage/core-ui/pom.xml | 10 +- src/second-storage/core/pom.xml | 6 - .../kap/secondstorage/metadata/NodeGroupTest.java | 2 +- src/server/pom.xml | 28 +- .../org/apache/kylin/rest/config/CorsConfig.java | 0 .../rest/config/KylinRequestHandlerSelectors.java | 0 .../apache/kylin/rest/config/SecurityConfig.java | 0 .../apache/kylin/rest/config/SwaggerConfig.java | 0 .../org/apache/kylin/rest/config/WebMvcConfig.java | 4 +- .../rest/health/FileSystemHealthIndicator.java | 6 +- .../rest/health/MetaStoreHealthIndicator.java | 34 +- .../rest/security/UnauthorisedEntryPoint.java | 0 src/source-hive/pom.xml | 4 - src/spark-project/engine-build-sdk/pom.xml | 10 - src/spark-project/engine-spark/pom.xml | 2 +- .../kylin/engine/spark/job/NSparkExecutable.java | 9 +- .../kylin/engine/spark/job/NTableSamplingJob.java | 8 +- .../spark/source/NSparkMetadataExplorer.java | 26 +- .../engine/spark/job/NSparkSnapshotJobTest.java | 5 +- .../kylin/query/runtime/SparderRexVisitor.scala | 3 + .../scala/org/apache/spark/sql/DdlOperation.scala | 53 +- .../org/apache/spark/sql/SparkOperation.scala | 3 +- .../sql/catalyst/expressions/KapExpresssions.scala | 8 +- src/spark-project/spark-common/pom.xml | 6 +- .../common/logging/AbstractHdfsLogAppender.java | 5 +- .../sql/execution/datasource/FilePruner.scala | 14 +- .../datasource/ResetShufflePartition.scala | 13 +- .../datasource/ResetShufflePartitionSuite.scala | 82 ++ src/streaming-sdk/pom.xml | 2 +- .../src/test/resources/kylinSecurity.xml | 10 +- src/streaming/pom.xml | 2 +- .../org/apache/kylin/kafka/util/KafkaUtils.java | 5 +- .../streaming/constants/StreamingConstants.java | 6 + .../kylin/streaming/jobs/StreamingJobListener.java | 20 +- .../kylin/streaming/jobs/StreamingJobUtils.java | 145 ++- .../streaming/jobs/impl/StreamingJobLauncher.java | 132 +-- .../kylin/streaming/CreateStreamingFlatTable.scala | 3 - .../apache/kylin/kafka/util/KafkaUtilsTest.java | 6 +- .../streaming/jobs/StreamingJobListenerTest.java | 32 +- .../streaming/jobs/StreamingJobUtilsTest.java | 98 +- .../jobs/impl/StreamingJobLauncherTest.java | 33 +- src/systools/pom.xml | 165 +-- .../kylin/rest/exception/BadRequestException.java | 78 -- .../rest/health/AbstractKylinHealthIndicator.java | 47 - .../rest/interceptor/HeaderMapRequestWrapper.java | 78 -- .../kylin/rest/security/ExternalAclProvider.java | 18 +- .../kylin/rest/security/KerberosLoginManager.java | 4 +- .../apache/kylin/rest/util/AclPermissionUtil.java | 2 +- .../rest/security/KerberosLoginManagerTest.java | 10 +- .../kylin/rest/security/UserAclManagerTest.java | 2 +- src/systools/src/test/resources/ehcache.xml | 19 - src/tool/pom.xml | 66 +- .../org/apache/kylin/tool/KylinConfigCheckCLI.java | 4 +- .../org/apache/kylin/tool/RecCandidateTool.java | 2 +- .../apache/kylin/tool/KylinConfigCheckCLITest.java | 14 +- 263 files changed, 7234 insertions(+), 1832 deletions(-) rename src/{integration-service => common-server}/src/main/java/org/apache/kylin/rest/config/IntegrationAppInitializer.java (77%) rename src/{integration-service => common-server}/src/main/java/org/apache/kylin/rest/config/initialize/BroadcastListener.java (91%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/aspect/InsensitiveNameAspect.java (100%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/aspect/RateLimitAspect.java (100%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/aspect/SchedulerEnhancer.java (100%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/aspect/TransactionAspect.java (97%) copy src/{core-job/src/main/java/org/apache/kylin/metadata/cube/storage/StorageInfoCollector.java => common-service/src/main/java/org/apache/kylin/rest/broadcaster/BroadcastEventHandler.java} (77%) rename src/{integration-service => common-service}/src/main/java/org/apache/kylin/rest/broadcaster/Broadcaster.java (78%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/cache/KylinEhCache.java (100%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/cluster/ClusterManager.java (100%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/cluster/DefaultClusterManager.java (100%) rename src/{systools/src/test => common-service/src/main}/java/org/apache/kylin/rest/cluster/MockClusterManager.java (69%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/config/KylinPropertySourceConfiguration.java (93%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/handler/KapNoOpResponseErrorHandler.java (100%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/interceptor/KEFilter.java (92%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/interceptor/V2ApiFilter.java (94%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/request/OwnerChangeRequest.java (100%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/response/AclTCRResponse.java (95%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/response/DataResult.java (84%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/response/ErrorResponse.java (93%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/response/ServerInfoResponse.java (100%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/response/UserGroupResponse.java (96%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/response/UserGroupResponseKI.java (100%) create mode 100644 src/common-service/src/main/java/org/apache/kylin/rest/security/LdapCaseIgnoreUserDetailsContextMapper.java rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/security/LoginLogFilter.java (100%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/service/AclTCRServiceSupporter.java (100%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/service/IUserGroupService.java (100%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/service/UserAclServiceSupporter.java (100%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/util/AclEvaluate.java (100%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/util/SerializeUtil.java (69%) rename src/{systools => common-service}/src/main/java/org/apache/kylin/rest/util/TimestampedRollingFileOutputDir.java (85%) rename src/{systools => common-service}/src/test/java/org/apache/kylin/rest/cache/KylinEhCacheTest.java (91%) rename src/{systools => common-service}/src/test/java/org/apache/kylin/rest/util/AclEvaluateTest.java (100%) rename src/{systools => common-service}/src/test/java/org/apache/kylin/rest/util/TimestampedRollingFileOutputDirTest.java (100%) rename src/{core-storage => common-service}/src/test/java/org/apache/kylin/storage/cache/EhcacheTest.java (100%) rename src/{systools => common-service}/src/test/resources/user-defined-ehcache.xml (100%) rename src/{core-job => core-common}/src/main/java/org/apache/kylin/job/exception/ExecuteException.java (100%) rename src/{systools => core-common}/src/main/java/org/apache/kylin/rest/aspect/EnableRateLimit.java (100%) rename src/{systools => core-common}/src/main/java/org/apache/kylin/rest/aspect/Transaction.java (100%) rename src/{systools => core-common}/src/main/java/org/apache/kylin/rest/aspect/TransactionProjectUnit.java (100%) rename src/{systools => core-common}/src/main/java/org/apache/kylin/rest/cache/KylinCache.java (100%) rename src/{systools => core-common}/src/main/java/org/apache/kylin/rest/exception/PasswordDecryptionException.java (100%) rename src/{systools => core-common}/src/main/java/org/apache/kylin/rest/response/EnvelopeResponse.java (100%) rename src/{systools => core-common}/src/main/java/org/apache/kylin/rest/util/PagingUtil.java (95%) rename src/{systools => core-common}/src/main/java/org/apache/kylin/rest/util/SecurityLoggerUtils.java (100%) rename src/{systools => core-common}/src/main/java/org/apache/kylin/rest/util/SpringContext.java (96%) rename src/{systools => core-common}/src/main/java/org/apache/kylin/tool/restclient/RestClient.java (97%) rename src/{systools => core-common}/src/test/java/org/apache/kylin/rest/service/PagingUtilTest.java (100%) rename src/{core-job => core-metadata}/src/main/java/org/apache/kylin/metadata/cube/storage/GarbageStorageCollector.java (97%) rename src/{core-job => core-metadata}/src/main/java/org/apache/kylin/metadata/cube/storage/ProjectStorageInfoCollector.java (91%) rename src/{core-job => core-metadata}/src/main/java/org/apache/kylin/metadata/cube/storage/StorageInfoCollector.java (72%) rename src/{core-job => core-metadata}/src/main/java/org/apache/kylin/metadata/cube/storage/StorageInfoEnum.java (100%) rename src/{core-job => core-metadata}/src/main/java/org/apache/kylin/metadata/cube/storage/StorageQuotaCollector.java (93%) rename src/{core-job => core-metadata}/src/main/java/org/apache/kylin/metadata/cube/storage/StorageVolumeInfo.java (100%) rename src/{core-job => core-metadata}/src/main/java/org/apache/kylin/metadata/cube/storage/TotalStorageCollector.java (94%) rename src/{core-job => core-metadata}/src/main/java/org/apache/kylin/metrics/HdfsCapacityMetrics.java (92%) rename src/{systools/src/test => core-metadata/src/main}/java/org/apache/kylin/rest/util/CreateTableFromJson.java (92%) rename src/{core-job => core-metadata}/src/test/java/org/apache/kylin/metadata/cube/storage/ProjectStorageInfoCollectorTest.java (96%) rename src/{core-job => core-metadata}/src/test/java/org/apache/kylin/metrics/HdfsCapacityMetricsTest.java (86%) create mode 100644 src/datasource-service/src/main/java/org/apache/kylin/rest/request/TableDescRequest.java delete mode 100644 src/integration-service/pom.xml create mode 100644 src/kylin-it/src/test/java/org/apache/kylin/newten/EnhancedAggPushDownTest.java create mode 100644 src/kylin-it/src/test/java/org/apache/kylin/query/engine/EnhancedAggPushDownPlannerTest.java rename src/{integration-service => kylin-it}/src/test/java/org/apache/kylin/rest/broadcaster/BroadcasterTest.java (90%) create mode 100644 src/kylin-it/src/test/resources/org/apache/kylin/query/engine/EnhancedAggPushDownPlannerTest.xml create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query00.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query01.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query02.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query03.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query04.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query05.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query06.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query07.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query08.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query09.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query10.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query11.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query12.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query13.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query14.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query15.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query16.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query17.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query18.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query19.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query20.sql create mode 100644 src/kylin-it/src/test/resources/query/enhanced_agg_pushdown/query21.sql create mode 100644 src/kylin-it/src/test/resources/ut_meta/enhanced_agg_pushdown/metadata/_global/project/test_agg_pushdown.json create mode 100644 src/kylin-it/src/test/resources/ut_meta/enhanced_agg_pushdown/metadata/test_agg_pushdown/dataflow/1e74b613-6134-a986-810b-ac5b4f663af3.json create mode 100644 src/kylin-it/src/test/resources/ut_meta/enhanced_agg_pushdown/metadata/test_agg_pushdown/dataflow/6051780b-2b91-81e7-94ba-d7e18e2aec1b.json create mode 100644 src/kylin-it/src/test/resources/ut_meta/enhanced_agg_pushdown/metadata/test_agg_pushdown/dataflow_details/1e74b613-6134-a986-810b-ac5b4f663af3/12e442b5-eee2-ca6d-90e2-bcf02406a223.json create mode 100644 src/kylin-it/src/test/resources/ut_meta/enhanced_agg_pushdown/metadata/test_agg_pushdown/dataflow_details/6051780b-2b91-81e7-94ba-d7e18e2aec1b/3a8a45cd-de69-269e-9c45-f07d05a98d47.json create mode 100644 src/kylin-it/src/test/resources/ut_meta/enhanced_agg_pushdown/metadata/test_agg_pushdown/index_plan/1e74b613-6134-a986-810b-ac5b4f663af3.json create mode 100644 src/kylin-it/src/test/resources/ut_meta/enhanced_agg_pushdown/metadata/test_agg_pushdown/index_plan/6051780b-2b91-81e7-94ba-d7e18e2aec1b.json create mode 100644 src/kylin-it/src/test/resources/ut_meta/enhanced_agg_pushdown/metadata/test_agg_pushdown/model_desc/1e74b613-6134-a986-810b-ac5b4f663af3.json create mode 100644 src/kylin-it/src/test/resources/ut_meta/enhanced_agg_pushdown/metadata/test_agg_pushdown/model_desc/6051780b-2b91-81e7-94ba-d7e18e2aec1b.json create mode 100644 src/kylin-it/src/test/resources/ut_meta/enhanced_agg_pushdown/metadata/test_agg_pushdown/table/DEFAULT.KYLIN_CATEGORY_GROUPINGS.json create mode 100644 src/kylin-it/src/test/resources/ut_meta/enhanced_agg_pushdown/metadata/test_agg_pushdown/table/DEFAULT.KYLIN_SALES.json create mode 100644 src/kylin-it/src/test/resources/ut_meta/enhanced_agg_pushdown/metadata/test_agg_pushdown/table/DEFAULT.TEST_CATEGORY_GROUPINGS.json create mode 100644 src/kylin-it/src/test/resources/ut_meta/enhanced_agg_pushdown/metadata/test_agg_pushdown/table/DEFAULT.TEST_KYLIN_FACT.json create mode 100644 src/kylin-it/src/test/resources/ut_meta/enhanced_agg_pushdown/metadata/test_agg_pushdown/table/DEFAULT.TEST_ORDER.json create mode 100644 src/query-common/src/main/java/org/apache/kylin/query/util/RelAggPushDownUtil.java rename src/{integration-service => query-service}/src/main/java/org/apache/kylin/rest/service/MonitorService.java (99%) rename src/{integration-service => query-service}/src/test/java/org/apache/kylin/rest/service/MonitorServiceTest.java (100%) rename src/{systools => server}/src/main/java/org/apache/kylin/rest/config/CorsConfig.java (100%) rename src/{systools => server}/src/main/java/org/apache/kylin/rest/config/KylinRequestHandlerSelectors.java (100%) rename src/{systools => server}/src/main/java/org/apache/kylin/rest/config/SecurityConfig.java (100%) rename src/{systools => server}/src/main/java/org/apache/kylin/rest/config/SwaggerConfig.java (100%) rename src/{systools => server}/src/main/java/org/apache/kylin/rest/config/WebMvcConfig.java (94%) rename src/{systools => server}/src/main/java/org/apache/kylin/rest/security/UnauthorisedEntryPoint.java (100%) create mode 100644 src/spark-project/spark-common/src/test/scala/org/apache/spark/sql/execution/datasource/ResetShufflePartitionSuite.scala delete mode 100644 src/systools/src/main/java/org/apache/kylin/rest/exception/BadRequestException.java delete mode 100644 src/systools/src/main/java/org/apache/kylin/rest/health/AbstractKylinHealthIndicator.java delete mode 100644 src/systools/src/main/java/org/apache/kylin/rest/interceptor/HeaderMapRequestWrapper.java