From 42c3155066bdb68eab1204422d101c21d222dfc9 Mon Sep 17 00:00:00 2001 From: Eric Sheng Date: Mon, 3 Mar 2025 08:04:27 -0800 Subject: [PATCH] [#26258] build: Fix Java compile Summary: Java build currently fails with: ``` yugabyte-db/java/yb-pgsql/src/test/java/org/yb/pgsql/TestYbQueryDiagnostics.java:[1426,13] method waitForBundleCompletion in class org.yb.pgsql.TestYbQueryDiagnostics cannot be applied to given types; [2025-03-03T15:56:19.034Z] required: java.lang.String,java.sql.Statement,int [2025-03-03T15:56:19.034Z] found: java.lang.String,java.sql.Statement [2025-03-03T15:56:19.034Z] reason: actual and formal argument lists differ in length ``` 0260740669646de9039d143f4c2c4b173e16a267 added a duplicate definition of waitForBundleCompletion from merge, which was removed in 9744a982e8cf922f8e1b42dfa41c1bc1da201921 and added back in in add35db4b18864d9b43a1eedc2c81bd4ca445ce6. Jira: DB-15601 Test Plan: Jenkins: urgent, compile only, compiler: gcc Reviewers: mlillibridge Reviewed By: mlillibridge Subscribers: mlillibridge, yql, ybase Tags: #jenkins-ready Differential Revision: https://phorge.dev.yugabyte.com/D42256 --- .../src/test/java/org/yb/pgsql/TestYbQueryDiagnostics.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestYbQueryDiagnostics.java b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestYbQueryDiagnostics.java index 3f959a405e0e..18e957428555 100644 --- a/java/yb-pgsql/src/test/java/org/yb/pgsql/TestYbQueryDiagnostics.java +++ b/java/yb-pgsql/src/test/java/org/yb/pgsql/TestYbQueryDiagnostics.java @@ -332,6 +332,10 @@ private Path runQueryDiagnostics(Statement statement, String queryId, return Paths.get(resultSet.getString("yb_query_diagnostics")); } + private void waitForBundleCompletion(String queryId, Statement statement) throws Exception { + waitForBundleCompletion(queryId, statement, 0); + } + /* * Waits for the bundle to complete by checking the yb_query_diagnostics_status view. */