Skip to content

Commit 36e9be7

Browse files
WillAydWillAyd
committed
GH-45694: [C++] Bump vendored flatbuffers to 24.3.6
1 parent c124bb5 commit 36e9be7

19 files changed

+814
-774
lines changed

‎cpp/src/arrow/ipc/feather.cc

+39-37
Original file line numberDiff line numberDiff line change
@@ -190,17 +190,18 @@ class ReaderV1 : public Reader {
190190
break;
191191

192192
switch (metadata_type) {
193-
case fbs::TypeMetadata::CategoryMetadata: {
193+
case fbs::TypeMetadata::TypeMetadata_CategoryMetadata: {
194194
auto meta = static_cast<const fbs::CategoryMetadata*>(metadata);
195195

196196
std::shared_ptr<DataType> index_type, dict_type;
197-
RETURN_NOT_OK(GetDataType(values, fbs::TypeMetadata::NONE, nullptr, &index_type));
198-
RETURN_NOT_OK(
199-
GetDataType(meta->levels(), fbs::TypeMetadata::NONE, nullptr, &dict_type));
197+
RETURN_NOT_OK(GetDataType(values, fbs::TypeMetadata::TypeMetadata_NONE, nullptr,
198+
&index_type));
199+
RETURN_NOT_OK(GetDataType(meta->levels(), fbs::TypeMetadata::TypeMetadata_NONE,
200+
nullptr, &dict_type));
200201
*out = dictionary(index_type, dict_type, meta->ordered());
201202
break;
202203
}
203-
case fbs::TypeMetadata::TimestampMetadata: {
204+
case fbs::TypeMetadata::TypeMetadata_TimestampMetadata: {
204205
auto meta = static_cast<const fbs::TimestampMetadata*>(metadata);
205206
TimeUnit::type unit = FromFlatbufferEnum(meta->unit());
206207
std::string tz;
@@ -212,30 +213,30 @@ class ReaderV1 : public Reader {
212213
}
213214
*out = timestamp(unit, tz);
214215
} break;
215-
case fbs::TypeMetadata::DateMetadata:
216+
case fbs::TypeMetadata::TypeMetadata_DateMetadata:
216217
*out = date32();
217218
break;
218-
case fbs::TypeMetadata::TimeMetadata: {
219+
case fbs::TypeMetadata::TypeMetadata_TimeMetadata: {
219220
auto meta = static_cast<const fbs::TimeMetadata*>(metadata);
220221
*out = time32(FromFlatbufferEnum(meta->unit()));
221222
} break;
222223
default:
223224
switch (values->type()) {
224-
PRIMITIVE_CASE(BOOL, boolean);
225-
PRIMITIVE_CASE(INT8, int8);
226-
PRIMITIVE_CASE(INT16, int16);
227-
PRIMITIVE_CASE(INT32, int32);
228-
PRIMITIVE_CASE(INT64, int64);
229-
PRIMITIVE_CASE(UINT8, uint8);
230-
PRIMITIVE_CASE(UINT16, uint16);
231-
PRIMITIVE_CASE(UINT32, uint32);
232-
PRIMITIVE_CASE(UINT64, uint64);
233-
PRIMITIVE_CASE(FLOAT, float32);
234-
PRIMITIVE_CASE(DOUBLE, float64);
235-
PRIMITIVE_CASE(UTF8, utf8);
236-
PRIMITIVE_CASE(BINARY, binary);
237-
PRIMITIVE_CASE(LARGE_UTF8, large_utf8);
238-
PRIMITIVE_CASE(LARGE_BINARY, large_binary);
225+
PRIMITIVE_CASE(Type_BOOL, boolean);
226+
PRIMITIVE_CASE(Type_INT8, int8);
227+
PRIMITIVE_CASE(Type_INT16, int16);
228+
PRIMITIVE_CASE(Type_INT32, int32);
229+
PRIMITIVE_CASE(Type_INT64, int64);
230+
PRIMITIVE_CASE(Type_UINT8, uint8);
231+
PRIMITIVE_CASE(Type_UINT16, uint16);
232+
PRIMITIVE_CASE(Type_UINT32, uint32);
233+
PRIMITIVE_CASE(Type_UINT64, uint64);
234+
PRIMITIVE_CASE(Type_FLOAT, float32);
235+
PRIMITIVE_CASE(Type_DOUBLE, float64);
236+
PRIMITIVE_CASE(Type_UTF8, utf8);
237+
PRIMITIVE_CASE(Type_BINARY, binary);
238+
PRIMITIVE_CASE(Type_LARGE_UTF8, large_utf8);
239+
PRIMITIVE_CASE(Type_LARGE_BINARY, large_binary);
239240
default:
240241
return Status::Invalid("Unrecognized type");
241242
}
@@ -316,7 +317,7 @@ class ReaderV1 : public Reader {
316317
checked_cast<const DictionaryType&>(*schema_->field(field_index)->type());
317318

318319
return LoadValues(dict_type.value_type(), dict_meta->levels(),
319-
fbs::TypeMetadata::NONE, nullptr, out);
320+
fbs::TypeMetadata::TypeMetadata_NONE, nullptr, out);
320321
}
321322

322323
Status GetColumn(int field_index, std::shared_ptr<ChunkedArray>* out) {
@@ -403,7 +404,7 @@ struct ArrayMetadata {
403404

404405
#define TO_FLATBUFFER_CASE(TYPE) \
405406
case Type::TYPE: \
406-
return fbs::Type::TYPE;
407+
return fbs::Type::Type_##TYPE;
407408

408409
Result<fbs::Type> ToFlatbufferType(const DataType& type) {
409410
switch (type.id()) {
@@ -421,17 +422,17 @@ Result<fbs::Type> ToFlatbufferType(const DataType& type) {
421422
TO_FLATBUFFER_CASE(LARGE_BINARY);
422423
TO_FLATBUFFER_CASE(BINARY);
423424
case Type::STRING:
424-
return fbs::Type::UTF8;
425+
return fbs::Type::Type_UTF8;
425426
case Type::LARGE_STRING:
426-
return fbs::Type::LARGE_UTF8;
427+
return fbs::Type::Type_LARGE_UTF8;
427428
case Type::DATE32:
428-
return fbs::Type::INT32;
429+
return fbs::Type::Type_INT32;
429430
case Type::TIMESTAMP:
430-
return fbs::Type::INT64;
431+
return fbs::Type::Type_INT64;
431432
case Type::TIME32:
432-
return fbs::Type::INT32;
433+
return fbs::Type::Type_INT32;
433434
case Type::TIME64:
434-
return fbs::Type::INT64;
435+
return fbs::Type::Type_INT64;
435436
default:
436437
return Status::TypeError("Unsupported Feather V1 type: ", type.ToString(),
437438
". Use V2 format to serialize all Arrow types.");
@@ -440,8 +441,9 @@ Result<fbs::Type> ToFlatbufferType(const DataType& type) {
440441

441442
inline flatbuffers::Offset<fbs::PrimitiveArray> GetPrimitiveArray(
442443
FBB& fbb, const ArrayMetadata& array) {
443-
return fbs::CreatePrimitiveArray(fbb, array.type, fbs::Encoding::PLAIN, array.offset,
444-
array.length, array.null_count, array.total_bytes);
444+
return fbs::CreatePrimitiveArray(fbb, array.type, fbs::Encoding::Encoding_PLAIN,
445+
array.offset, array.length, array.null_count,
446+
array.total_bytes);
445447
}
446448

447449
// Convert Feather enums to Flatbuffer enums
@@ -450,11 +452,11 @@ inline fbs::TimeUnit ToFlatbufferEnum(TimeUnit::type unit) {
450452
}
451453

452454
const fbs::TypeMetadata COLUMN_TYPE_ENUM_MAPPING[] = {
453-
fbs::TypeMetadata::NONE, // PRIMITIVE
454-
fbs::TypeMetadata::CategoryMetadata, // CATEGORY
455-
fbs::TypeMetadata::TimestampMetadata, // TIMESTAMP
456-
fbs::TypeMetadata::DateMetadata, // DATE
457-
fbs::TypeMetadata::TimeMetadata // TIME
455+
fbs::TypeMetadata::TypeMetadata_NONE, // PRIMITIVE
456+
fbs::TypeMetadata::TypeMetadata_CategoryMetadata, // CATEGORY
457+
fbs::TypeMetadata::TypeMetadata_TimestampMetadata, // TIMESTAMP
458+
fbs::TypeMetadata::TypeMetadata_DateMetadata, // DATE
459+
fbs::TypeMetadata::TypeMetadata_TimeMetadata // TIME
458460
};
459461

460462
inline fbs::TypeMetadata ToFlatbufferEnum(ColumnType::type column_type) {

‎cpp/src/arrow/ipc/message.cc

+6-6
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class Message::MessageImpl {
6262
return Status::Invalid("Old metadata version not supported");
6363
}
6464

65-
if (message_->version() > flatbuf::MetadataVersion::MAX) {
65+
if (message_->version() > flatbuf::MetadataVersion::MetadataVersion_MAX) {
6666
return Status::Invalid("Unsupported future MetadataVersion: ",
6767
static_cast<int16_t>(message_->version()));
6868
}
@@ -79,15 +79,15 @@ class Message::MessageImpl {
7979

8080
MessageType type() const {
8181
switch (message_->header_type()) {
82-
case flatbuf::MessageHeader::Schema:
82+
case flatbuf::MessageHeader::MessageHeader_Schema:
8383
return MessageType::SCHEMA;
84-
case flatbuf::MessageHeader::DictionaryBatch:
84+
case flatbuf::MessageHeader::MessageHeader_DictionaryBatch:
8585
return MessageType::DICTIONARY_BATCH;
86-
case flatbuf::MessageHeader::RecordBatch:
86+
case flatbuf::MessageHeader::MessageHeader_RecordBatch:
8787
return MessageType::RECORD_BATCH;
88-
case flatbuf::MessageHeader::Tensor:
88+
case flatbuf::MessageHeader::MessageHeader_Tensor:
8989
return MessageType::TENSOR;
90-
case flatbuf::MessageHeader::SparseTensor:
90+
case flatbuf::MessageHeader::MessageHeader_SparseTensor:
9191
return MessageType::SPARSE_TENSOR;
9292
default:
9393
return MessageType::NONE;

0 commit comments

Comments
 (0)