Merge pull request #1 from wyxxxcat/bb

merge
wyxxxcat · Jul 18, 2024 · 59c8379 · 59c8379
2 parents b156df0 + 129e721
commit 59c8379
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 7 deletions.
diff --git a/be/src/agent/task_worker_pool.cpp b/be/src/agent/task_worker_pool.cpp
@@ -1384,9 +1384,12 @@ void update_s3_resource(const TStorageResource& param, io::RemoteFileSystemSPtr
         auto client = static_cast<io::S3FileSystem*>(existed_fs.get())->client_holder();
         auto new_s3_conf = S3Conf::get_s3_conf(param.s3_storage_param);
         S3ClientConf conf {
+                .endpoint {},
+                .region {},
                 .ak = std::move(new_s3_conf.client_conf.ak),
                 .sk = std::move(new_s3_conf.client_conf.sk),
                 .token = std::move(new_s3_conf.client_conf.token),
+                .bucket {},
                 .provider = new_s3_conf.client_conf.provider,
         };
         st = client->reset(conf);

diff --git a/be/src/cloud/cloud_tablet.cpp b/be/src/cloud/cloud_tablet.cpp
@@ -227,6 +227,7 @@ void CloudTablet::add_rowsets(std::vector<RowsetSharedPtr> to_add, bool version_
                                             {
                                                     .expiration_time = expiration_time,
                                             },
+                                    .download_done {},
                             });
                 }
 #endif

diff --git a/be/src/io/cache/block_file_cache_downloader.cpp b/be/src/io/cache/block_file_cache_downloader.cpp
@@ -191,6 +191,7 @@ void FileCacheBlockDownloader::download_segment_file(const DownloadFileMeta& met
     FileReaderOptions opts {
             .cache_type = FileCachePolicy::FILE_BLOCK_CACHE,
             .is_doris_table = true,
+            .cache_base_path {},
             .file_size = meta.file_size,
     };
     auto st = meta.file_system->open_file(meta.path, &file_reader, &opts);

diff --git a/be/src/io/file_factory.cpp b/be/src/io/file_factory.cpp
@@ -55,7 +55,11 @@ constexpr std::string_view RANDOM_CACHE_BASE_PATH = "random";
 
 io::FileReaderOptions FileFactory::get_reader_options(RuntimeState* state,
                                                       const io::FileDescription& fd) {
-    io::FileReaderOptions opts {.file_size = fd.file_size, .mtime = fd.mtime};
+    io::FileReaderOptions opts {
+            .cache_base_path {},
+            .file_size = fd.file_size,
+            .mtime = fd.mtime,
+    };
     if (config::enable_file_cache && state != nullptr &&
         state->query_options().__isset.enable_file_cache &&
         state->query_options().enable_file_cache) {

diff --git a/be/src/olap/rowset/beta_rowset.cpp b/be/src/olap/rowset/beta_rowset.cpp
@@ -174,6 +174,7 @@ Status BetaRowset::load_segment(int64_t seg_id, segment_v2::SegmentSharedPtr* se
             .cache_type = config::enable_file_cache ? io::FileCachePolicy::FILE_BLOCK_CACHE
                                                     : io::FileCachePolicy::NO_CACHE,
             .is_doris_table = true,
+            .cache_base_path = "",
             .file_size = _rowset_meta->segment_file_size(seg_id),
     };
     auto s = segment_v2::Segment::open(fs, seg_path, seg_id, rowset_id(), _schema, reader_options,
@@ -532,6 +533,7 @@ Status BetaRowset::check_current_rowset_segment() {
                 .cache_type = config::enable_file_cache ? io::FileCachePolicy::FILE_BLOCK_CACHE
                                                         : io::FileCachePolicy::NO_CACHE,
                 .is_doris_table = true,
+                .cache_base_path {},
                 .file_size = _rowset_meta->segment_file_size(seg_id),
         };
         auto s = segment_v2::Segment::open(fs, seg_path, seg_id, rowset_id(), _schema,

diff --git a/be/src/olap/rowset/beta_rowset_writer.cpp b/be/src/olap/rowset/beta_rowset_writer.cpp
@@ -303,7 +303,9 @@ Status BetaRowsetWriter::_load_noncompacted_segment(segment_v2::SegmentSharedPtr
                             ? (config::enable_file_cache ? io::FileCachePolicy::FILE_BLOCK_CACHE
                                                          : io::FileCachePolicy::NO_CACHE)
                             : io::FileCachePolicy::NO_CACHE,
-            .is_doris_table = true};
+            .is_doris_table = true,
+            .cache_base_path {},
+    };
     auto s = segment_v2::Segment::open(io::global_local_filesystem(), path, segment_id, rowset_id(),
                                        _context.tablet_schema, reader_options, &segment);
     if (!s.ok()) {

diff --git a/be/src/olap/rowset/segment_v2/column_reader.h b/be/src/olap/rowset/segment_v2/column_reader.h
@@ -91,7 +91,7 @@ struct ColumnIteratorOptions {
     // for page cache allocation
     // page types are divided into DATA_PAGE & INDEX_PAGE
     // INDEX_PAGE including index_page, dict_page and short_key_page
-    PageTypePB type;
+    PageTypePB type = PageTypePB::UNKNOWN_PAGE_TYPE;
     io::FileReader* file_reader = nullptr; // Ref
     // reader statistics
     OlapReaderStatistics* stats = nullptr; // Ref

diff --git a/be/src/runtime/load_stream.cpp b/be/src/runtime/load_stream.cpp
@@ -84,6 +84,7 @@ Status TabletStream::init(std::shared_ptr<OlapTableSchemaParam> schema, int64_t
             .load_id = _load_id,
             .table_schema_param = schema,
             // TODO(plat1ko): write_file_cache
+            .storage_vault_id {},
     };
 
     _load_stream_writer = std::make_shared<LoadStreamWriter>(&req, _profile);

diff --git a/be/src/runtime/workload_group/workload_group.cpp b/be/src/runtime/workload_group/workload_group.cpp
@@ -252,7 +252,7 @@ WorkloadGroupInfo WorkloadGroupInfo::parse_topic_info(
     if (tworkload_group_info.__isset.id) {
         tg_id = tworkload_group_info.id;
     } else {
-        return {.valid = false};
+        return {.name = "", .valid = false};
     }
 
     // 2 name
@@ -266,7 +266,7 @@ WorkloadGroupInfo WorkloadGroupInfo::parse_topic_info(
     if (tworkload_group_info.__isset.version) {
         version = tworkload_group_info.version;
     } else {
-        return {.valid = false};
+        return {.name {}, .valid = false};
     }
 
     // 4 cpu_share

diff --git a/be/src/util/s3_util.cpp b/be/src/util/s3_util.cpp
@@ -370,6 +370,7 @@ S3Conf S3Conf::get_s3_conf(const cloud::ObjectStoreInfoPB& info) {
                     .region = info.region(),
                     .ak = info.ak(),
                     .sk = info.sk(),
+                    .token {},
                     .bucket = info.bucket(),
                     .provider = io::ObjStorageType::AWS,
             },

diff --git a/be/src/vec/exec/format/table/paimon_reader.cpp b/be/src/vec/exec/format/table/paimon_reader.cpp
@@ -45,6 +45,7 @@ Status PaimonReader::init_row_filters(const TFileRangeDesc& range) {
             .system_type = _params.file_type,
             .properties = _params.properties,
             .hdfs_params = _params.hdfs_params,
+            .broker_addresses {},
     };
     if (range.__isset.file_type) {
         // for compatibility

diff --git a/be/src/vec/exec/scan/new_olap_scanner.cpp b/be/src/vec/exec/scan/new_olap_scanner.cpp
@@ -75,8 +75,27 @@ NewOlapScanner::NewOlapScanner(pipeline::ScanLocalStateBase* parent,
           _key_ranges(std::move(params.key_ranges)),
           _tablet_reader_params({
                   .tablet = std::move(params.tablet),
+                  .tablet_schema {},
                   .aggregation = params.aggregation,
                   .version = {0, params.version},
+                  .start_key {},
+                  .end_key {},
+                  .conditions {},
+                  .bloom_filters {},
+                  .bitmap_filters {},
+                  .in_filters {},
+                  .conditions_except_leafnode_of_andnode {},
+                  .function_filters {},
+                  .delete_predicates {},
+                  .target_cast_type_for_variants {},
+                  .rs_splits {},
+                  .return_columns {},
+                  .output_columns {},
+                  .remaining_conjunct_roots {},
+                  .common_expr_ctxs_push_down {},
+                  .topn_filter_source_node_ids {},
+                  .filter_block_conjuncts {},
+                  .key_group_cluster_key_idxes {},
           }) {
     _tablet_reader_params.set_read_source(std::move(params.read_source));
     _is_init = false;

diff --git a/be/src/vec/sink/writer/iceberg/viceberg_partition_writer.cpp b/be/src/vec/sink/writer/iceberg/viceberg_partition_writer.cpp
@@ -53,7 +53,8 @@ Status VIcebergPartitionWriter::open(RuntimeState* state, RuntimeProfile* profil
     io::FSPropertiesRef fs_properties(_write_info.file_type);
     fs_properties.properties = &_hadoop_conf;
     io::FileDescription file_description = {
-            .path = fmt::format("{}/{}", _write_info.write_path, _get_target_file_name())};
+            .path = fmt::format("{}/{}", _write_info.write_path, _get_target_file_name()),
+            .fs_name {}};
     _fs = DORIS_TRY(FileFactory::create_fs(fs_properties, file_description));
     io::FileWriterOptions file_writer_options = {.used_by_s3_committer = false};
     RETURN_IF_ERROR(_fs->create_file(file_description.path, &_file_writer, &file_writer_options));

diff --git a/be/src/vec/sink/writer/vhive_partition_writer.cpp b/be/src/vec/sink/writer/vhive_partition_writer.cpp
@@ -56,7 +56,8 @@ Status VHivePartitionWriter::open(RuntimeState* state, RuntimeProfile* profile)
     io::FSPropertiesRef fs_properties(_write_info.file_type);
     fs_properties.properties = &_hadoop_conf;
     io::FileDescription file_description = {
-            .path = fmt::format("{}/{}", _write_info.write_path, _get_target_file_name())};
+            .path = fmt::format("{}/{}", _write_info.write_path, _get_target_file_name()),
+            .fs_name {}};
     // If the destination path contains a schema, use the schema directly.
     // If not, use defaultFS.
     // Otherwise a write error will occur.

diff --git a/be/src/vec/sink/writer/vtablet_writer_v2.cpp b/be/src/vec/sink/writer/vtablet_writer_v2.cpp
@@ -443,6 +443,7 @@ Status VTabletWriterV2::_write_memtable(std::shared_ptr<vectorized::Block> block
                 .table_schema_param = _schema,
                 .is_high_priority = _is_high_priority,
                 .write_file_cache = _write_file_cache,
+                .storage_vault_id {},
         };
         bool index_not_found = true;
         for (const auto& index : _schema->indexes()) {