fix: add backward compatible APIs for get columns (#441)

* add backward compatible methods for get column * remove @ sign * nit --------- Co-authored-by: Yang Yang <[email protected]>
linkedin · Oct 2, 2024 · abfb659 · abfb659
1 parent 80c8b23
commit abfb659
Showing 1 changed file with 27 additions and 6 deletions.
diff --git a/dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/utils/SQLSchemaUtils.java b/dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/utils/SQLSchemaUtils.java
@@ -131,6 +131,15 @@ public static String getAspectColumnName(@Nonnull final String entityType, @Nonn
     return ASPECT_PREFIX + getColumnName(entityType, aspectCanonicalName);
   }
 
+  /**
+   * DEPRECATED, use getAspectColumnName(String entityType, String aspectCanonicalName) instead.
+   */
+  @Deprecated
+  @Nonnull
+  public static String getAspectColumnName(@Nonnull final String aspectCanonicalName) {
+    return ASPECT_PREFIX + getColumnNameFromAnnotation(aspectCanonicalName);
+  }
+
   /**
    * Get column name from aspect class.
    * @param aspectClass aspect class
@@ -158,6 +167,20 @@ public static String getGeneratedColumnName(@Nonnull String assetType, @Nonnull
     return INDEX_PREFIX + getColumnName(assetType, aspect) + processPath(path, delimiter);
   }
 
+  /**
+   * DEPRECATED, use getGeneratedColumnName(assetType, aspect, path, nonDollarVirtualColumnsEnabled) instead.
+   */
+  @Deprecated
+  @Nonnull
+  public static String getGeneratedColumnName(@Nonnull String aspect, @Nonnull String path,
+      boolean nonDollarVirtualColumnsEnabled) {
+    char delimiter = nonDollarVirtualColumnsEnabled ? '0' : '$';
+    if (isUrn(aspect)) {
+      return INDEX_PREFIX + "urn" + processPath(path, delimiter);
+    }
+    return INDEX_PREFIX + getColumnNameFromAnnotation(aspect) + processPath(path, delimiter);
+  }
+
   /**
    * Check the given class name is for urn class.
    */
@@ -193,7 +216,9 @@ public static String getColumnName(@Nonnull final String assetType,
 
     Class<? extends RecordTemplate> assetClass = GlobalAssetRegistry.get(assetType);
     if (assetClass == null) {
-      return getColumnNameFromAnnotation(assetType, aspectCanonicalName);
+      log.warn("loading column name from legacy 'column' annotation. asset: {}, aspect: {}", assetType,
+          aspectCanonicalName);
+      return getColumnNameFromAnnotation(aspectCanonicalName);
     } else {
       String aspectAlias = ModelUtils.getAspectAlias(assetClass, aspectCanonicalName);
       if (aspectAlias == null) {
@@ -208,15 +233,11 @@ public static String getColumnName(@Nonnull final String assetType,
   /**
    * Get Column name from aspect column annotation (legacy).
    *
-   * @param assetType entity type from Urn definition.
    * @param aspectCanonicalName aspect name in canonical form.
    * @return aspect column name
    */
   @Nonnull
-  private static String getColumnNameFromAnnotation(@Nonnull final String assetType,
-      @Nonnull final String aspectCanonicalName) {
-    log.warn("loading column name from legacy 'column' annotation. asset: {}, aspect: {}", assetType,
-        aspectCanonicalName);
+  private static String getColumnNameFromAnnotation(@Nonnull final String aspectCanonicalName) {
     // load column from Aspect annotation (legacy way)
     try {
       final RecordDataSchema schema =