Skip to content

Commit bf9ef94

Browse files
committed
fix comments
1 parent 9ce1e25 commit bf9ef94

7 files changed

Lines changed: 11 additions & 12 deletions

File tree

‎src/paimon/common/data/blob_utils.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ bool BlobUtils::IsMapBlobField(const std::shared_ptr<arrow::Field>& field) {
132132
return map_type.item_type()->id() == arrow::Type::LARGE_BINARY;
133133
}
134134

135-
bool BlobUtils::IsBlobFileField(const std::shared_ptr<arrow::Field>& field) {
135+
bool BlobUtils::IsAnyBlobField(const std::shared_ptr<arrow::Field>& field) {
136136
return IsBlobField(field) || IsArrayBlobField(field) || IsMapBlobField(field);
137137
}
138138

‎src/paimon/common/data/blob_utils.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class PAIMON_EXPORT BlobUtils {
8181
/// Returns whether the field is a top-level MAP whose values are BLOBs.
8282
static bool IsMapBlobField(const std::shared_ptr<arrow::Field>& field);
8383
/// Returns whether the field is stored in a standalone blob file.
84-
static bool IsBlobFileField(const std::shared_ptr<arrow::Field>& field);
84+
static bool IsAnyBlobField(const std::shared_ptr<arrow::Field>& field);
8585
/// Returns whether an ARRAY<BLOB> row is the internal fallback sentinel.
8686
static bool IsArrayBlobPlaceholder(const arrow::ListArray& array, int64_t row);
8787
/// Returns whether a MAP<..., BLOB> row is the internal fallback sentinel.

‎src/paimon/common/data/blob_utils_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ TEST_F(BlobUtilsTest, IsArrayBlobField) {
8383
auto array_blob_field =
8484
arrow::field("array_blob", arrow::list(BlobUtils::ToArrowField("item", true)));
8585
ASSERT_TRUE(BlobUtils::IsArrayBlobField(array_blob_field));
86-
ASSERT_TRUE(BlobUtils::IsBlobFileField(array_blob_field));
86+
ASSERT_TRUE(BlobUtils::IsAnyBlobField(array_blob_field));
8787

8888
ASSERT_FALSE(BlobUtils::IsArrayBlobField(nullptr));
8989
ASSERT_FALSE(BlobUtils::IsArrayBlobField(

‎src/paimon/common/reader/blob_fallback_batch_reader.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Result<std::unique_ptr<BlobFallbackBatchReader>> BlobFallbackBatchReader::Create
5656
}
5757
int32_t blob_field_idx = -1;
5858
for (int32_t i = 0; i < read_schema->num_fields(); i++) {
59-
if (BlobUtils::IsBlobFileField(read_schema->field(i))) {
59+
if (BlobUtils::IsAnyBlobField(read_schema->field(i))) {
6060
if (blob_field_idx != -1) {
6161
return Status::Invalid(
6262
"Blob fallback read schema should contain exactly one blob field.");

‎src/paimon/core/schema/schema_validation.cpp‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ Status SchemaValidation::ValidateRowTracking(const TableSchema& table_schema,
775775

776776
std::vector<std::string> blob_names;
777777
for (const auto& field : table_schema.Fields()) {
778-
if (BlobUtils::IsBlobFileField(field.ArrowField())) {
778+
if (BlobUtils::IsAnyBlobField(field.ArrowField())) {
779779
blob_names.push_back(field.Name());
780780
}
781781
}
@@ -817,9 +817,8 @@ Status SchemaValidation::ValidateBlobFields(const TableSchema& schema, const Cor
817817
PAIMON_RETURN_NOT_OK(ValidateNoDuplicateField(field_names, option_key));
818818
PAIMON_ASSIGN_OR_RAISE(std::vector<DataField> blob_fields, schema.GetFields(field_names));
819819
for (const auto& blob_field : blob_fields) {
820-
bool is_blob = allow_container_blob
821-
? BlobUtils::IsBlobFileField(blob_field.ArrowField())
822-
: BlobUtils::IsBlobField(blob_field.ArrowField());
820+
bool is_blob = allow_container_blob ? BlobUtils::IsAnyBlobField(blob_field.ArrowField())
821+
: BlobUtils::IsBlobField(blob_field.ArrowField());
823822
if (!is_blob) {
824823
const std::string expected_type =
825824
allow_container_blob ? "BLOB, ARRAY<BLOB> or MAP<..., BLOB>" : "BLOB";
@@ -909,7 +908,7 @@ Status SchemaValidation::ValidateMosaicDataFields(const TableSchema& schema,
909908
// Top-level blob-file fields stored in separate files are skipped; descriptor and view fields
910909
// are inline, so Mosaic must reject them here.
911910
for (const DataField& field : schema.Fields()) {
912-
if (BlobUtils::IsBlobFileField(field.ArrowField()) &&
911+
if (BlobUtils::IsAnyBlobField(field.ArrowField()) &&
913912
inline_blob_field_set.count(field.Name()) == 0) {
914913
continue;
915914
}
@@ -975,7 +974,7 @@ Status SchemaValidation::ValidateLanceDataFields(const TableSchema& schema,
975974
return Status::OK();
976975
}
977976
for (const DataField& field : schema.Fields()) {
978-
if (BlobUtils::IsBlobFileField(field.ArrowField()) &&
977+
if (BlobUtils::IsAnyBlobField(field.ArrowField()) &&
979978
inline_blob_field_set.count(field.Name()) == 0) {
980979
continue;
981980
}

‎src/paimon/format/blob/blob_file_batch_reader.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ Status BlobFileBatchReader::SetReadSchema(::ArrowSchema* read_schema,
264264
fmt::format("read schema field number {} is not 1", arrow_schema->num_fields()));
265265
}
266266
std::shared_ptr<arrow::Field> read_field = arrow_schema->field(0);
267-
if (!BlobUtils::IsBlobFileField(read_field)) {
267+
if (!BlobUtils::IsAnyBlobField(read_field)) {
268268
return Status::Invalid(fmt::format("field {} must be BLOB, ARRAY<BLOB> or MAP<..., BLOB>",
269269
read_field->ToString()));
270270
}

‎src/paimon/format/blob/blob_stats_extractor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ BlobStatsExtractor::ExtractWithFileInfo(const std::shared_ptr<FileSystem>& file_
4646
return Status::Invalid(
4747
fmt::format("schema field number {} is not 1", write_schema_->num_fields()));
4848
}
49-
if (!BlobUtils::IsBlobFileField(write_schema_->field(0))) {
49+
if (!BlobUtils::IsAnyBlobField(write_schema_->field(0))) {
5050
return Status::Invalid(
5151
fmt::format("field {} is not a blob-file field", write_schema_->field(0)->ToString()));
5252
}

0 commit comments

Comments
 (0)