Moved GeneratedSql() logging post execution

Jonathan Hui · Jonathan Hui · commit 07be8aa7ecbd · 2023-05-30T17:14:32.000-07:00
diff --git a/dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/EbeanLocalDAO.java b/dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/EbeanLocalDAO.java
@@ -498,7 +498,10 @@ private  <ASPECT extends RecordTemplate> EbeanMetadataAspect queryLatest(@Nonnul
         .orderBy()
         .desc(CREATED_ON_COLUMN);
     }
-    
+
+    results = query.findList();
+
+    // Encouraged to run AFTER query execution based on getGeneratedSql() documentation
     if (log.isDebugEnabled() && "com.linkedin.dataJob.azkaban.AzkabanFlowInfo".equals(aspectName)) {
       log.debug("Using {} retrieval; " + "Generated SQL: {}; urn: {}, aspect: {}, version: {}",
           _findMethodology.toString(),
@@ -509,8 +512,6 @@ private  <ASPECT extends RecordTemplate> EbeanMetadataAspect queryLatest(@Nonnul
         );
     }
 
-    results = query.findList();
-
     if (results.isEmpty()) {
       return null;
     }

Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,10 @@ private <ASPECT extends RecordTemplate> EbeanMetadataAspect queryLatest(@Nonnul`
`498`	`498`	`.orderBy()`
`499`	`499`	`.desc(CREATED_ON_COLUMN);`
`500`	`500`	`}`
`501`		`-`
	`501`	`+`
	`502`	`+ results = query.findList();`
	`503`	`+`
	`504`	`+ // Encouraged to run AFTER query execution based on getGeneratedSql() documentation`
`502`	`505`	`if (log.isDebugEnabled() && "com.linkedin.dataJob.azkaban.AzkabanFlowInfo".equals(aspectName)) {`
`503`	`506`	`log.debug("Using {} retrieval; " + "Generated SQL: {}; urn: {}, aspect: {}, version: {}",`
`504`	`507`	`_findMethodology.toString(),`
`@@ -509,8 +512,6 @@ private <ASPECT extends RecordTemplate> EbeanMetadataAspect queryLatest(@Nonnul`
`509`	`512`	`);`
`510`	`513`	`}`
`511`	`514`
`512`		`- results = query.findList();`
`513`		`-`
`514`	`515`	`if (results.isEmpty()) {`
`515`	`516`	`return null;`
`516`	`517`	`}`