lxy-9602 commented on code in PR #210:
URL: https://github.com/apache/paimon-cpp/pull/210#discussion_r3809868446
##########
src/paimon/core/io/data_file_writer.cpp:
##########
@@ -45,28 +46,13 @@ DataFileWriter::DataFileWriter(
stats_extractor_(stats_extractor),
write_cols_(write_cols) {}
-void DataFileWriter::SetMetadataFinalizer(MetadataFinalizer finalizer) {
- metadata_finalizer_ = std::move(finalizer);
-}
-
Status DataFileWriter::Write(ArrowArray* batch) {
int64_t record_count = batch->length;
- PAIMON_RETURN_NOT_OK(SingleFileWriter::Write(batch));
+ PAIMON_RETURN_NOT_OK(WriteRecord(batch, batch));
seq_num_counter_->Add(record_count);
Review Comment:
The two parameters of `WriteRecord` are hard to understand in the current
form.
##########
src/paimon/core/io/data_file_index_writer.h:
##########
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#pragma once
+
+#include <memory>
+#include <optional>
+#include <string>
+#include <vector>
+
+#include "paimon/core/io/file_index_options.h"
+#include "paimon/result.h"
+
+namespace arrow {
+class Field;
+class Schema;
+class StructArray;
+} // namespace arrow
+
+namespace paimon {
+
+class Bytes;
+class DataFilePathFactory;
+class FileIndexWriter;
+class FileSystem;
+class MemoryPool;
+
+struct FileIndexWriteResult {
+ std::shared_ptr<Bytes> embedded_index;
+ std::vector<std::optional<std::string>> extra_files;
+};
+
+/// Builds every configured column index for one data file.
+class DataFileIndexWriter {
+ public:
+ static Result<std::unique_ptr<DataFileIndexWriter>> Create(
+ const std::shared_ptr<arrow::Schema>& logical_schema, const
FileIndexOptions& options,
+ const std::shared_ptr<FileSystem>& file_system,
+ const std::shared_ptr<DataFilePathFactory>& path_factory,
+ const std::shared_ptr<MemoryPool>& pool);
+
+ Status AddBatch(const std::shared_ptr<arrow::StructArray>& logical_batch);
+
+ Result<FileIndexWriteResult> Finish(const std::string& data_file_path);
+
+ void Abort();
+
+ const std::optional<std::string>& ExternalIndexPath() const {
+ return external_index_path_;
+ }
+
+ private:
+ struct IndexWriterEntry {
+ std::string column_name;
+ std::string index_type;
+ int32_t field_index;
+ std::shared_ptr<arrow::Field> field;
+ std::shared_ptr<FileIndexWriter> writer;
+ };
+
+ DataFileIndexWriter(std::vector<IndexWriterEntry>&& writers, int64_t
in_manifest_threshold,
+ const std::shared_ptr<FileSystem>& file_system,
+ const std::shared_ptr<DataFilePathFactory>&
path_factory,
+ const std::shared_ptr<MemoryPool>& pool);
+
+ Result<std::shared_ptr<Bytes>> SerializeContainer();
+ Status WriteExternal(const std::string& path, const
std::shared_ptr<Bytes>& bytes);
+
+ std::vector<IndexWriterEntry> writers_;
+ int64_t in_manifest_threshold_;
+ std::shared_ptr<FileSystem> file_system_;
+ std::shared_ptr<DataFilePathFactory> path_factory_;
+ std::shared_ptr<MemoryPool> pool_;
Review Comment:
Is `pool_` placed last because none of the other member variables in this
class use it?
##########
src/paimon/core/io/file_index_options.cpp:
##########
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include "paimon/core/io/file_index_options.h"
+
+#include <set>
+#include <utility>
+
+#include "fmt/format.h"
+#include "paimon/common/utils/string_utils.h"
+#include "paimon/core/core_options.h"
+#include "paimon/defs.h"
+#include "paimon/status.h"
+
+namespace paimon {
+namespace {
+
+constexpr char kFileIndexPrefix[] = "file-index.";
+constexpr char kColumnsSuffix[] = ".columns";
+
+} // namespace
+
+Result<FileIndexOptions> FileIndexOptions::FromCoreOptions(const CoreOptions&
options) {
+ FileIndexOptions result;
+ const std::map<std::string, std::string>& raw_options = options.ToMap();
+ result.in_manifest_threshold_ = options.FileIndexInManifestThreshold();
+
+ std::set<std::pair<std::string, std::string>> declared;
+ for (const auto& [key, value] : raw_options) {
+ if (!StringUtils::StartsWith(key, kFileIndexPrefix) ||
+ !StringUtils::EndsWith(key, kColumnsSuffix)) {
+ continue;
+ }
+ const size_t index_type_length =
+ key.size() - std::string(kFileIndexPrefix).size() -
std::string(kColumnsSuffix).size();
+ const std::string index_type =
+ key.substr(std::string(kFileIndexPrefix).size(),
index_type_length);
+ if (index_type.empty()) {
+ return Status::Invalid(fmt::format("Invalid file index option {}",
key));
+ }
+ for (std::string column_name : StringUtils::Split(value, ",",
/*ignore_empty=*/false)) {
+ StringUtils::Trim(&column_name);
Review Comment:
ignore_empty=true or false?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
