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
6 changes: 3 additions & 3 deletions src/nanoarrow/hpp/view.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ class ViewArrayAsBytes {
using const_iterator = typename internal::RandomAccessRange<Get>::const_iterator;
const_iterator begin() const { return range_.begin(); }
const_iterator end() const { return range_.end(); }
value_type operator[](int64_t i) const { return range_.get(i); }
value_type operator[](int64_t i) const { return range_.get(range_.offset + i); }
};

class ViewBinaryViewArrayAsBytes {
Expand Down Expand Up @@ -287,7 +287,7 @@ class ViewBinaryViewArrayAsBytes {
using const_iterator = typename internal::RandomAccessRange<Get>::const_iterator;
const_iterator begin() const { return range_.begin(); }
const_iterator end() const { return range_.end(); }
value_type operator[](int64_t i) const { return range_.get(i); }
value_type operator[](int64_t i) const { return range_.get(range_.offset + i); }
};

/// \brief A range-for compatible wrapper for ArrowArray of fixed size binary
Expand Down Expand Up @@ -338,7 +338,7 @@ class ViewArrayAsFixedSizeBytes {
using const_iterator = typename internal::RandomAccessRange<Get>::const_iterator;
const_iterator begin() const { return range_.begin(); }
const_iterator end() const { return range_.end(); }
value_type operator[](int64_t i) const { return range_.get(i); }
value_type operator[](int64_t i) const { return range_.get(range_.offset + i); }
};

/// \brief A range-for compatible wrapper for ArrowArrayStream
Expand Down
96 changes: 96 additions & 0 deletions src/nanoarrow/hpp/view_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -315,3 +315,99 @@ TEST(NanoarrowHppTest, NanoarrowHppViewArrayAsFixedSizeBytesOffsetTest) {
EXPECT_THAT(nanoarrow::ViewArrayAsFixedSizeBytes(array_view.get(), FixedSize),
testing::ElementsAre("baz"_asv, "qux"_asv));
}

TEST(NanoarrowHppTest, NanoarrowHppViewArrayAsBytesSubscriptOffsetTest) {
using namespace nanoarrow::literals;

nanoarrow::UniqueSchema schema{};
ArrowSchemaInit(schema.get());
ASSERT_EQ(ArrowSchemaSetType(schema.get(), NANOARROW_TYPE_STRING), NANOARROW_OK);

nanoarrow::UniqueArray array{};
ASSERT_EQ(ArrowArrayInitFromSchema(array.get(), schema.get(), nullptr), NANOARROW_OK);
ASSERT_EQ(ArrowArrayStartAppending(array.get()), NANOARROW_OK);
ASSERT_EQ(ArrowArrayAppendString(array.get(), "foo"_asv), NANOARROW_OK);
ASSERT_EQ(ArrowArrayAppendString(array.get(), "bar"_asv), NANOARROW_OK);
ASSERT_EQ(ArrowArrayAppendString(array.get(), "baz"_asv), NANOARROW_OK);
ASSERT_EQ(ArrowArrayAppendString(array.get(), "qux"_asv), NANOARROW_OK);
ASSERT_EQ(ArrowArrayFinishBuildingDefault(array.get(), nullptr), NANOARROW_OK);
array->offset = 2;
array->length = 2;

nanoarrow::ViewArrayAsBytes<32> view(array.get());
EXPECT_EQ(*view[0], "baz"_asv);
EXPECT_EQ(*view[1], "qux"_asv);

nanoarrow::UniqueArrayView array_view{};
ASSERT_EQ(ArrowArrayViewInitFromSchema(array_view.get(), schema.get(), nullptr),
NANOARROW_OK);
ASSERT_EQ(ArrowArrayViewSetArray(array_view.get(), array.get(), nullptr), NANOARROW_OK);

nanoarrow::ViewArrayAsBytes<32> view_from_array_view(array_view.get());
EXPECT_EQ(*view_from_array_view[0], "baz"_asv);
EXPECT_EQ(*view_from_array_view[1], "qux"_asv);
}

TEST(NanoarrowHppTest, NanoarrowHppViewArrayAsFixedSizeBytesSubscriptOffsetTest) {
using namespace nanoarrow::literals;

constexpr int32_t FixedSize = 3;
nanoarrow::UniqueSchema schema{};
ArrowSchemaInit(schema.get());
ASSERT_EQ(ArrowSchemaSetTypeFixedSize(schema.get(), NANOARROW_TYPE_FIXED_SIZE_BINARY,
FixedSize),
NANOARROW_OK);

nanoarrow::UniqueArray array{};
ASSERT_EQ(ArrowArrayInitFromSchema(array.get(), schema.get(), nullptr), NANOARROW_OK);
ASSERT_EQ(ArrowArrayStartAppending(array.get()), NANOARROW_OK);
ASSERT_EQ(ArrowArrayAppendBytes(array.get(), {{"foo"}, FixedSize}), NANOARROW_OK);
ASSERT_EQ(ArrowArrayAppendBytes(array.get(), {{"bar"}, FixedSize}), NANOARROW_OK);
ASSERT_EQ(ArrowArrayAppendBytes(array.get(), {{"baz"}, FixedSize}), NANOARROW_OK);
ASSERT_EQ(ArrowArrayAppendBytes(array.get(), {{"qux"}, FixedSize}), NANOARROW_OK);
ASSERT_EQ(ArrowArrayFinishBuildingDefault(array.get(), nullptr), NANOARROW_OK);
array->offset = 2;
array->length = 2;

nanoarrow::ViewArrayAsFixedSizeBytes view(array.get(), FixedSize);
EXPECT_EQ(*view[0], "baz"_asv);
EXPECT_EQ(*view[1], "qux"_asv);

nanoarrow::UniqueArrayView array_view{};
ASSERT_EQ(ArrowArrayViewInitFromSchema(array_view.get(), schema.get(), nullptr),
NANOARROW_OK);
ASSERT_EQ(ArrowArrayViewSetArray(array_view.get(), array.get(), nullptr), NANOARROW_OK);

nanoarrow::ViewArrayAsFixedSizeBytes view_from_array_view(array_view.get(), FixedSize);
EXPECT_EQ(*view_from_array_view[0], "baz"_asv);
EXPECT_EQ(*view_from_array_view[1], "qux"_asv);
}

TEST(NanoarrowHppTest, NanoarrowHppViewBinaryViewArrayAsBytesSubscriptOffsetTest) {
using namespace nanoarrow::literals;

nanoarrow::UniqueArray array{};
ASSERT_EQ(ArrowArrayInitFromType(array.get(), NANOARROW_TYPE_STRING_VIEW),
NANOARROW_OK);
ASSERT_EQ(ArrowArrayStartAppending(array.get()), NANOARROW_OK);
ASSERT_EQ(ArrowArrayAppendString(array.get(), "foo"_asv), NANOARROW_OK);
ASSERT_EQ(ArrowArrayAppendString(array.get(), "bar"_asv), NANOARROW_OK);
ASSERT_EQ(ArrowArrayAppendString(array.get(), "this_string_is_longer_than_inline"_asv),
NANOARROW_OK);
ASSERT_EQ(ArrowArrayAppendString(array.get(), "qux"_asv), NANOARROW_OK);
ASSERT_EQ(ArrowArrayFinishBuildingDefault(array.get(), nullptr), NANOARROW_OK);
array->offset = 2;
array->length = 2;

nanoarrow::ViewBinaryViewArrayAsBytes view(array.get());
EXPECT_EQ(*view[0], "this_string_is_longer_than_inline"_asv);
EXPECT_EQ(*view[1], "qux"_asv);

nanoarrow::UniqueArrayView array_view{};
ArrowArrayViewInitFromType(array_view.get(), NANOARROW_TYPE_STRING_VIEW);
ASSERT_EQ(ArrowArrayViewSetArray(array_view.get(), array.get(), nullptr), NANOARROW_OK);

nanoarrow::ViewBinaryViewArrayAsBytes view_from_array_view(array_view.get());
EXPECT_EQ(*view_from_array_view[0], "this_string_is_longer_than_inline"_asv);
EXPECT_EQ(*view_from_array_view[1], "qux"_asv);
}
Loading