You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2023/08/01 05:17:57 UTC
[phoenix] branch master updated: PHOENIX-7005 Spark connector tests cannot compile with latest Phoenix
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push:
new 5f9fdfce5b PHOENIX-7005 Spark connector tests cannot compile with latest Phoenix
5f9fdfce5b is described below
commit 5f9fdfce5b0de2306bd1591005c1ad1339aae2fb
Author: Istvan Toth <st...@apache.org>
AuthorDate: Tue Jul 25 14:16:23 2023 +0200
PHOENIX-7005 Spark connector tests cannot compile with latest Phoenix
---
.../src/it/java/org/apache/phoenix/end2end/BaseAggregateIT.java | 2 --
.../src/it/java/org/apache/phoenix/end2end/ParallelStatsDisabledIT.java | 2 +-
phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateIT.java
index 01e92c644f..f612579187 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateIT.java
@@ -17,8 +17,6 @@
*/
package org.apache.phoenix.end2end;
-import static org.apache.phoenix.end2end.ParallelStatsDisabledIT.executeQuery;
-import static org.apache.phoenix.end2end.ParallelStatsDisabledIT.executeQueryThrowsException;
import static org.apache.phoenix.end2end.ParallelStatsDisabledIT.validateQueryPlan;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertEquals;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsDisabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsDisabledIT.java
index 3cd9dc7202..fe1f403b01 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsDisabledIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsDisabledIT.java
@@ -67,7 +67,7 @@ public abstract class ParallelStatsDisabledIT extends BaseTest {
BaseTest.freeResourcesIfBeyondThreshold();
}
- public static ResultSet executeQueryThrowsException(Connection conn, QueryBuilder queryBuilder,
+ protected ResultSet executeQueryThrowsException(Connection conn, QueryBuilder queryBuilder,
String expectedPhoenixExceptionMsg, String expectedSparkExceptionMsg) {
ResultSet rs = null;
try {
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
index 4c8a1e2ade..ca7d08fa1e 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
@@ -749,7 +749,7 @@ public abstract class BaseTest {
createTestTable(url, ddl, splits, ts);
}
- public static ResultSet executeQuery(Connection conn, QueryBuilder queryBuilder) throws SQLException {
+ protected ResultSet executeQuery(Connection conn, QueryBuilder queryBuilder) throws SQLException {
PreparedStatement statement = conn.prepareStatement(queryBuilder.build());
ResultSet rs = statement.executeQuery();
return rs;