WIP:

timescale · Sep 3, 2024 · c239d3c · c239d3c
1 parent cfa78bf
commit c239d3c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/extension/src/stats_agg.rs b/extension/src/stats_agg.rs
@@ -1644,13 +1644,20 @@ mod tests {
 
             let control = state.unwrap();
             let buffer = stats1d_trans_serialize(Inner::from(control.clone()).internal().unwrap());
-            let buffer = pgrx::varlena::varlena_to_byte_slice(buffer.0.cast_mut_ptr());
+            println!("debug serializer output after return:\n{:?}", ret);
+            // let buffer =
+            //     pgrx::varlena::varlena_to_byte_slice(buffer.0.cast_mut_ptr::<pg_sys::varlena>());
 
-            let expected = pgrx::varlena::rust_byte_slice_to_bytea(buffer);
-            let new_state =
-                stats1d_trans_deserialize_inner(bytea(pg_sys::Datum::from(expected.as_ptr())));
+            // let expected = pgrx::varlena::rust_byte_slice_to_bytea(buffer);
+            // let new_state =
+            //     stats1d_trans_deserialize_inner(bytea(pg_sys::Datum::from(expected.as_ptr())));
+            let new_state = stats1d_trans_deserialize_inner(buffer);
 
-            assert_eq!(&*new_state, &*control);
+            assert_eq!(
+                &*new_state, &*control,
+                "unexpected difference in bytes output, got:\n{:?}\nexpected:\n{:?}",
+                &*new_state, &*control
+            );
         }
     }
 

diff --git a/extension/src/type_builder.rs b/extension/src/type_builder.rs
@@ -362,7 +362,10 @@ macro_rules! do_serialize {
                 let len = writer.position().try_into().expect("serialized size too large");
                 ::pgrx::set_varsize(writer.get_mut().as_mut_ptr() as *mut _, len);
             }
-            $crate::raw::bytea::from(pg_sys::Datum::from(writer.into_inner().as_mut_ptr()))
+
+            let ret = $crate::raw::bytea::from(pg_sys::Datum::from(writer.into_inner().as_mut_ptr()));
+            println!("debug serializer output:\n{:?}", ret);
+            ret
         }
     };
 }

diff --git a/tools/build b/tools/build
@@ -104,9 +104,9 @@ while [ $# -gt 0 ]; do
             $nop cargo fetch
             export RUSTC_BOOTSTRAP=1
             export __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS=nightly
-            export RUSTFLAGS='-Z sanitizer=memory'
+            # export RUSTFLAGS='-Z sanitizer=memory'
             rustup component add rust-src --toolchain 1.74.0-x86_64-unknown-linux-gnu
-            $nop cargo test -Zbuild-std --profile $profile --target --target x86_64-unknown-linux-gnu --features "$pg pg_test" --no-default-features -- stats_agg::tests
+            $nop cargo test -Zbuild-std --profile $profile --target --target x86_64-unknown-linux-gnu --features "$pg pg_test" --no-default-features -- --nocapture stats_agg::tests
             ;;
 
         install)