This is an automated email from the ASF dual-hosted git repository.
willayd pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-nanoarrow.git
The following commit(s) were added to refs/heads/main by this push:
new 3ba38ff0 fix: Fix ignored offset in ArrowArrayViewGetIntervalUnsafe
(#755)
3ba38ff0 is described below
commit 3ba38ff09c691cf9320895d04cf441ecb95caa99
Author: William Ayd <[email protected]>
AuthorDate: Thu May 15 14:13:19 2025 -0400
fix: Fix ignored offset in ArrowArrayViewGetIntervalUnsafe (#755)
---
src/nanoarrow/common/array_test.cc | 15 +++++++++++++++
src/nanoarrow/common/inline_array.h | 14 ++++++++------
2 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/nanoarrow/common/array_test.cc
b/src/nanoarrow/common/array_test.cc
index f8739307..cb974459 100644
--- a/src/nanoarrow/common/array_test.cc
+++ b/src/nanoarrow/common/array_test.cc
@@ -4353,6 +4353,10 @@ TEST(ArrayViewTest, ArrayViewTestGetIntervalYearMonth) {
ArrowArrayViewGetIntervalUnsafe(&array_view, 3, &interval);
EXPECT_EQ(interval.months, -42);
+ array_view.offset = 2;
+ ArrowArrayViewGetIntervalUnsafe(&array_view, 1, &interval);
+ EXPECT_EQ(interval.months, -42);
+
ArrowArrayViewReset(&array_view);
ArrowSchemaRelease(&schema);
ArrowArrayRelease(&array);
@@ -4390,6 +4394,11 @@ TEST(ArrayViewTest, ArrayViewTestGetIntervalDayTime) {
EXPECT_EQ(interval.days, -42);
EXPECT_EQ(interval.ms, -42);
+ array_view.offset = 2;
+ ArrowArrayViewGetIntervalUnsafe(&array_view, 1, &interval);
+ EXPECT_EQ(interval.days, -42);
+ EXPECT_EQ(interval.ms, -42);
+
ArrowArrayViewReset(&array_view);
ArrowSchemaRelease(&schema);
ArrowArrayRelease(&array);
@@ -4428,6 +4437,12 @@ TEST(ArrayViewTest,
ArrayViewTestGetIntervalMonthDayNano) {
EXPECT_EQ(interval.days, -12);
EXPECT_EQ(interval.ns, -42);
+ array_view.offset = 2;
+ ArrowArrayViewGetIntervalUnsafe(&array_view, 1, &interval);
+ EXPECT_EQ(interval.months, -5);
+ EXPECT_EQ(interval.days, -12);
+ EXPECT_EQ(interval.ns, -42);
+
ArrowArrayViewReset(&array_view);
ArrowSchemaRelease(&schema);
ArrowArrayRelease(&array);
diff --git a/src/nanoarrow/common/inline_array.h
b/src/nanoarrow/common/inline_array.h
index ab491c48..21eda921 100644
--- a/src/nanoarrow/common/inline_array.h
+++ b/src/nanoarrow/common/inline_array.h
@@ -1288,23 +1288,25 @@ static inline struct ArrowBufferView
ArrowArrayViewGetBytesUnsafe(
static inline void ArrowArrayViewGetIntervalUnsafe(
const struct ArrowArrayView* array_view, int64_t i, struct ArrowInterval*
out) {
const uint8_t* data_view = array_view->buffer_views[1].data.as_uint8;
+ const int64_t offset = array_view->offset;
+ const int64_t index = offset + i;
switch (array_view->storage_type) {
case NANOARROW_TYPE_INTERVAL_MONTHS: {
const size_t size = sizeof(int32_t);
- memcpy(&out->months, data_view + i * size, sizeof(int32_t));
+ memcpy(&out->months, data_view + index * size, sizeof(int32_t));
break;
}
case NANOARROW_TYPE_INTERVAL_DAY_TIME: {
const size_t size = sizeof(int32_t) + sizeof(int32_t);
- memcpy(&out->days, data_view + i * size, sizeof(int32_t));
- memcpy(&out->ms, data_view + i * size + 4, sizeof(int32_t));
+ memcpy(&out->days, data_view + index * size, sizeof(int32_t));
+ memcpy(&out->ms, data_view + index * size + 4, sizeof(int32_t));
break;
}
case NANOARROW_TYPE_INTERVAL_MONTH_DAY_NANO: {
const size_t size = sizeof(int32_t) + sizeof(int32_t) + sizeof(int64_t);
- memcpy(&out->months, data_view + i * size, sizeof(int32_t));
- memcpy(&out->days, data_view + i * size + 4, sizeof(int32_t));
- memcpy(&out->ns, data_view + i * size + 8, sizeof(int64_t));
+ memcpy(&out->months, data_view + index * size, sizeof(int32_t));
+ memcpy(&out->days, data_view + index * size + 4, sizeof(int32_t));
+ memcpy(&out->ns, data_view + index * size + 8, sizeof(int64_t));
break;
}
default:
