Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/r-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:
matrix:
config:
- {os: macOS-latest, r: 'release'}
- {os: windows-latest, r: '4.1'}
- {os: windows-latest, r: '4.2'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
Expand Down
17 changes: 15 additions & 2 deletions dev/update_fbs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
# specific language governing permissions and limitations
# under the License.

REPO=`git rev-parse --show-toplevel`
if [ -z "$REPO" ]; then
exit 1
fi

# get the .fbs files from the arrow repo
mkdir -p format && cd format

Expand All @@ -24,8 +29,16 @@ curl -L https://github.com/apache/arrow/raw/main/format/SparseTensor.fbs --outpu
curl -L https://github.com/apache/arrow/raw/main/format/Message.fbs --output Message.fbs
curl -L https://github.com/apache/arrow/raw/main/format/File.fbs --output File.fbs

# compile using flatcc
flatcc --common --reader --builder --verifier --recursive --outfile ../../src/nanoarrow/ipc/flatcc_generated.h *.fbs
# Download and build flatcc. Use the same version we vendor.
git clone https://github.com/dvidelabs/flatcc.git
git -C flatcc checkout e3e44836c5f625b5532586ddce895f8b5e36a212

pushd flatcc
cmake . && cmake --build .
popd

GENERATED="${REPO}/src/nanoarrow/ipc/flatcc_generated.h"
flatcc/bin/flatcc --common --reader --builder --verifier --recursive --outfile "${GENERATED}" *.fbs

# clean up
cd ..
Expand Down
7 changes: 6 additions & 1 deletion dev/update_vendored_flatcc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ fi

# Download flatcc
git clone https://github.com/dvidelabs/flatcc.git
git -C flatcc checkout bf4f67a16d85541e474f1d67b8fb64913ba72bc7
git -C flatcc checkout e3e44836c5f625b5532586ddce895f8b5e36a212

# Remove previous vendored flatcc
rm -rf $REPO/thirdparty/flatcc
Expand All @@ -45,6 +45,11 @@ cp flatcc/src/runtime/emitter.c \
# This list is in topological order and could be used for a single-file include;
# however, this approach is easier to support alongside a previous installation
# of the flatcc runtime.
if ! command -v makedepend > /dev/null 2>&1 ; then
echo "update_vendored_flatccc.sh requires makedepend (e.g., brew install makedepend)"
exit 1
fi

makedepend -s#: -f- -- -Iflatcc/include -I$REPO/src -DFLATCC_PORTABLE -- 2>/dev/null \
`ls $REPO/thirdparty/flatcc/src/runtime/*.c` `ls $REPO/src/nanoarrow/ipc/*.c` | \
# Remove the '<src file>.o: ' prefix
Expand Down
44 changes: 43 additions & 1 deletion src/nanoarrow/ipc/decoder.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,50 @@ struct ArrowIpcDecoderPrivate {
};

ArrowErrorCode ArrowIpcCheckRuntime(struct ArrowError* error) {
// Avoids an unused warning when bundling the header into nanoarrow_ipc.c
// Avoids unused warnings when bundling the header into nanoarrow_ipc.c
NANOARROW_UNUSED(flatbuffers_end);
NANOARROW_UNUSED(flatcc_builder_is_nested);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_Null_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_Struct__required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_List_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_LargeList_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_ListView_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_LargeListView_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_FixedSizeList_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_Map_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_Union_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_Int_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_FloatingPoint_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_Utf8_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_Binary_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_LargeUtf8_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_LargeBinary_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_Utf8View_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_BinaryView_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_FixedSizeBinary_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_Bool_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_RunEndEncoded_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_Decimal_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_Date_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_Time_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_Timestamp_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_Interval_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_Duration_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_KeyValue_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_DictionaryEncoding_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_Field_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_Schema_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_Footer_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_TensorDim_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_Tensor_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_SparseTensorIndexCOO_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_SparseMatrixIndexCSX_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_SparseTensorIndexCSF_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_SparseTensor_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_BodyCompression_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_RecordBatch_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_DictionaryBatch_required);
NANOARROW_UNUSED(__org_apache_arrow_flatbuf_Message_required);

const char* nanoarrow_runtime_version = ArrowNanoarrowVersion();
const char* nanoarrow_ipc_build_time_version = NANOARROW_VERSION;
Expand Down
Loading
Loading