From 102bf401e01c7a99778675a5a4fe3938561cc016 Mon Sep 17 00:00:00 2001 From: Wes McKinney Date: Fri, 20 Mar 2020 16:41:42 -0500 Subject: [PATCH] Update to Flatbuffers 1.12.0 --- cpp/src/arrow/ipc/metadata_internal.cc | 23 +- cpp/src/generated/File_generated.h | 59 +- cpp/src/generated/Message_generated.h | 129 ++-- cpp/src/generated/Schema_generated.h | 489 +++++++------ cpp/src/generated/SparseTensor_generated.h | 275 +++---- cpp/src/generated/Tensor_generated.h | 166 +++-- cpp/src/generated/feather_generated.h | 157 ++-- cpp/src/plasma/common_generated.h | 25 +- cpp/src/plasma/plasma_generated.h | 689 ++++++++++-------- .../flatbuffers/include/flatbuffers/base.h | 43 +- .../include/flatbuffers/flatbuffers.h | 392 +++++++--- .../include/flatbuffers/stl_emulation.h | 36 +- 12 files changed, 1465 insertions(+), 1018 deletions(-) diff --git a/cpp/src/arrow/ipc/metadata_internal.cc b/cpp/src/arrow/ipc/metadata_internal.cc index 94bb6cbd839..b9c960b90aa 100644 --- a/cpp/src/arrow/ipc/metadata_internal.cc +++ b/cpp/src/arrow/ipc/metadata_internal.cc @@ -677,8 +677,7 @@ class FieldToFlatbufferVisitor { type_ids.push_back(code); } - auto fb_type_ids = - fbb_.CreateVector(util::MakeNonNull(type_ids.data()), type_ids.size()); + auto fb_type_ids = fbb_.CreateVector(type_ids.data(), type_ids.size()); type_offset_ = flatbuf::CreateUnion(fbb_, mode, fb_type_ids).Union(); return Status::OK(); @@ -701,8 +700,7 @@ class FieldToFlatbufferVisitor { Status GetResult(const std::shared_ptr& field, FieldOffset* offset) { auto fb_name = fbb_.CreateString(field->name()); RETURN_NOT_OK(VisitType(*field->type())); - auto fb_children = - fbb_.CreateVector(util::MakeNonNull(children_.data()), children_.size()); + auto fb_children = fbb_.CreateVector(children_.data(), children_.size()); DictionaryOffset dictionary = 0; if (field->type()->id() == Type::DICTIONARY) { @@ -855,7 +853,7 @@ static Status WriteFieldNodes(FBB& fbb, const std::vector& nodes, } fb_nodes.emplace_back(node.length, node.null_count); } - *out = fbb.CreateVectorOfStructs(util::MakeNonNull(fb_nodes.data()), fb_nodes.size()); + *out = fbb.CreateVectorOfStructs(fb_nodes.data(), fb_nodes.size()); return Status::OK(); } @@ -868,8 +866,7 @@ static Status WriteBuffers(FBB& fbb, const std::vector& buffers, const BufferMetadata& buffer = buffers[i]; fb_buffers.emplace_back(buffer.offset, buffer.length); } - *out = - fbb.CreateVectorOfStructs(util::MakeNonNull(fb_buffers.data()), fb_buffers.size()); + *out = fbb.CreateVectorOfStructs(fb_buffers.data(), fb_buffers.size()); return Status::OK(); } @@ -900,9 +897,8 @@ Status MakeSparseTensorIndexCOO(FBB& fbb, const SparseCOOIndex& sparse_index, auto indices_type_offset = flatbuf::CreateInt(fbb, index_value_type.bit_width(), index_value_type.is_signed()); - auto fb_strides = - fbb.CreateVector(util::MakeNonNull(sparse_index.indices()->strides().data()), - sparse_index.indices()->strides().size()); + auto fb_strides = fbb.CreateVector(sparse_index.indices()->strides().data(), + sparse_index.indices()->strides().size()); const BufferMetadata& indices_metadata = buffers[0]; flatbuf::Buffer indices(indices_metadata.offset, indices_metadata.length); @@ -1072,11 +1068,10 @@ Result> WriteTensorMessage(const Tensor& tensor, dims.push_back(flatbuf::CreateTensorDim(fbb, tensor.shape()[i], name)); } - auto fb_shape = fbb.CreateVector(util::MakeNonNull(dims.data()), dims.size()); + auto fb_shape = fbb.CreateVector(dims.data(), dims.size()); flatbuffers::Offset> fb_strides; - fb_strides = fbb.CreateVector(util::MakeNonNull(tensor.strides().data()), - tensor.strides().size()); + fb_strides = fbb.CreateVector(tensor.strides().data(), tensor.strides().size()); int64_t body_length = tensor.size() * elem_size; flatbuf::Buffer buffer(buffer_start_offset, body_length); @@ -1119,7 +1114,7 @@ FileBlocksToFlatbuffer(FBB& fbb, const std::vector& blocks) { fb_blocks.emplace_back(block.offset, block.metadata_length, block.body_length); } - return fbb.CreateVectorOfStructs(util::MakeNonNull(fb_blocks.data()), fb_blocks.size()); + return fbb.CreateVectorOfStructs(fb_blocks.data(), fb_blocks.size()); } Status WriteFileFooter(const Schema& schema, const std::vector& dictionaries, diff --git a/cpp/src/generated/File_generated.h b/cpp/src/generated/File_generated.h index e1bc329ebf7..aadfbcfb175 100644 --- a/cpp/src/generated/File_generated.h +++ b/cpp/src/generated/File_generated.h @@ -14,6 +14,7 @@ namespace arrow { namespace flatbuf { struct Footer; +struct FooterBuilder; struct Block; @@ -55,6 +56,7 @@ FLATBUFFERS_STRUCT_END(Block, 24); /// Arrow File metadata /// struct Footer FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { + typedef FooterBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_VERSION = 4, VT_SCHEMA = 6, @@ -62,21 +64,21 @@ struct Footer FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_RECORDBATCHES = 10, VT_CUSTOM_METADATA = 12 }; - MetadataVersion version() const { - return static_cast(GetField(VT_VERSION, 0)); + org::apache::arrow::flatbuf::MetadataVersion version() const { + return static_cast(GetField(VT_VERSION, 0)); } - const Schema *schema() const { - return GetPointer(VT_SCHEMA); + const org::apache::arrow::flatbuf::Schema *schema() const { + return GetPointer(VT_SCHEMA); } - const flatbuffers::Vector *dictionaries() const { - return GetPointer *>(VT_DICTIONARIES); + const flatbuffers::Vector *dictionaries() const { + return GetPointer *>(VT_DICTIONARIES); } - const flatbuffers::Vector *recordBatches() const { - return GetPointer *>(VT_RECORDBATCHES); + const flatbuffers::Vector *recordBatches() const { + return GetPointer *>(VT_RECORDBATCHES); } /// User-defined metadata - const flatbuffers::Vector> *custom_metadata() const { - return GetPointer> *>(VT_CUSTOM_METADATA); + const flatbuffers::Vector> *custom_metadata() const { + return GetPointer> *>(VT_CUSTOM_METADATA); } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && @@ -95,21 +97,22 @@ struct Footer FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { }; struct FooterBuilder { + typedef Footer Table; flatbuffers::FlatBufferBuilder &fbb_; flatbuffers::uoffset_t start_; - void add_version(MetadataVersion version) { + void add_version(org::apache::arrow::flatbuf::MetadataVersion version) { fbb_.AddElement(Footer::VT_VERSION, static_cast(version), 0); } - void add_schema(flatbuffers::Offset schema) { + void add_schema(flatbuffers::Offset schema) { fbb_.AddOffset(Footer::VT_SCHEMA, schema); } - void add_dictionaries(flatbuffers::Offset> dictionaries) { + void add_dictionaries(flatbuffers::Offset> dictionaries) { fbb_.AddOffset(Footer::VT_DICTIONARIES, dictionaries); } - void add_recordBatches(flatbuffers::Offset> recordBatches) { + void add_recordBatches(flatbuffers::Offset> recordBatches) { fbb_.AddOffset(Footer::VT_RECORDBATCHES, recordBatches); } - void add_custom_metadata(flatbuffers::Offset>> custom_metadata) { + void add_custom_metadata(flatbuffers::Offset>> custom_metadata) { fbb_.AddOffset(Footer::VT_CUSTOM_METADATA, custom_metadata); } explicit FooterBuilder(flatbuffers::FlatBufferBuilder &_fbb) @@ -126,11 +129,11 @@ struct FooterBuilder { inline flatbuffers::Offset