more updates

Author: tinder-maxwellelliott

cli/src/main/kotlin/com/bazel_diff/bazel/BazelClient.kt

@@ -68,10 +68,14 @@ class BazelClient(private val useCquery: Boolean, private val fineGrainedHashExt
     suspend fun queryModifiedSourcefileTargets(
         modifiedFilepaths: Set<Path>
     ): List<Build.Target> {
+        logger.i { modifiedFilepaths.map { it.toString() }.joinToString("\n") }
         val queryEpoch = Calendar.getInstance().getTimeInMillis()
         val allReposToQuery = fineGrainedHashExternalRepos.map { "@$it" }
-        val fineGrainedHashExternalReposSourceTargets = queryService.query("kind('source file', ${allReposToQuery.joinToString(" + ") { "'$it//...:all-targets'" }})")
-        val modifiedSourceFileTargets = queryService.query("kind('source file', ${modifiedFilepaths.joinToString(" + ") { "'$it'" }})")
+        var fineGrainedHashExternalReposSourceTargets = emptyList<Build.Target>()
+        if (allReposToQuery.isNotEmpty()) {
+            fineGrainedHashExternalReposSourceTargets = queryService.query("kind('source file', ${allReposToQuery.joinToString(" + ") { "'$it//...:all-targets'" }})")
+        }
+        val modifiedSourceFileTargets = queryService.query("${modifiedFilepaths.joinToString(" + ") { "'$it'" }}", supressFailure = true)
         val queryDuration = Calendar.getInstance().getTimeInMillis() - queryEpoch
         logger.i { "Modified source files queried in $queryDuration" }
 

cli/src/main/kotlin/com/bazel_diff/bazel/BazelQueryService.kt

@@ -24,20 +24,24 @@ class BazelQueryService(
 ) : KoinComponent {
     private val logger: Logger by inject()
 
-    suspend fun query(query: String, useCquery: Boolean = false): List<Build.Target> {
+    suspend fun query(
+        query: String,
+        useCquery: Boolean = false,
+        supressFailure: Boolean = false)
+    : List<Build.Target> {
         // Unfortunately, there is still no direct way to tell if a target is compatible or not with the proto output
         // by itself. So we do an extra cquery with the trick at
         // https://bazel.build/extending/platforms#cquery-incompatible-target-detection to first find all compatible
         // targets.
         val compatibleTargetSet =
             if (useCquery) {
-                runQuery(query, useCquery = true, outputCompatibleTargets = true).useLines {
+                runQuery(query, useCquery = true, outputCompatibleTargets = true, supressFailure = supressFailure).useLines {
                     it.filter { it.isNotBlank() }.toSet()
                 }
             } else {
                 emptySet()
             }
-        val outputFile = runQuery(query, useCquery)
+        val outputFile = runQuery(query, useCquery, supressFailure = supressFailure)
 
         val targets = outputFile.inputStream().buffered().use { proto ->
             if (useCquery) {
@@ -58,7 +62,12 @@ class BazelQueryService(
     }
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    private suspend fun runQuery(query: String, useCquery: Boolean, outputCompatibleTargets: Boolean = false): File {
+    private suspend fun runQuery(
+        query: String,
+        useCquery: Boolean,
+        outputCompatibleTargets: Boolean = false,
+        supressFailure: Boolean = false
+    ): File {
         val queryFile = Files.createTempFile(null, ".txt").toFile()
         queryFile.deleteOnExit()
         val outputFile = Files.createTempFile(null, ".bin").toFile()
@@ -139,7 +148,9 @@ class BazelQueryService(
             )
         }
 
-        if (result.resultCode != 0) throw RuntimeException("Bazel query failed, exit code ${result.resultCode}")
+        if (!supressFailure && result.resultCode != 0) {
+            throw RuntimeException("Bazel query failed, exit code ${result.resultCode}")
+        }
         return outputFile
     }
 }