oss changes

datahub-project · Jul 16, 2024 · 8e8b57f · 8e8b57f
1 parent e5f5a82
commit 8e8b57f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/.../main/java/com/linkedin/datahub/graphql/resolvers/search/ScrollAcrossLineageResolver.java b/.../main/java/com/linkedin/datahub/graphql/resolvers/search/ScrollAcrossLineageResolver.java
@@ -78,7 +78,8 @@ public CompletableFuture<ScrollAcrossLineageResults> get(DataFetchingEnvironment
     @Nullable
     Long startTimeMillis = input.getStartTimeMillis() == null ? null : input.getStartTimeMillis();
     @Nullable
-    Long endTimeMillis = input.getEndTimeMillis() == null ? null : input.getEndTimeMillis();
+    Long endTimeMillis =
+        SearchUtils.getLineageEndTimeMillis(input.getStartTimeMillis(), input.getEndTimeMillis());
 
     final LineageFlags lineageFlags = LineageFlagsInputMapper.map(context, input.getLineageFlags());
     if (lineageFlags.getStartTimeMillis() == null && startTimeMillis != null) {

diff --git a/.../main/java/com/linkedin/datahub/graphql/resolvers/search/SearchAcrossLineageResolver.java b/.../main/java/com/linkedin/datahub/graphql/resolvers/search/SearchAcrossLineageResolver.java
@@ -111,7 +111,8 @@ public CompletableFuture<SearchAcrossLineageResults> get(DataFetchingEnvironment
     @Nullable
     Long startTimeMillis = input.getStartTimeMillis() == null ? null : input.getStartTimeMillis();
     @Nullable
-    Long endTimeMillis = getEndTimeMillis(input.getStartTimeMillis(), input.getEndTimeMillis());
+    Long endTimeMillis =
+        SearchUtils.getLineageEndTimeMillis(input.getStartTimeMillis(), input.getEndTimeMillis());
 
     final LineageFlags lineageFlags = LineageFlagsInputMapper.map(context, input.getLineageFlags());
     if (lineageFlags.getStartTimeMillis() == null && startTimeMillis != null) {
@@ -198,18 +199,4 @@ public CompletableFuture<SearchAcrossLineageResults> get(DataFetchingEnvironment
         this.getClass().getSimpleName(),
         "get");
   }
-
-  /**
-   * Simply resolves the end time filter for the search across lineage query. If the start time is
-   * provided, but end time is not provided, we will default to the current time.
-   */
-  private Long getEndTimeMillis(@Nullable Long startTimeMillis, @Nullable Long endTimeMillis) {
-    if (endTimeMillis != null) {
-      return endTimeMillis;
-    }
-    if (startTimeMillis != null) {
-      return System.currentTimeMillis();
-    }
-    return null;
-  }
 }
diff --git a/...graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java b/...graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java
@@ -326,4 +326,19 @@ public static SearchResults createEmptySearchResults(final int start, final int
     result.setFacets(new ArrayList<>());
     return result;
   }
+
+  /**
+   * Simply resolves the end time filter for the search across lineage query. If the start time is
+   * provided, but end time is not provided, we will default to the current time.
+   */
+  public static Long getLineageEndTimeMillis(
+      @Nullable Long startTimeMillis, @Nullable Long endTimeMillis) {
+    if (endTimeMillis != null) {
+      return endTimeMillis;
+    }
+    if (startTimeMillis != null) {
+      return System.currentTimeMillis();
+    }
+    return null;
+  }
 }