Skip to content
This repository was archived by the owner on Jan 20, 2023. It is now read-only.

Commit fe2591b

Browse files
ARROW-259: Use Flatbuffer Field type instead of MaterializedField
Remove MaterializedField, MajorType, RepeatedTypes Add code to convert from FlatBuf representation to Pojo also adds tests to test the conversion
1 parent 011ade7 commit fe2591b

File tree

2 files changed

+37
-1
lines changed

2 files changed

+37
-1
lines changed

format/Message.fbs

+21-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
namespace apache.arrow.flatbuf;
1+
namespace org.apache.arrow.flatbuf;
22

33
/// ----------------------------------------------------------------------
44
/// Logical types and their metadata (if any)
55
///
66
/// These are stored in the flatbuffer in the Type union below
77

8+
table Null {
9+
}
10+
811
/// A Tuple in the flatbuffer metadata is the same as an Arrow Struct
912
/// (according to the physical memory layout). We used Tuple here as Struct is
1013
/// a reserved word in Flatbuffers
@@ -45,10 +48,22 @@ table Decimal {
4548
scale: int;
4649
}
4750

51+
table Date {
52+
}
53+
54+
table Time {
55+
}
56+
4857
table Timestamp {
4958
timezone: string;
5059
}
5160

61+
table IntervalDay {
62+
}
63+
64+
table IntervalYear {
65+
}
66+
5267
table JSONScalar {
5368
dense:bool=true;
5469
}
@@ -58,13 +73,18 @@ table JSONScalar {
5873
/// add new logical types to Type without breaking backwards compatibility
5974

6075
union Type {
76+
Null,
6177
Int,
6278
FloatingPoint,
6379
Binary,
6480
Utf8,
6581
Bool,
6682
Decimal,
83+
Date,
84+
Time,
6785
Timestamp,
86+
IntervalDay,
87+
IntervalYear,
6888
List,
6989
Tuple,
7090
Union,

header

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Licensed to the Apache Software Foundation (ASF) under one
2+
or more contributor license agreements. See the NOTICE file
3+
distributed with this work for additional information
4+
regarding copyright ownership. The ASF licenses this file
5+
to you under the Apache License, Version 2.0 (the
6+
"License"); you may not use this file except in compliance
7+
with the License. You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+

0 commit comments

Comments
 (0)