This is an automated email from the ASF dual-hosted git repository. dataroaring pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/doris.git
from a8a29427f6 [fix](multi catalog)Collect decimal and date type min max statistic value (#16262) add 00a598a839 [feature](cooldown) Decouple storage policy and resource (#15873) No new revisions were added by this update. Summary of changes: be/src/agent/agent_server.cpp | 7 +- be/src/agent/agent_server.h | 3 +- be/src/agent/task_worker_pool.cpp | 195 +++++++++++---------- be/src/agent/task_worker_pool.h | 14 +- be/src/agent/utils.cpp | 40 ----- be/src/agent/utils.h | 9 - be/src/io/CMakeLists.txt | 1 - be/src/io/file_factory.cpp | 15 +- be/src/io/fs/file_system.h | 11 +- be/src/io/fs/file_system_map.cpp | 45 ----- be/src/io/fs/file_system_map.h | 48 ----- be/src/io/fs/local_file_system.cpp | 9 +- be/src/io/fs/local_file_system.h | 5 +- be/src/io/fs/remote_file_system.cpp | 2 +- be/src/io/fs/remote_file_system.h | 4 +- be/src/io/fs/s3_file_system.cpp | 11 +- be/src/io/fs/s3_file_system.h | 10 +- be/src/olap/CMakeLists.txt | 2 +- be/src/olap/base_tablet.h | 6 +- be/src/olap/data_dir.cpp | 10 +- be/src/olap/rowset/rowset_meta.h | 10 +- .../rowset/segment_v2/indexed_column_reader.cpp | 1 - .../olap/rowset/segment_v2/indexed_column_reader.h | 1 - .../olap/rowset/segment_v2/ordinal_page_index.cpp | 1 - be/src/olap/storage_policy.cpp | 105 +++++++++++ be/src/olap/storage_policy.h | 71 ++++++++ be/src/olap/storage_policy_mgr.cpp | 105 ----------- be/src/olap/storage_policy_mgr.h | 79 --------- be/src/olap/tablet.cpp | 72 +++++--- be/src/olap/tablet.h | 2 +- be/src/olap/tablet_meta.cpp | 14 +- be/src/olap/tablet_meta.h | 21 +-- be/src/runtime/exec_env.h | 2 - be/src/runtime/exec_env_init.cpp | 2 - be/src/util/s3_util.h | 18 +- be/test/io/cache/remote_file_cache_test.cpp | 5 +- be/test/olap/ordered_data_compaction_test.cpp | 2 +- be/test/olap/remote_rowset_gc_test.cpp | 18 +- be/test/olap/rowid_conversion_test.cpp | 2 +- be/test/olap/rowset/beta_rowset_test.cpp | 5 +- be/test/olap/tablet_cooldown_test.cpp | 63 +++++-- be/test/olap/tablet_test.cpp | 66 +++---- be/test/olap/test_data/header_without_inc_rs.txt | 4 +- be/test/vec/olap/vertical_compaction_test.cpp | 2 +- .../main/java/org/apache/doris/alter/Alter.java | 4 +- .../apache/doris/alter/SchemaChangeHandler.java | 86 ++++++--- .../main/java/org/apache/doris/catalog/Env.java | 2 +- .../java/org/apache/doris/catalog/Resource.java | 85 ++++----- .../java/org/apache/doris/catalog/ResourceMgr.java | 7 + .../java/org/apache/doris/catalog/S3Resource.java | 18 +- .../org/apache/doris/master/ReportHandler.java | 141 ++++++++++++++- .../main/java/org/apache/doris/policy/Policy.java | 39 ++++- .../java/org/apache/doris/policy/RowPolicy.java | 2 +- .../org/apache/doris/policy/StoragePolicy.java | 145 +++++---------- .../apache/doris/service/FrontendServiceImpl.java | 64 ------- .../java/org/apache/doris/task/AgentBatchTask.java | 10 +- .../org/apache/doris/task/CreateReplicaTask.java | 18 +- .../doris/task/NotifyUpdateStoragePolicyTask.java | 70 -------- .../apache/doris/task/PushStoragePolicyTask.java | 115 ++++++++++++ .../doris/task/UpdateTabletMetaInfoTask.java | 18 +- ...{LdapInfoTest.java => ResourcePersistTest.java} | 48 +++-- .../doris/persist/StoragePolicyPersistTest.java | 36 ++-- .../java/org/apache/doris/policy/PolicyTest.java | 2 +- gensrc/proto/olap_file.proto | 3 +- gensrc/thrift/AgentService.thrift | 49 ++++-- gensrc/thrift/FrontendService.thrift | 1 - gensrc/thrift/MasterService.thrift | 2 + gensrc/thrift/Types.thrift | 5 +- .../cold_heat_separation/policy/alter.groovy | 7 +- .../cold_heat_separation/policy/create.groovy | 2 +- .../suites/cold_heat_separation/policy/show.groovy | 24 ++- .../create_table_use_partition_policy.groovy | 11 +- .../use_policy/create_table_use_policy.groovy | 11 +- 73 files changed, 1077 insertions(+), 1066 deletions(-) delete mode 100644 be/src/io/fs/file_system_map.cpp delete mode 100644 be/src/io/fs/file_system_map.h create mode 100644 be/src/olap/storage_policy.cpp create mode 100644 be/src/olap/storage_policy.h delete mode 100644 be/src/olap/storage_policy_mgr.cpp delete mode 100644 be/src/olap/storage_policy_mgr.h delete mode 100644 fe/fe-core/src/main/java/org/apache/doris/task/NotifyUpdateStoragePolicyTask.java create mode 100644 fe/fe-core/src/main/java/org/apache/doris/task/PushStoragePolicyTask.java copy fe/fe-core/src/test/java/org/apache/doris/persist/{LdapInfoTest.java => ResourcePersistTest.java} (55%) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org