This is an automated email from the ASF dual-hosted git repository.
github-bot 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 a12319c Update dist/ for commit
6d424eb27b2ea7729450a2a92b4ce68ad31ae1da
a12319c is described below
commit a12319c53e8a0a121bd52473ad1abfce93c467ea
Author: GitHub Actions <[email protected]>
AuthorDate: Tue Feb 21 15:06:21 2023 +0000
Update dist/ for commit 6d424eb27b2ea7729450a2a92b4ce68ad31ae1da
---
dist/nanoarrow.c | 66 ++++++++++++++++++++++++++++----------------------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/dist/nanoarrow.c b/dist/nanoarrow.c
index 23042dc..18b2371 100644
--- a/dist/nanoarrow.c
+++ b/dist/nanoarrow.c
@@ -169,7 +169,7 @@ void ArrowFree(void* ptr) { free(ptr); }
static uint8_t* ArrowBufferAllocatorMallocReallocate(
struct ArrowBufferAllocator* allocator, uint8_t* ptr, int64_t old_size,
int64_t new_size) {
- return ArrowRealloc(ptr, new_size);
+ return (uint8_t*)ArrowRealloc(ptr, new_size);
}
static void ArrowBufferAllocatorMallocFree(struct ArrowBufferAllocator*
allocator,
@@ -2532,9 +2532,9 @@ static int ArrowBasicArrayStreamGetSchema(struct
ArrowArrayStream* array_stream,
return EINVAL;
}
- struct BasicArrayStreamPrivate* private =
+ struct BasicArrayStreamPrivate* private_data =
(struct BasicArrayStreamPrivate*)array_stream->private_data;
- return ArrowSchemaDeepCopy(&private->schema, schema);
+ return ArrowSchemaDeepCopy(&private_data->schema, schema);
}
static int ArrowBasicArrayStreamGetNext(struct ArrowArrayStream* array_stream,
@@ -2543,15 +2543,15 @@ static int ArrowBasicArrayStreamGetNext(struct
ArrowArrayStream* array_stream,
return EINVAL;
}
- struct BasicArrayStreamPrivate* private =
+ struct BasicArrayStreamPrivate* private_data =
(struct BasicArrayStreamPrivate*)array_stream->private_data;
- if (private->arrays_i == private->n_arrays) {
+ if (private_data->arrays_i == private_data->n_arrays) {
array->release = NULL;
return NANOARROW_OK;
}
- ArrowArrayMove(&private->arrays[private->arrays_i++], array);
+ ArrowArrayMove(&private_data->arrays[private_data->arrays_i++], array);
return NANOARROW_OK;
}
@@ -2565,81 +2565,81 @@ static void ArrowBasicArrayStreamRelease(struct
ArrowArrayStream* array_stream)
return;
}
- struct BasicArrayStreamPrivate* private =
+ struct BasicArrayStreamPrivate* private_data =
(struct BasicArrayStreamPrivate*)array_stream->private_data;
- if (private->schema.release != NULL) {
- private->schema.release(&private->schema);
+ if (private_data->schema.release != NULL) {
+ private_data->schema.release(&private_data->schema);
}
- for (int64_t i = 0; i < private->n_arrays; i++) {
- if (private->arrays[i].release != NULL) {
- private->arrays[i].release(&private->arrays[i]);
+ for (int64_t i = 0; i < private_data->n_arrays; i++) {
+ if (private_data->arrays[i].release != NULL) {
+ private_data->arrays[i].release(&private_data->arrays[i]);
}
}
- if (private->arrays != NULL) {
- ArrowFree(private->arrays);
+ if (private_data->arrays != NULL) {
+ ArrowFree(private_data->arrays);
}
- ArrowFree(private);
+ ArrowFree(private_data);
array_stream->release = NULL;
}
ArrowErrorCode ArrowBasicArrayStreamInit(struct ArrowArrayStream* array_stream,
struct ArrowSchema* schema, int64_t
n_arrays) {
- struct BasicArrayStreamPrivate* private = (struct
BasicArrayStreamPrivate*)ArrowMalloc(
+ struct BasicArrayStreamPrivate* private_data = (struct
BasicArrayStreamPrivate*)ArrowMalloc(
sizeof(struct BasicArrayStreamPrivate));
- if (private == NULL) {
+ if (private_data == NULL) {
return ENOMEM;
}
- ArrowSchemaMove(schema, &private->schema);
+ ArrowSchemaMove(schema, &private_data->schema);
- private->n_arrays = n_arrays;
- private->arrays = NULL;
- private->arrays_i = 0;
+ private_data->n_arrays = n_arrays;
+ private_data->arrays = NULL;
+ private_data->arrays_i = 0;
if (n_arrays > 0) {
- private->arrays =
+ private_data->arrays =
(struct ArrowArray*)ArrowMalloc(n_arrays * sizeof(struct ArrowArray));
- if (private->arrays == NULL) {
+ if (private_data->arrays == NULL) {
ArrowBasicArrayStreamRelease(array_stream);
return ENOMEM;
}
}
- for (int64_t i = 0; i < private->n_arrays; i++) {
- private->arrays[i].release = NULL;
+ for (int64_t i = 0; i < private_data->n_arrays; i++) {
+ private_data->arrays[i].release = NULL;
}
array_stream->get_schema = &ArrowBasicArrayStreamGetSchema;
array_stream->get_next = &ArrowBasicArrayStreamGetNext;
array_stream->get_last_error = ArrowBasicArrayStreamGetLastError;
array_stream->release = ArrowBasicArrayStreamRelease;
- array_stream->private_data = private;
+ array_stream->private_data = private_data;
return NANOARROW_OK;
}
void ArrowBasicArrayStreamSetArray(struct ArrowArrayStream* array_stream,
int64_t i,
struct ArrowArray* array) {
- struct BasicArrayStreamPrivate* private =
+ struct BasicArrayStreamPrivate* private_data =
(struct BasicArrayStreamPrivate*)array_stream->private_data;
- ArrowArrayMove(array, &private->arrays[i]);
+ ArrowArrayMove(array, &private_data->arrays[i]);
}
ArrowErrorCode ArrowBasicArrayStreamValidate(struct ArrowArrayStream*
array_stream,
struct ArrowError* error) {
- struct BasicArrayStreamPrivate* private =
+ struct BasicArrayStreamPrivate* private_data =
(struct BasicArrayStreamPrivate*)array_stream->private_data;
struct ArrowArrayView array_view;
NANOARROW_RETURN_NOT_OK(
- ArrowArrayViewInitFromSchema(&array_view, &private->schema, error));
+ ArrowArrayViewInitFromSchema(&array_view, &private_data->schema, error));
- for (int64_t i = 0; i < private->n_arrays; i++) {
- if (private->arrays[i].release != NULL) {
- int result = ArrowArrayViewSetArray(&array_view, &private->arrays[i],
error);
+ for (int64_t i = 0; i < private_data->n_arrays; i++) {
+ if (private_data->arrays[i].release != NULL) {
+ int result = ArrowArrayViewSetArray(&array_view,
&private_data->arrays[i], error);
if (result != NANOARROW_OK) {
ArrowArrayViewReset(&array_view);
return result;
