This is an automated email from the ASF dual-hosted git repository.
paleolimbot 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 1c437002 chore: Update valgrind suppressions after internal flatcc
update (#613)
1c437002 is described below
commit 1c4370029b512384236c768c4eadeb7ea7fabbf9
Author: Dewey Dunnington <[email protected]>
AuthorDate: Tue Sep 17 16:45:49 2024 -0500
chore: Update valgrind suppressions after internal flatcc update (#613)
Also fixes a leak that was identified by the R bindings to the IPC
writer.
Closes #579 (apparently the flatcc update was sufficient to eliminate
the suppression!)
---
.github/workflows/verify.yaml | 2 +-
src/nanoarrow/ipc/writer.c | 7 ++++---
valgrind.supp | 7 -------
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index b754594e..c6fbb7e2 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-name: Verification
+name: verify
on:
push:
diff --git a/src/nanoarrow/ipc/writer.c b/src/nanoarrow/ipc/writer.c
index bff7b527..1f100865 100644
--- a/src/nanoarrow/ipc/writer.c
+++ b/src/nanoarrow/ipc/writer.c
@@ -350,8 +350,8 @@ ArrowErrorCode ArrowIpcWriterWriteArrayStream(struct
ArrowIpcWriter* writer,
struct ArrowArrayView array_view;
ArrowArrayViewInitFromType(&array_view, NANOARROW_TYPE_UNINITIALIZED);
- NANOARROW_RETURN_NOT_OK(ArrowIpcWriterWriteArrayStreamImpl(writer, in,
&schema, &array,
- &array_view,
error));
+ ArrowErrorCode result =
+ ArrowIpcWriterWriteArrayStreamImpl(writer, in, &schema, &array,
&array_view, error);
if (schema.release != NULL) {
ArrowSchemaRelease(&schema);
@@ -362,7 +362,8 @@ ArrowErrorCode ArrowIpcWriterWriteArrayStream(struct
ArrowIpcWriter* writer,
}
ArrowArrayViewReset(&array_view);
- return NANOARROW_OK;
+
+ return result;
}
#define NANOARROW_IPC_FILE_PADDED_MAGIC "ARROW1\0"
diff --git a/valgrind.supp b/valgrind.supp
index ddd0c064..c1753041 100644
--- a/valgrind.supp
+++ b/valgrind.supp
@@ -66,10 +66,3 @@
fun:base64_encode
fun:R_base64_encode
}
-
-# TODO https://github.com/apache/arrow-nanoarrow/issues/579 remove this
-{
- <flatcc>:flatcc uses realloc() and valgrind thinks something was free'd
- Memcheck:Addr4
- fun:flatcc_builder_create_cached_vtable
-}