addressing review comments

Signed-off-by: Prachi Mishra <prachi.mishra@astronomer.io>
MarquezProject · Nov 2, 2022 · a330beb · a330beb
1 parent 8c1e395
commit a330beb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/api/src/main/java/marquez/db/LineageDao.java b/api/src/main/java/marquez/db/LineageDao.java
@@ -132,11 +132,12 @@ WHERE ds.uuid IN (<dsUuids>)""")
   List<Run> getCurrentRunsWithFacets(@BindList Collection<UUID> jobUuid);
 
   @SqlQuery(
-      "SELECT DISTINCT on(r.job_name, r.namespace_name) r.*, jv.version as job_version\n"
-          + "    FROM runs_view r\n"
-          + "    INNER JOIN job_versions jv ON jv.uuid=r.job_version_uuid\n"
-          + "    INNER JOIN jobs_view j ON j.uuid=jv.job_uuid\n"
-          + "    WHERE j.uuid in (<jobUuid>) OR j.symlink_target_uuid IN (<jobUuid>)\n"
-          + "    ORDER BY r.job_name, r.namespace_name, created_at DESC\n")
+      """
+      SELECT DISTINCT on(r.job_name, r.namespace_name) r.*, jv.version as job_version
+      FROM runs_view r
+      INNER JOIN job_versions jv ON jv.uuid=r.job_version_uuid
+      INNER JOIN jobs_view j ON j.uuid=jv.job_uuid
+      WHERE j.uuid in (<jobUuid>) OR j.symlink_target_uuid IN (<jobUuid>)
+      ORDER BY r.job_name, r.namespace_name, created_at DESC""")
   List<Run> getCurrentRuns(@BindList Collection<UUID> jobUuid);
 }
diff --git a/api/src/main/java/marquez/service/LineageService.java b/api/src/main/java/marquez/service/LineageService.java
@@ -46,6 +46,7 @@ public LineageService(LineageDao delegate, JobDao jobDao) {
     this.jobDao = jobDao;
   }
 
+  // TODO make input parameters easily extendable if adding more options like 'withJobFacets'
   public Lineage lineage(NodeId nodeId, int depth, boolean withRunFacets) {
     Optional<UUID> optionalUUID = getJobUuid(nodeId);
     if (optionalUUID.isEmpty()) {
@@ -61,7 +62,6 @@ public Lineage lineage(NodeId nodeId, int depth, boolean withRunFacets) {
                 jobData.stream().map(JobData::getUuid).collect(Collectors.toSet()))
             : getCurrentRuns(jobData.stream().map(JobData::getUuid).collect(Collectors.toSet()));
 
-    // todo fix runtime
     for (JobData j : jobData) {
       if (j.getLatestRun().isEmpty()) {
         for (Run run : runs) {