Copy jsonb value within populate_slot() into the allocator buffer

adjust · Aug 9, 2024 · ee79d34 · ee79d34
1 parent 88dec77
commit ee79d34
Showing 1 changed file with 22 additions and 10 deletions.
diff --git a/src/reader.cpp b/src/reader.cpp
@@ -1003,10 +1003,21 @@ class DefaultParquetReader : public ParquetReader
                     }
                     case arrow::Type::MAP:
                     {
-                        arrow::MapArray* maparray = (arrow::MapArray*) array;
+                        arrow::MapArray *maparray = (arrow::MapArray*) array;
+                        Datum       jsonb = this->map_to_datum(maparray, chunkInfo.pos, typinfo);
 
-                        slot->tts_values[attr] =
-                            this->map_to_datum(maparray, chunkInfo.pos, typinfo);
+                        /*
+                         * Copy jsonb into memory block allocated by
+                         * FastAllocator to prevent its destruction though
+                         * to be able to recycle it once it fulfilled its
+                         * purpose.
+                         */
+                        void       *jsonb_val = allocator->fast_alloc(VARSIZE_ANY(jsonb));
+
+                        memcpy(jsonb_val, DatumGetPointer(jsonb), VARSIZE_ANY(jsonb));
+                        pfree(DatumGetPointer(jsonb));
+
+                        slot->tts_values[attr] = PointerGetDatum(jsonb_val);
                         break;
                     }
                     default:
@@ -1255,20 +1266,21 @@ class CachingParquetReader : public ParquetReader
                     case arrow::Type::MAP:
                         {
                             arrow::MapArray* maparray = (arrow::MapArray*) array;
-
-                            Datum jsonb =
-                                this->map_to_datum(maparray, j, typinfo);
+                            Datum       jsonb = this->map_to_datum(maparray, j, typinfo);
 
                             /*
                              * Copy jsonb into memory block allocated by
                              * FastAllocator to prevent its destruction though
                              * to be able to recycle it once it fulfilled its
                              * purpose.
                              */
-                            void *res = allocator->fast_alloc(VARSIZE_ANY(jsonb));
-                            memcpy(res, (Jsonb *) jsonb, VARSIZE_ANY(jsonb));
-                            ((Datum *) data)[row] = (Datum) res;
-                            pfree((Jsonb *) jsonb);
+                            void       *jsonb_val = allocator->fast_alloc(VARSIZE_ANY(jsonb));
+
+                            memcpy(jsonb_val, DatumGetPointer(jsonb), VARSIZE_ANY(jsonb));
+                            pfree(DatumGetPointer(jsonb));
+
+                            ((Datum *) data)[row] = PointerGetDatum(jsonb_val);
+
                             break;
                         }
                     default: