Skip to content

Commit 99e2855

Browse files
mrknwesm
mrkn
authored and
wesm
committed
ARROW-7291: [Dev] Fix FORMAT_DIR
Closes apache#5933 from mrkn/ARROW-7291 and squashes the following commits: 5293296 <Kenta Murata> The result of update-flatbuffers.sh b6d2e56 <Kenta Murata> Fix FORMAT_DIR Authored-by: Kenta Murata <mrkn@mrkn.jp> Signed-off-by: Wes McKinney <wesm+git@apache.org>
1 parent c3db096 commit 99e2855

9 files changed

Lines changed: 792 additions & 748 deletions

File tree

‎cpp/build-support/update-flatbuffers.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
CWD="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
2424
SOURCE_DIR=$CWD/../src
25-
FORMAT_DIR=$CWD/../..
25+
FORMAT_DIR=$CWD/../../format
2626

2727
flatc -c -o $SOURCE_DIR/generated \
2828
$FORMAT_DIR/Message.fbs \

‎cpp/src/generated/File_generated.h‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,17 @@ struct Footer FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
6161
VT_DICTIONARIES = 8,
6262
VT_RECORDBATCHES = 10
6363
};
64-
MetadataVersion version() const {
65-
return static_cast<MetadataVersion>(GetField<int16_t>(VT_VERSION, 0));
64+
org::apache::arrow::flatbuf::MetadataVersion version() const {
65+
return static_cast<org::apache::arrow::flatbuf::MetadataVersion>(GetField<int16_t>(VT_VERSION, 0));
6666
}
67-
const Schema *schema() const {
68-
return GetPointer<const Schema *>(VT_SCHEMA);
67+
const org::apache::arrow::flatbuf::Schema *schema() const {
68+
return GetPointer<const org::apache::arrow::flatbuf::Schema *>(VT_SCHEMA);
6969
}
70-
const flatbuffers::Vector<const Block *> *dictionaries() const {
71-
return GetPointer<const flatbuffers::Vector<const Block *> *>(VT_DICTIONARIES);
70+
const flatbuffers::Vector<const org::apache::arrow::flatbuf::Block *> *dictionaries() const {
71+
return GetPointer<const flatbuffers::Vector<const org::apache::arrow::flatbuf::Block *> *>(VT_DICTIONARIES);
7272
}
73-
const flatbuffers::Vector<const Block *> *recordBatches() const {
74-
return GetPointer<const flatbuffers::Vector<const Block *> *>(VT_RECORDBATCHES);
73+
const flatbuffers::Vector<const org::apache::arrow::flatbuf::Block *> *recordBatches() const {
74+
return GetPointer<const flatbuffers::Vector<const org::apache::arrow::flatbuf::Block *> *>(VT_RECORDBATCHES);
7575
}
7676
bool Verify(flatbuffers::Verifier &verifier) const {
7777
return VerifyTableStart(verifier) &&
@@ -89,16 +89,16 @@ struct Footer FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
8989
struct FooterBuilder {
9090
flatbuffers::FlatBufferBuilder &fbb_;
9191
flatbuffers::uoffset_t start_;
92-
void add_version(MetadataVersion version) {
92+
void add_version(org::apache::arrow::flatbuf::MetadataVersion version) {
9393
fbb_.AddElement<int16_t>(Footer::VT_VERSION, static_cast<int16_t>(version), 0);
9494
}
95-
void add_schema(flatbuffers::Offset<Schema> schema) {
95+
void add_schema(flatbuffers::Offset<org::apache::arrow::flatbuf::Schema> schema) {
9696
fbb_.AddOffset(Footer::VT_SCHEMA, schema);
9797
}
98-
void add_dictionaries(flatbuffers::Offset<flatbuffers::Vector<const Block *>> dictionaries) {
98+
void add_dictionaries(flatbuffers::Offset<flatbuffers::Vector<const org::apache::arrow::flatbuf::Block *>> dictionaries) {
9999
fbb_.AddOffset(Footer::VT_DICTIONARIES, dictionaries);
100100
}
101-
void add_recordBatches(flatbuffers::Offset<flatbuffers::Vector<const Block *>> recordBatches) {
101+
void add_recordBatches(flatbuffers::Offset<flatbuffers::Vector<const org::apache::arrow::flatbuf::Block *>> recordBatches) {
102102
fbb_.AddOffset(Footer::VT_RECORDBATCHES, recordBatches);
103103
}
104104
explicit FooterBuilder(flatbuffers::FlatBufferBuilder &_fbb)
@@ -115,10 +115,10 @@ struct FooterBuilder {
115115

116116
inline flatbuffers::Offset<Footer> CreateFooter(
117117
flatbuffers::FlatBufferBuilder &_fbb,
118-
MetadataVersion version = MetadataVersion_V1,
119-
flatbuffers::Offset<Schema> schema = 0,
120-
flatbuffers::Offset<flatbuffers::Vector<const Block *>> dictionaries = 0,
121-
flatbuffers::Offset<flatbuffers::Vector<const Block *>> recordBatches = 0) {
118+
org::apache::arrow::flatbuf::MetadataVersion version = org::apache::arrow::flatbuf::MetadataVersion_V1,
119+
flatbuffers::Offset<org::apache::arrow::flatbuf::Schema> schema = 0,
120+
flatbuffers::Offset<flatbuffers::Vector<const org::apache::arrow::flatbuf::Block *>> dictionaries = 0,
121+
flatbuffers::Offset<flatbuffers::Vector<const org::apache::arrow::flatbuf::Block *>> recordBatches = 0) {
122122
FooterBuilder builder_(_fbb);
123123
builder_.add_recordBatches(recordBatches);
124124
builder_.add_dictionaries(dictionaries);
@@ -129,12 +129,12 @@ inline flatbuffers::Offset<Footer> CreateFooter(
129129

130130
inline flatbuffers::Offset<Footer> CreateFooterDirect(
131131
flatbuffers::FlatBufferBuilder &_fbb,
132-
MetadataVersion version = MetadataVersion_V1,
133-
flatbuffers::Offset<Schema> schema = 0,
134-
const std::vector<Block> *dictionaries = nullptr,
135-
const std::vector<Block> *recordBatches = nullptr) {
136-
auto dictionaries__ = dictionaries ? _fbb.CreateVectorOfStructs<Block>(*dictionaries) : 0;
137-
auto recordBatches__ = recordBatches ? _fbb.CreateVectorOfStructs<Block>(*recordBatches) : 0;
132+
org::apache::arrow::flatbuf::MetadataVersion version = org::apache::arrow::flatbuf::MetadataVersion_V1,
133+
flatbuffers::Offset<org::apache::arrow::flatbuf::Schema> schema = 0,
134+
const std::vector<org::apache::arrow::flatbuf::Block> *dictionaries = nullptr,
135+
const std::vector<org::apache::arrow::flatbuf::Block> *recordBatches = nullptr) {
136+
auto dictionaries__ = dictionaries ? _fbb.CreateVectorOfStructs<org::apache::arrow::flatbuf::Block>(*dictionaries) : 0;
137+
auto recordBatches__ = recordBatches ? _fbb.CreateVectorOfStructs<org::apache::arrow::flatbuf::Block>(*recordBatches) : 0;
138138
return org::apache::arrow::flatbuf::CreateFooter(
139139
_fbb,
140140
version,

0 commit comments

Comments
 (0)