Skip to content
Open
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
85 changes: 85 additions & 0 deletions cpp/src/arrow/array/array_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4506,6 +4506,91 @@ TEST_F(TestHalfFloatBuilder, TestBulkAppend) {
}
}

TEST_F(TestArray, ArangeInvalidInputs) {
// step == 0 is always invalid
ASSERT_RAISES(Invalid, Arange(0, 10, 0, pool_));

// Byte count overflows uint64 (size = 2^63 - 1)
ASSERT_RAISES(Invalid, Arange(0, INT64_MAX, 1, pool_));

// Byte count fits uint64 but exceeds INT64_MAX (size = 2^60 + 8)
ASSERT_RAISES(Invalid, Arange(0, (1LL << 60) + 8, 1, pool_));

// Negative step over the full domain (range = 2^64 - 1)
ASSERT_RAISES(Invalid, Arange(INT64_MAX, INT64_MIN, -1, pool_));
}

TEST_F(TestArray, ArangeBasicPositiveStep) {
auto expected = ArrayFromJSON(int64(), "[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]");
ASSERT_OK_AND_ASSIGN(auto result, Arange(0, 10, 1, pool_));
ASSERT_ARRAYS_EQUAL(*expected, *result);

expected = ArrayFromJSON(int64(), "[0, 3, 6, 9]");
ASSERT_OK_AND_ASSIGN(result, Arange(0, 10, 3, pool_));
ASSERT_ARRAYS_EQUAL(*expected, *result);

expected = ArrayFromJSON(int64(), "[-5, -3, -1, 1, 3]");
ASSERT_OK_AND_ASSIGN(result, Arange(-5, 5, 2, pool_));
ASSERT_ARRAYS_EQUAL(*expected, *result);
}

TEST_F(TestArray, ArangeBasicNegativeStep) {
auto expected = ArrayFromJSON(int64(), "[10, 9, 8, 7, 6, 5, 4, 3, 2, 1]");
ASSERT_OK_AND_ASSIGN(auto result, Arange(10, 0, -1, pool_));
ASSERT_ARRAYS_EQUAL(*expected, *result);

expected = ArrayFromJSON(int64(), "[10, 7, 4, 1]");
ASSERT_OK_AND_ASSIGN(result, Arange(10, 0, -3, pool_));
ASSERT_ARRAYS_EQUAL(*expected, *result);

expected = ArrayFromJSON(int64(), "[5, 2, -1, -4]");
ASSERT_OK_AND_ASSIGN(result, Arange(5, -7, -3, pool_));
ASSERT_ARRAYS_EQUAL(*expected, *result);
}

TEST_F(TestArray, ArangeEmptyRanges) {
ASSERT_OK_AND_ASSIGN(auto result, Arange(10, 5, 1, pool_));
ASSERT_EQ(result->length(), 0);

ASSERT_OK_AND_ASSIGN(result, Arange(5, 10, -1, pool_));
ASSERT_EQ(result->length(), 0);

ASSERT_OK_AND_ASSIGN(result, Arange(5, 5, 1, pool_));
ASSERT_EQ(result->length(), 0);
}

TEST_F(TestArray, ArangeBoundaryValues) {
// Positive-step, with range = 2^64 - 1
auto expected = ArrayFromJSON(
int64(), "[-9223372036854775808, -4611686018427387904, 0, 4611686018427387904]");
ASSERT_OK_AND_ASSIGN(auto result, Arange(INT64_MIN, INT64_MAX, 1LL << 62, pool_));
ASSERT_ARRAYS_EQUAL(*expected, *result);

// Negative-step mirror, also with range = 2^64 - 1
expected = ArrayFromJSON(
int64(), "[9223372036854775807, 4611686018427387903, -1, -4611686018427387905]");
ASSERT_OK_AND_ASSIGN(result, Arange(INT64_MAX, INT64_MIN, -(1LL << 62), pool_));
ASSERT_ARRAYS_EQUAL(*expected, *result);

// step == INT64_MIN is valid: |step| is computed in unsigned arithmetic
expected = ArrayFromJSON(int64(), "[10]");
ASSERT_OK_AND_ASSIGN(result, Arange(10, 0, INT64_MIN, pool_));
ASSERT_ARRAYS_EQUAL(*expected, *result);

expected = ArrayFromJSON(int64(), "[9223372036854775807, -1]");
ASSERT_OK_AND_ASSIGN(result, Arange(INT64_MAX, INT64_MIN, INT64_MIN, pool_));
ASSERT_ARRAYS_EQUAL(*expected, *result);

// Endpoints on the int64 rails
expected = ArrayFromJSON(int64(), "[-9223372036854775808, -9223372036854775807]");
ASSERT_OK_AND_ASSIGN(result, Arange(INT64_MIN, INT64_MIN + 2, 1, pool_));
ASSERT_ARRAYS_EQUAL(*expected, *result);

expected = ArrayFromJSON(int64(), "[9223372036854775805, 9223372036854775806]");
ASSERT_OK_AND_ASSIGN(result, Arange(INT64_MAX - 2, INT64_MAX, 1, pool_));
ASSERT_ARRAYS_EQUAL(*expected, *result);
}

class TestDayTimeIntervalBuilder : public ::testing::Test {
public:
void VerifyValue(const DayTimeIntervalBuilder& builder, int64_t index,
Expand Down
48 changes: 48 additions & 0 deletions cpp/src/arrow/array/util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include "arrow/util/checked_cast.h"
#include "arrow/util/decimal.h"
#include "arrow/util/endian.h"
#include "arrow/util/int_util_overflow.h"
#include "arrow/util/logging_internal.h"
#include "arrow/util/sort_internal.h"
#include "arrow/visit_data_inline.h"
Expand Down Expand Up @@ -926,6 +927,53 @@ Result<std::shared_ptr<Array>> MakeEmptyArray(std::shared_ptr<DataType> type,
return builder->Finish();
}

Result<std::shared_ptr<Array>> Arange(int64_t start, int64_t stop, int64_t step,
MemoryPool* pool) {
if (step == 0) {
return Status::Invalid("Arange step cannot be zero");
}

auto error = [&]() {
return Status::Invalid("Arange: range [", start, ", ", stop, ") with step ", step,
" would produce an array that is too large");
};

uint64_t size;
if (step > 0 && stop > start) {
const uint64_t range = static_cast<uint64_t>(stop) - static_cast<uint64_t>(start);
const auto step_u = static_cast<uint64_t>(step);
size = (range - 1) / step_u + 1;
} else if (step < 0 && stop < start) {
const uint64_t range = static_cast<uint64_t>(start) - static_cast<uint64_t>(stop);
const uint64_t step_u = 0 - static_cast<uint64_t>(step);
size = (range - 1) / step_u + 1;
} else {
return MakeEmptyArray(int64(), pool);
}

uint64_t buffer_size_u;
if (internal::MultiplyWithOverflow(size, sizeof(int64_t), &buffer_size_u) ||
buffer_size_u > static_cast<uint64_t>(std::numeric_limits<int64_t>::max())) {
return error();
}
const auto size_i64 = static_cast<int64_t>(size);
const auto buffer_size = static_cast<int64_t>(buffer_size_u);

ARROW_ASSIGN_OR_RAISE(auto data_buffer, AllocateBuffer(buffer_size, pool));

auto values = reinterpret_cast<int64_t*>(data_buffer->mutable_data());
int64_t value = start;
int64_t i = 0;
for (; i < size_i64 - 1; ++i) {
values[i] = value;
value += step;
}
values[i] = value;

auto data = ArrayData::Make(int64(), size_i64, {nullptr, std::move(data_buffer)}, 0);
return MakeArray(data);
}

namespace internal {

std::vector<ArrayVector> RechunkArraysConsistently(
Expand Down
15 changes: 15 additions & 0 deletions cpp/src/arrow/array/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,21 @@ ARROW_EXPORT
Result<std::shared_ptr<Array>> MakeEmptyArray(std::shared_ptr<DataType> type,
MemoryPool* pool = default_memory_pool());

/// \brief Create an array of evenly spaced integer values
///
/// Generates a sequence of integers from start (inclusive) to stop (exclusive)
/// with the given step, similar to Python's range() or NumPy's arange().
/// The resulting array will have type Int64.
///
/// \param[in] start First value in the sequence
/// \param[in] stop End value (exclusive)
/// \param[in] step Spacing between values (must not be zero)
/// \param[in] pool the memory pool to allocate memory from
/// \return the resulting Int64Array
ARROW_EXPORT
Result<std::shared_ptr<Array>> Arange(int64_t start, int64_t stop, int64_t step,
MemoryPool* pool = default_memory_pool());

/// @}

namespace internal {
Expand Down
3 changes: 1 addition & 2 deletions python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -405,8 +405,7 @@ set(PYARROW_CPP_SRCS
${PYARROW_CPP_SOURCE_DIR}/python_test.cc
${PYARROW_CPP_SOURCE_DIR}/python_to_arrow.cc
${PYARROW_CPP_SOURCE_DIR}/pyarrow.cc
${PYARROW_CPP_SOURCE_DIR}/udf.cc
${PYARROW_CPP_SOURCE_DIR}/util.cc)
${PYARROW_CPP_SOURCE_DIR}/udf.cc)
set_source_files_properties(${PYARROW_CPP_SOURCE_DIR}/numpy_init.cc
PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)

Expand Down
3 changes: 3 additions & 0 deletions python/pyarrow/includes/libarrow.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,9 @@ cdef extern from "arrow/api.h" namespace "arrow" nogil:
CResult[shared_ptr[CArray]] MakeArrayFromScalar(
const CScalar& scalar, int64_t length, CMemoryPool* pool)

CResult[shared_ptr[CArray]] Arange(int64_t start, int64_t stop,
int64_t step, CMemoryPool* pool)

CStatus DebugPrint(const CArray& arr, int indent)

cdef cppclass CFixedWidthType" arrow::FixedWidthType"(CDataType):
Expand Down
3 changes: 0 additions & 3 deletions python/pyarrow/includes/libarrow_python.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ cdef extern from "arrow/python/api.h" namespace "arrow::py" nogil:
object obj, object mask, const PyConversionOptions& options,
CMemoryPool* pool)

CResult[shared_ptr[CArray]] Arange(int64_t start, int64_t stop,
int64_t step, CMemoryPool* pool)

CResult[shared_ptr[CDataType]] NumPyDtypeToArrow(object dtype)

CStatus NdarrayToArrow(CMemoryPool* pool, object ao, object mo,
Expand Down
1 change: 0 additions & 1 deletion python/pyarrow/src/arrow/python/api.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@
#include "arrow/python/numpy_convert.h"
#include "arrow/python/numpy_to_arrow.h"
#include "arrow/python/python_to_arrow.h"
#include "arrow/python/util.h"
50 changes: 0 additions & 50 deletions python/pyarrow/src/arrow/python/util.cc

This file was deleted.

40 changes: 0 additions & 40 deletions python/pyarrow/src/arrow/python/util.h

This file was deleted.

Loading