This is an automated email from the ASF dual-hosted git repository.

kirs pushed a change to branch auto-pick-57710-branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git


    from ef80055ae14 Merge branch 'branch-4.0' into auto-pick-57710-branch-4.0
     add 4437d7289a7 [chore](dep)upgrade protobuf (#57784)
     add eb13e932d2c [chore](dep)upgrade hbase (#57810)
     add 1d0f915c9d8 [chore](dep)Cleanup: Remove local K8s Ambari deployment 
and obsolete dependencies (#57979)
     add c62a88225fd [chore](catalog)Delete Avro-Scanner module
     add 57e50b00400 using bom

No new revisions were added by this update.

Summary of changes:
 dist/LICENSE-dist.txt                              |   4 -
 fe/be-java-extensions/avro-scanner/pom.xml         |   8 +-
 .../{avro-scanner => hadoop-deps}/pom.xml          |  89 +++--
 fe/be-java-extensions/hadoop-hudi-scanner/pom.xml  |  39 +-
 .../iceberg-metadata-scanner/pom.xml               |  10 +-
 fe/be-java-extensions/java-udf/pom.xml             |   3 +-
 fe/be-java-extensions/jdbc-scanner/pom.xml         |   3 +-
 fe/be-java-extensions/max-compute-scanner/pom.xml  |   8 +-
 fe/be-java-extensions/paimon-scanner/pom.xml       |   9 +-
 fe/be-java-extensions/preload-extensions/pom.xml   |   9 +-
 .../trino-connector-scanner/pom.xml                |   3 +-
 fe/check/checkstyle/checkstyle.xml                 |   6 +
 fe/fe-common/pom.xml                               |  27 --
 .../main/java/org/apache/doris/common/Config.java  |   7 +-
 fe/fe-core/pom.xml                                 |  97 +----
 .../apache/doris/alter/SchemaChangeHandler.java    |   2 +-
 .../org/apache/doris/alter/SchemaChangeJobV2.java  |   2 +-
 .../java/org/apache/doris/analysis/BrokerDesc.java |   2 +-
 .../org/apache/doris/analysis/CreateTableStmt.java |   2 +-
 .../org/apache/doris/analysis/GroupByClause.java   |   2 +-
 .../java/org/apache/doris/analysis/SlotRef.java    |   2 +-
 .../java/org/apache/doris/analysis/TableRef.java   |   2 +-
 .../org/apache/doris/backup/BackupHandler.java     |   2 +-
 .../java/org/apache/doris/backup/RestoreJob.java   |   2 +-
 .../doris/catalog/AccessPrivilegeWithCols.java     |   2 +-
 .../main/java/org/apache/doris/catalog/Column.java |   2 +-
 .../main/java/org/apache/doris/catalog/Env.java    |  10 +-
 .../org/apache/doris/catalog/FunctionRegistry.java |   2 +-
 .../java/org/apache/doris/catalog/JdbcTable.java   |   2 +-
 .../java/org/apache/doris/catalog/OlapTable.java   |   2 +-
 .../cloud/datasource/CloudInternalCatalog.java     |   2 +-
 .../doris/common/cache/NereidsSqlCacheManager.java |   2 +-
 .../doris/common/proc/PartitionsProcDir.java       |   2 +-
 .../apache/doris/common/util/ClassLoaderUtils.java |   2 +-
 .../org/apache/doris/common/util/ExprUtil.java     |   2 +-
 .../apache/doris/datasource/CatalogProperty.java   |   2 +-
 .../org/apache/doris/datasource/ExternalTable.java |   2 +-
 .../doris/datasource/FederationBackendPolicy.java  |   2 +-
 .../apache/doris/datasource/InternalCatalog.java   |   2 +-
 .../doris/datasource/hive/HMSExternalTable.java    |   4 +-
 .../apache/doris/datasource/hive/HiveDlaTable.java |   2 +-
 .../datasource/paimon/PaimonMetadataCache.java     |   2 +-
 .../apache/doris/datasource/paimon/PaimonUtil.java |   2 +-
 .../property/storage/HdfsProperties.java           |   2 +-
 .../property/storage/LocalProperties.java          |   2 +-
 .../doris/deploy/impl/AmbariDeployManager.java     | 309 ---------------
 .../apache/doris/deploy/impl/K8sDeployManager.java | 413 ---------------------
 .../fs/TransactionScopeCachingDirectoryLister.java |   2 +-
 .../org/apache/doris/job/base/AbstractJob.java     |   2 +-
 .../doris/job/executor/DispatchTaskHandler.java    |   2 +-
 .../doris/job/extensions/insert/InsertJob.java     |   2 +-
 .../insert/streaming/StreamingInsertJob.java       |   2 +-
 .../apache/doris/job/extensions/mtmv/MTMVTask.java |   2 +-
 .../org/apache/doris/job/manager/JobManager.java   |   2 +-
 .../apache/doris/job/scheduler/JobScheduler.java   |   2 +-
 .../org/apache/doris/load/loadv2/LoadManager.java  |   2 +-
 .../routineload/AbstractDataSourceProperties.java  |   2 +-
 .../load/routineload/KafkaRoutineLoadJob.java      |   4 +-
 .../doris/load/routineload/RoutineLoadManager.java |   2 +-
 .../kafka/KafkaDataSourceProperties.java           |   2 +-
 .../org/apache/doris/master/ReportHandler.java     |   2 +-
 .../org/apache/doris/mtmv/MTMVPartitionUtil.java   |   2 +-
 .../java/org/apache/doris/mtmv/MTMVPlanUtil.java   |   2 +-
 .../doris/mtmv/MTMVRefreshPartitionSnapshot.java   |   2 +-
 .../org/apache/doris/mtmv/MTMVRefreshSnapshot.java |   2 +-
 .../java/org/apache/doris/mtmv/MTMVRelation.java   |   2 +-
 .../org/apache/doris/mtmv/MTMVRelationManager.java |   2 +-
 .../main/java/org/apache/doris/mtmv/MTMVUtil.java  |   2 +-
 .../org/apache/doris/mysql/privilege/Auth.java     |   2 +-
 .../doris/mysql/privilege/GlobalPrivTable.java     |   2 +-
 .../org/apache/doris/mysql/privilege/Role.java     |   2 +-
 .../apache/doris/mysql/privilege/UserManager.java  |   2 +-
 .../doris/mysql/privilege/UserRoleManager.java     |   2 +-
 .../doris/nereids/analyzer/UnboundRelation.java    |   2 +-
 .../glue/translator/PhysicalPlanTranslator.java    |   2 +-
 .../nereids/load/NereidsStreamLoadPlanner.java     |   2 +-
 .../parser/LogicalPlanBuilderForEncryption.java    |   2 +-
 .../apache/doris/nereids/parser/NereidsParser.java |   2 +-
 .../nereids/rules/analysis/BindExpression.java     |   2 +-
 .../doris/nereids/rules/analysis/BindRelation.java |   2 +-
 .../nereids/rules/analysis/UserAuthentication.java |   2 +-
 .../mv/InitMaterializationContextHook.java         |   2 +-
 .../expression/rules/PartitionRangeExpander.java   |   2 +-
 .../LogicalWindowToPhysicalWindow.java             |   2 +-
 .../rules/rewrite/PruneFileScanPartition.java      |   2 +-
 .../nereids/rules/rewrite/PruneOlapScanTablet.java |   2 +-
 .../doris/nereids/stats/ExpressionEstimation.java  |   2 +-
 .../plans/commands/AdminCheckTabletsCommand.java   |   2 +-
 .../plans/commands/AlterRoutineLoadCommand.java    |   2 +-
 .../plans/commands/CreateFunctionCommand.java      |   2 +-
 .../plans/commands/CreateTableLikeCommand.java     |   2 +-
 .../commands/GrantResourcePrivilegeCommand.java    |   4 +-
 .../plans/commands/GrantTablePrivilegeCommand.java |   4 +-
 .../commands/RevokeResourcePrivilegeCommand.java   |   4 +-
 .../commands/RevokeTablePrivilegeCommand.java      |   4 +-
 .../plans/commands/ShowLoadWarningsCommand.java    |   2 +-
 .../commands/alter/AlterRepositoryCommand.java     |   2 +-
 .../trees/plans/commands/info/CreateTableInfo.java |   2 +-
 .../commands/info/DistributionDescriptor.java      |   2 +-
 .../trees/plans/commands/info/RefreshMTMVInfo.java |   2 +-
 .../commands/insert/InsertIntoTableCommand.java    |   2 +-
 .../insert/InsertOverwriteTableCommand.java        |   2 +-
 .../trees/plans/commands/insert/InsertUtils.java   |   2 +-
 .../trees/plans/logical/LogicalCheckPolicy.java    |   2 +-
 .../nereids/trees/plans/logical/LogicalView.java   |   2 +-
 .../doris/nereids/util/FrontendConjunctsUtils.java |   2 +-
 .../org/apache/doris/nereids/util/PlanUtils.java   |   2 +-
 .../doris/planner/HashDistributionPruner.java      |   2 +-
 .../org/apache/doris/planner/OlapScanNode.java     |   2 +-
 .../org/apache/doris/planner/PlanFragment.java     |   2 +-
 .../java/org/apache/doris/planner/PlanNode.java    |   2 +-
 .../java/org/apache/doris/planner/RepeatNode.java  |   2 +-
 .../java/org/apache/doris/planner/ScanNode.java    |   2 +-
 .../org/apache/doris/planner/SetOperationNode.java |   2 +-
 .../java/org/apache/doris/qe/SimpleScheduler.java  |   2 +-
 .../org/apache/doris/qe/cache/CacheAnalyzer.java   |   2 +-
 .../doris/qe/runtime/ThriftPlansBuilder.java       |   2 +-
 .../apache/doris/service/FrontendServiceImpl.java  |   2 +-
 .../org/apache/doris/statistics/Histogram.java     |   2 +-
 .../doris/statistics/HistogramCacheLoader.java     |   2 +-
 .../apache/doris/statistics/StatisticsCache.java   |   2 +-
 .../apache/doris/statistics/StatisticsCleaner.java |   2 +-
 .../doris/statistics/util/StatisticsUtil.java      |   2 +-
 .../PartitionsTableValuedFunction.java             |   2 +-
 .../org/apache/doris/task/CreateReplicaTask.java   |   2 +-
 .../doris/transaction/DatabaseTransactionMgr.java  |   2 +-
 .../doris/transaction/PublishVersionDaemon.java    |   2 +-
 .../hadoop/hive/metastore/HiveMetaStoreClient.java |   2 +-
 .../apache/doris/common/CacheBulkLoaderTest.java   |   2 +-
 .../doris/datasource/iceberg/IcebergUtilsTest.java |   8 +-
 .../doris/deploy/AmbariDeployManagerTest.java      | 101 -----
 .../apache/doris/deploy/K8sDeployManagerTest.java  |  67 ----
 .../external/hms/MetastoreEventFactoryTest.java    |   2 +-
 .../apache/doris/mtmv/MTMVRelationManagerTest.java |   2 +-
 .../java/org/apache/doris/mtmv/MTMVTaskTest.java   |   2 +-
 .../nereids/privileges/TestCheckPrivileges.java    |   2 +-
 .../LogicalWindowToPhysicalWindowTest.java         |   2 +-
 .../trees/plans/commands/BackupCommandTest.java    |   2 +-
 .../trees/plans/commands/RestoreCommandTest.java   |   2 +-
 .../doris/planner/HashDistributionPrunerTest.java  |   2 +-
 .../org/apache/doris/planner/OlapScanNodeTest.java |   2 +-
 .../doris/planner/QueryCacheNormalizerTest.java    |   2 +-
 fe/pom.xml                                         | 147 ++++++--
 143 files changed, 330 insertions(+), 1301 deletions(-)
 copy fe/be-java-extensions/{avro-scanner => hadoop-deps}/pom.xml (51%)
 delete mode 100644 
fe/fe-core/src/main/java/org/apache/doris/deploy/impl/AmbariDeployManager.java
 delete mode 100644 
fe/fe-core/src/main/java/org/apache/doris/deploy/impl/K8sDeployManager.java
 delete mode 100644 
fe/fe-core/src/test/java/org/apache/doris/deploy/AmbariDeployManagerTest.java
 delete mode 100644 
fe/fe-core/src/test/java/org/apache/doris/deploy/K8sDeployManagerTest.java


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to