fix(filemanager): only update object fields on event created, and ign…

…ore values from deleted events
umccr · Feb 6, 2024 · 710d341 · 710d341
1 parent 5d08f7c
commit 710d341
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 33 deletions.
diff --git a/...kload/stateful/filemanager/database/queries/ingester/aws/update_reordered_for_deleted.sql b/...kload/stateful/filemanager/database/queries/ingester/aws/update_reordered_for_deleted.sql
@@ -10,23 +10,13 @@ with input as (
         $2::text[],
         $3::text[],
         $4::timestamptz[],
-        $5::integer[],
-        $6::text[],
-        $7::timestamptz[],
-        $8::text[],
-        $9::storage_class[],
-        $10::text[],
-        $11::text[]
+        $5::text[],
+        $6::text[]
     ) as input (
         s3_object_id,
         bucket,
         key,
         deleted_date,
-        size,
-        checksum,
-        last_modified_date,
-        e_tag,
-        storage_class,
         version_id,
         deleted_sequencer
     )
@@ -40,12 +30,7 @@ current_objects as (
         input.key as input_key,
         input.version_id as input_version_id,
         input.deleted_sequencer as input_deleted_sequencer,
-        input.deleted_date as input_deleted_date,
-        input.size as input_size,
-        input.checksum as input_checksum,
-        input.last_modified_date as input_last_modified_date,
-        input.e_tag as input_e_tag,
-        input.storage_class as input_storage_class
+        input.deleted_date as input_deleted_date
     from s3_object
     -- Grab the relevant values to update with.
     join input on
@@ -82,11 +67,6 @@ update as (
     update s3_object
     set deleted_sequencer = objects_to_update.input_deleted_sequencer,
         deleted_date = objects_to_update.input_deleted_date,
-        size = coalesce(objects_to_update.input_size, objects_to_update.size),
-        checksum = coalesce(objects_to_update.input_checksum, objects_to_update.checksum),
-        last_modified_date = coalesce(objects_to_update.input_last_modified_date, objects_to_update.last_modified_date),
-        e_tag = coalesce(objects_to_update.e_tag, objects_to_update.e_tag),
-        storage_class = objects_to_update.storage_class,
         number_reordered = s3_object.number_reordered +
             case when objects_to_update.deleted_sequencer is null then 0 else 1 end
     from objects_to_update

diff --git a/lib/workload/stateful/filemanager/filemanager/src/database/aws/ingester.rs b/lib/workload/stateful/filemanager/filemanager/src/database/aws/ingester.rs
@@ -179,11 +179,6 @@ impl Ingester {
             &object_deleted.buckets,
             &object_deleted.keys,
             &object_deleted.event_times as &[Option<DateTime<Utc>>],
-            &object_deleted.sizes as &[Option<i32>],
-            &vec![None; object_deleted.s3_object_ids.len()] as &[Option<String>],
-            &object_deleted.last_modified_dates as &[Option<DateTime<Utc>>],
-            &object_deleted.e_tags as &[Option<String>],
-            &object_deleted.storage_classes as &[Option<StorageClass>],
             &object_deleted.version_ids as &[Option<String>],
             &object_deleted.sequencers as &[Option<String>],
         )

diff --git a/lib/workload/stateful/filemanager/filemanager/src/database/mod.rs b/lib/workload/stateful/filemanager/filemanager/src/database/mod.rs
@@ -255,11 +255,6 @@ pub(crate) mod tests {
             &vec!["bucket".to_string()],
             &vec!["key".to_string()],
             &vec![DateTime::<Utc>::default()],
-            &vec![Some(0)] as &[Option<i32>],
-            &vec![None] as &[Option<String>],
-            &vec![DateTime::<Utc>::default()],
-            &vec![None] as &[Option<String>],
-            &vec![Some(StorageClass::Standard)] as &[Option<StorageClass>],
             &vec![EXPECTED_VERSION_ID.to_string()],
             &vec![sequencer.to_string()],
         )