Add creationTime in mysql column (#248)

linkedin · Nov 6, 2024 · 8e2cc7d · 8e2cc7d
1 parent 9be2378
commit 8e2cc7d
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 2 deletions.
diff --git a/...atalog/src/main/java/com/linkedin/openhouse/internal/catalog/mapper/HouseTableMapper.java b/...atalog/src/main/java/com/linkedin/openhouse/internal/catalog/mapper/HouseTableMapper.java
@@ -20,7 +20,6 @@ public abstract class HouseTableMapper {
   @Autowired FileIOManager fileIOManager;
 
   @Mapping(target = "lastModifiedTime", ignore = true)
-  @Mapping(target = "creationTime", ignore = true)
   @Mapping(
       target = "storageType",
       expression = "java(fileIOManager.getStorage(fileIO).getType().getValue())")

diff --git a/...ousetables/src/main/java/com/linkedin/openhouse/housetables/api/spec/model/UserTable.java b/...ousetables/src/main/java/com/linkedin/openhouse/housetables/api/spec/model/UserTable.java
@@ -57,6 +57,10 @@ public class UserTable {
   @JsonProperty(value = "storageType")
   private String storageType;
 
+  @Schema(description = "Creation time of the table.", example = "1651002318265")
+  @JsonProperty(value = "creationTime")
+  private Long creationTime;
+
   public String toJson() {
     return new Gson().toJson(this);
   }

diff --git a/...etables/src/main/java/com/linkedin/openhouse/housetables/dto/mapper/UserTablesMapper.java b/...etables/src/main/java/com/linkedin/openhouse/housetables/dto/mapper/UserTablesMapper.java
@@ -44,6 +44,7 @@ public interface UserTablesMapper {
    */
   @Mapping(target = "version", source = "userTable", qualifiedByName = "toVersion")
   @Mapping(target = "storageType", source = "userTable.storageType", defaultValue = DEFAULT_STORAGE)
+  @Mapping(target = "creationTime", source = "userTable.creationTime")
   UserTableRow toUserTableRow(
       UserTable userTable, @Context Optional<UserTableRow> existingUserTableRow);
 

diff --git a/.../housetables/src/main/java/com/linkedin/openhouse/housetables/dto/model/UserTableDto.java b/.../housetables/src/main/java/com/linkedin/openhouse/housetables/dto/model/UserTableDto.java
@@ -21,6 +21,8 @@ public class UserTableDto {
 
   String storageType;
 
+  Long creationTime;
+
   /**
    * Compare if a given {@link UserTable} matches the current one if all non-null fields are equal.
    *
@@ -32,6 +34,7 @@ public boolean match(UserTableDto userTable) {
         && Utilities.fieldMatchCaseInsensitive(this.tableId, userTable.tableId)
         && Utilities.fieldMatch(this.metadataLocation, userTable.metadataLocation)
         && Utilities.fieldMatch(this.tableVersion, userTable.tableVersion)
-        && Utilities.fieldMatch(this.storageType, userTable.storageType);
+        && Utilities.fieldMatch(this.storageType, userTable.storageType)
+        && Utilities.fieldMatch(this.creationTime, userTable.creationTime);
   }
 }
diff --git a/...ices/housetables/src/main/java/com/linkedin/openhouse/housetables/model/UserTableRow.java b/...ices/housetables/src/main/java/com/linkedin/openhouse/housetables/model/UserTableRow.java
@@ -30,4 +30,6 @@ public class UserTableRow {
   String metadataLocation;
 
   String storageType;
+
+  Long creationTime;
 }
diff --git a/services/housetables/src/main/resources/schema.sql b/services/housetables/src/main/resources/schema.sql
@@ -5,6 +5,7 @@ CREATE TABLE IF NOT EXISTS user_table_row (
                          version             BIGINT            NOT NULL,
                          metadata_location   VARCHAR (512)     ,
                          storage_type        VARCHAR (128)     DEFAULT 'hdfs' NOT NULL,
+                         creation_time       BIGINT            DEFAULT NULL,
                          last_modified_time  TIMESTAMP         DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
                          ETL_TS              DATETIME(6)       DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
                          PRIMARY KEY (database_id, table_id)

diff --git a/.../src/test/java/com/linkedin/openhouse/housetables/model/TestHouseTableModelConstants.java b/.../src/test/java/com/linkedin/openhouse/housetables/model/TestHouseTableModelConstants.java
@@ -20,6 +20,8 @@ private TestHouseTableModelConstants() {
 
   public static final String TEST_DEFAULT_STORAGE_TYPE = "hdfs";
 
+  public static final long TEST_CREATION_TIME = 123;
+
   public static final UserTableDto TEST_USER_TABLE_DTO = TUPLE_0.get_userTableDto();
   public static final UserTable TEST_USER_TABLE = TUPLE_0.get_userTable();
 
@@ -43,6 +45,7 @@ public static class TestTuple {
     private final String databaseId;
     private final String tableLoc;
     private final String storageType;
+    private final long creationTime;
 
     public TestTuple(int tbSeq) {
       this(tbSeq, 0);
@@ -58,13 +61,15 @@ public TestTuple(int tbSeq, int dbSeq) {
               .replace("$test_table", tableId)
               .replace("$version", "v0");
       this.storageType = TEST_DEFAULT_STORAGE_TYPE;
+      this.creationTime = TEST_CREATION_TIME;
       this._userTable =
           UserTable.builder()
               .tableId(tableId)
               .databaseId(databaseId)
               .tableVersion(ver)
               .metadataLocation(tableLoc)
               .storageType(storageType)
+              .creationTime(TEST_CREATION_TIME)
               .build();
 
       this._userTableDto =
@@ -74,6 +79,7 @@ public TestTuple(int tbSeq, int dbSeq) {
               .tableVersion(ver)
               .metadataLocation(tableLoc)
               .storageType(storageType)
+              .creationTime(TEST_CREATION_TIME)
               .build();
 
       this._userTableRow =
@@ -83,6 +89,7 @@ public TestTuple(int tbSeq, int dbSeq) {
               .version(null)
               .metadataLocation(tableLoc)
               .storageType(storageType)
+              .creationTime(TEST_CREATION_TIME)
               .build();
     }
   }