From e5e2aab5e426ffd3a9b2a4d4535169eb6d9c7b04 Mon Sep 17 00:00:00 2001 From: Philipp Moritz Date: Tue, 9 May 2017 13:58:42 -0700 Subject: [PATCH] upgrade arrow and fix bug (#530) * upgrade arrow and fix bug * fixes suggested by Wes --- src/numbuf/cpp/src/numbuf/sequence.cc | 6 ++++-- src/numbuf/thirdparty/download_thirdparty.sh | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/numbuf/cpp/src/numbuf/sequence.cc b/src/numbuf/cpp/src/numbuf/sequence.cc index f77654a24..56019a3a7 100644 --- a/src/numbuf/cpp/src/numbuf/sequence.cc +++ b/src/numbuf/cpp/src/numbuf/sequence.cc @@ -110,8 +110,10 @@ Status SequenceBuilder::AppendDict(int32_t size) { auto lists = std::vector>({list_builder}); \ StructBuilder builder(pool_, type, lists); \ OFFSETS.pop_back(); \ - ARROW_CHECK_OK(list_builder->Append(OFFSETS.data(), OFFSETS.size())); \ - builder.Append(); \ + RETURN_NOT_OK(list_builder->Append(OFFSETS.data(), OFFSETS.size())); \ + for (int i = 0; i < list_builder->length(); ++i) { \ + RETURN_NOT_OK(builder.Append()); \ + } \ ADD_ELEMENT(builder, TAG); \ type_ids.push_back(TAG); \ } else { \ diff --git a/src/numbuf/thirdparty/download_thirdparty.sh b/src/numbuf/thirdparty/download_thirdparty.sh index ab23b57db..183398241 100755 --- a/src/numbuf/thirdparty/download_thirdparty.sh +++ b/src/numbuf/thirdparty/download_thirdparty.sh @@ -11,4 +11,4 @@ if [ ! -d $TP_DIR/arrow ]; then git clone https://github.com/apache/arrow/ "$TP_DIR/arrow" fi cd $TP_DIR/arrow -git checkout 30e03a90718971c2a1d773145fb042d0c2857036 +git checkout 670612e6fdf699486641ed0d39d22257eb8acdb2