This is an automated email from the ASF dual-hosted git repository.
wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new f61d739 ARROW-2944: [Format] Synchronize some metadata changes to
columnar format Markdown documents
f61d739 is described below
commit f61d7390f85fdde51cbcef78c5a60655671777c6
Author: Wes McKinney <[email protected]>
AuthorDate: Tue Jul 31 10:37:22 2018 -0400
ARROW-2944: [Format] Synchronize some metadata changes to columnar format
Markdown documents
These changes were made in 0.8 but the Markdown documents were not updated
Author: Wes McKinney <[email protected]>
Closes #2347 from wesm/ARROW-2944 and squashes the following commits:
f45d9087 <Wes McKinney> Synchronize from metadata changes to columnar
format Markdown documents
---
format/IPC.md | 4 ----
format/Metadata.md | 24 +++++++-----------------
2 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/format/IPC.md b/format/IPC.md
index 1c85323..97c1790 100644
--- a/format/IPC.md
+++ b/format/IPC.md
@@ -138,10 +138,6 @@ struct FieldNode {
}
struct Buffer {
- /// The shared memory page id where this buffer is located. Currently this is
- /// not used
- page: int;
-
/// The relative offset into the shared memory page where the bytes for this
/// buffer starts
offset: long;
diff --git a/format/Metadata.md b/format/Metadata.md
index 219df21..33d5065 100644
--- a/format/Metadata.md
+++ b/format/Metadata.md
@@ -51,15 +51,13 @@ table Field {
name: string;
nullable: bool;
type: Type;
- // present only if the field is dictionary encoded
- // will point to a dictionary provided by a DictionaryBatch message
- dictionary: long;
+
+ // Present only if the field is dictionary encoded
+ dictionary: DictionaryEncoding;
+
// children apply only to Nested data types like Struct, List and Union
children: [Field];
- /// layout of buffers produced for this type (as derived from the Type)
- /// does not include children
- /// each recordbatch will return instances of those Buffers.
- layout: [ VectorLayout ];
+
// User-defined metadata
custom_metadata: [ KeyValue ];
}
@@ -76,18 +74,9 @@ Field:
"nullable" : false,
"type" : /* Type */,
"children" : [ /* Field */ ],
- "typeLayout" : {
- "vectors" : [ /* VectorLayout */ ]
- }
-}
-```
-VectorLayout:
-```
-{
- "type" : "DATA|OFFSET|VALIDITY|TYPE",
- "typeBitWidth" : /* int */
}
```
+
Type:
```
{
@@ -95,6 +84,7 @@ Type:
// fields as defined in the Flatbuffer depending on the type name
}
```
+
Union:
```
{
