Skip to content

Commit

Permalink
ARROW-245: add endianness to RecordBatch
Browse files Browse the repository at this point in the history
Author: Julien Le Dem <julien@dremio.com>

Closes #113 from julienledem/arrow_245_endianness and squashes the following commits:

e4cd749 [Julien Le Dem] fix linter error
c727844 [Julien Le Dem] Fix NOTICE; typo; doc wording
88aaee3 [Julien Le Dem] move endianness to Schema
e5f7355 [Julien Le Dem] clarifying big endian support
36caf3c [Julien Le Dem] autodetect endianness
7477de1 [Julien Le Dem] update Layout.md endianness; add image source file
eea3edd [Julien Le Dem] update cpp to use the new field
9b56874 [Julien Le Dem] ARROW-245: add endianness to RecordBatch
  • Loading branch information
julienledem committed Aug 15, 2016
1 parent e8724f8 commit 689cd27
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 3 deletions.
5 changes: 5 additions & 0 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,8 @@ The Apache Software Foundation (http://www.apache.org/).
This product includes software from the SFrame project (BSD, 3-clause).
* Copyright (C) 2015 Dato, Inc.
* Copyright (c) 2009 Carnegie Mellon University.

This product includes software from the Numpy project (BSD-new)
https://github.com/numpy/numpy/blob/e1f191c46f2eebd6cb892a4bfe14d9dd43a06c4e/numpy/core/src/multiarray/multiarraymodule.c#L2910
* Copyright (c) 1995, 1996, 1997 Jim Hugunin, hugunin@mit.edu
* Copyright (c) 2005 Travis E. Oliphant oliphant@ee.byu.edu Brigham Young University
20 changes: 18 additions & 2 deletions cpp/src/arrow/ipc/metadata-internal.cc
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,17 @@ Status FieldFromFlatbuffer(const flatbuf::Field* field, std::shared_ptr<Field>*

// Implement MessageBuilder

// will return the endianness of the system we are running on
// based the NUMPY_API function. See NOTICE.txt
flatbuf::Endianness endianness() {
union {
uint32_t i;
char c[4];
} bint = {0x01020304};

return bint.c[0] == 1 ? flatbuf::Endianness_Big : flatbuf::Endianness_Little;
}

Status MessageBuilder::SetSchema(const Schema* schema) {
header_type_ = flatbuf::MessageHeader_Schema;

Expand All @@ -254,7 +265,11 @@ Status MessageBuilder::SetSchema(const Schema* schema) {
field_offsets.push_back(offset);
}

header_ = flatbuf::CreateSchema(fbb_, fbb_.CreateVector(field_offsets)).Union();
header_ = flatbuf::CreateSchema(
fbb_,
endianness(),
fbb_.CreateVector(field_offsets))
.Union();
body_length_ = 0;
return Status::OK();
}
Expand All @@ -263,7 +278,8 @@ Status MessageBuilder::SetRecordBatch(int32_t length, int64_t body_length,
const std::vector<flatbuf::FieldNode>& nodes,
const std::vector<flatbuf::Buffer>& buffers) {
header_type_ = flatbuf::MessageHeader_RecordBatch;
header_ = flatbuf::CreateRecordBatch(fbb_, length, fbb_.CreateVectorOfStructs(nodes),
header_ = flatbuf::CreateRecordBatch(fbb_, length,
fbb_.CreateVectorOfStructs(nodes),
fbb_.CreateVectorOfStructs(buffers))
.Union();
body_length_ = body_length;
Expand Down
Binary file added format/Arrow.graffle
Binary file not shown.
Binary file added format/Arrow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 8 additions & 1 deletion format/Layout.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,14 @@ Base requirements

## Byte Order ([Endianness][3])

The Arrow format is little endian.
The Arrow format is little endian by default.
The Schema metadata has an endianness field indicating endianness of RecordBatches.
Typically this is the endianness of the system where the RecordBatch was generated.
The main use case is exchanging RecordBatches between systems with the same Endianness.
At first we will return an error when trying to read a Schema with an endianness
that does not match the underlying system. The reference implementation is focused on
Little Endian and provides tests for it. Eventually we may provide automatic conversion
via byte swapping.

## Alignment and Padding

Expand Down
11 changes: 11 additions & 0 deletions format/Message.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,21 @@ table Field {
children: [Field];
}

/// ----------------------------------------------------------------------
/// Endianness of the platform that produces the RecordBatch

enum Endianness:int { Little, Big }

/// ----------------------------------------------------------------------
/// A Schema describes the columns in a row batch

table Schema {

/// endianness of the buffer
/// it is Little Endian by default
/// if endianness doesn't match the underlying system then the vectors need to be converted
endianness: Endianness=Little;

fields: [Field];
}

Expand Down

0 comments on commit 689cd27

Please sign in to comment.