add event

ExpediaGroup · Nov 27, 2024 · 9a93bd7 · 9a93bd7
1 parent a32e9d0
commit 9a93bd7
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 0 deletions.
diff --git a/...iagroup/beekeeper/integration/BeekeeperExpiredMetadataSchedulerApiaryIntegrationTest.java b/...iagroup/beekeeper/integration/BeekeeperExpiredMetadataSchedulerApiaryIntegrationTest.java
@@ -213,6 +213,21 @@ public void expiredMetadataMultipleAlterPartitionTableEvents() throws SQLExcepti
     assertExpiredMetadata(expiredMetadata.get(1), LOCATION_B, PARTITION_B_NAME);
   }
 
+  @Test
+  public void expiredMetadataAlterIcebergTableEventShouldBeIgnored()
+      throws SQLException, IOException, URISyntaxException {
+    insertExpiredMetadata(LOCATION_A + "-old", null);
+
+    AlterTableSqsMessage alterTableSqsMessage = new AlterTableSqsMessage(LOCATION_A, true, true);
+    amazonSQS.sendMessage(sendMessageRequest(alterTableSqsMessage.getFormattedString()));
+
+    await().atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> getUpdatedExpiredMetadataRowCount() == 1);
+
+    // iceberg table event should be ignored
+    List<HousekeepingMetadata> expiredMetadata = getExpiredMetadata();
+    assertThat(expiredMetadata.size()).isEqualTo(0);
+  }
+
   @Test
   public void healthCheck() {
     CloseableHttpClient client = HttpClientBuilder.create().build();

diff --git a/...ests/src/test/java/com/expediagroup/beekeeper/integration/model/AlterTableSqsMessage.java b/...ests/src/test/java/com/expediagroup/beekeeper/integration/model/AlterTableSqsMessage.java
@@ -51,6 +51,21 @@ public AlterTableSqsMessage(
     setExpired(isExpired);
   }
 
+  public AlterTableSqsMessage(
+      String tableLocation,
+      boolean isExpired,
+      boolean isIceberg
+  ) throws IOException, URISyntaxException {
+    super(ALTER_TABLE);
+    setTableLocation(tableLocation);
+    setOldTableLocation(DUMMY_LOCATION);
+    setOldTableName(TABLE_NAME_VALUE);
+    setExpired(isExpired);
+    if (isIceberg) {
+      setIceberg();
+    }
+  }
+
   public void setOldTableLocation(String oldTableLocation) {
     apiaryEventMessageJsonObject.add(EVENT_TABLE_OLD_LOCATION_KEY, new JsonPrimitive(oldTableLocation));
   }

diff --git a/...egration-tests/src/test/java/com/expediagroup/beekeeper/integration/model/SqsMessage.java b/...egration-tests/src/test/java/com/expediagroup/beekeeper/integration/model/SqsMessage.java
@@ -93,6 +93,12 @@ public void setExpired(boolean isExpired) {
     tableParameters.add(EXPIRED_DATA_RETENTION_PERIOD_PROPERTY_KEY, new JsonPrimitive(SHORT_CLEANUP_DELAY_VALUE));
   }
 
+  public void setIceberg() {
+    JsonObject tableParameters = apiaryEventMessageJsonObject.getAsJsonObject(EVENT_TABLE_PARAMETERS_KEY);
+    tableParameters.add("table_format", new JsonPrimitive("ICEBERG"));
+    tableParameters.add("metadata_location", new JsonPrimitive("s3://bucket/metadata"));
+  }
+
   public void setWhitelisted(boolean isWhitelisted) {
     String whitelist = isWhitelisted ? eventType.toString() : "";
     JsonObject tableParameters = apiaryEventMessageJsonObject.getAsJsonObject(EVENT_TABLE_PARAMETERS_KEY);