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/11/30 11:26:56 UTC
(phoenix-connectors) 03/07: PHOENIX-7119 Java ITs are not run for either Spark Connector
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-connectors.git
commit 592803ee37ea502c5a72b942f17aa597043087bd
Author: Istvan Toth <st...@apache.org>
AuthorDate: Tue Nov 21 15:33:45 2023 +0100
PHOENIX-7119 Java ITs are not run for either Spark Connector
---
phoenix5-spark/src/it/java/org/apache/phoenix/spark/AggregateIT.java | 3 +++
.../src/it/java/org/apache/phoenix/spark/DataSourceApiIT.java | 3 +++
phoenix5-spark/src/it/java/org/apache/phoenix/spark/OrderByIT.java | 3 +++
phoenix5-spark/src/it/java/org/apache/phoenix/spark/SaltedTableIT.java | 3 +++
.../src/it/java/org/apache/phoenix/spark/AggregateIT.java | 3 +++
.../src/it/java/org/apache/phoenix/spark/DataSourceApiIT.java | 3 +++
phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/OrderByIT.java | 3 +++
.../src/it/java/org/apache/phoenix/spark/SaltedTableIT.java | 3 +++
8 files changed, 24 insertions(+)
diff --git a/phoenix5-spark/src/it/java/org/apache/phoenix/spark/AggregateIT.java b/phoenix5-spark/src/it/java/org/apache/phoenix/spark/AggregateIT.java
index e4b96a3..b00c613 100644
--- a/phoenix5-spark/src/it/java/org/apache/phoenix/spark/AggregateIT.java
+++ b/phoenix5-spark/src/it/java/org/apache/phoenix/spark/AggregateIT.java
@@ -27,8 +27,11 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import org.apache.phoenix.end2end.BaseAggregateIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.util.QueryBuilder;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class AggregateIT extends BaseAggregateIT {
@Override
diff --git a/phoenix5-spark/src/it/java/org/apache/phoenix/spark/DataSourceApiIT.java b/phoenix5-spark/src/it/java/org/apache/phoenix/spark/DataSourceApiIT.java
index bc2637d..a49bc0a 100644
--- a/phoenix5-spark/src/it/java/org/apache/phoenix/spark/DataSourceApiIT.java
+++ b/phoenix5-spark/src/it/java/org/apache/phoenix/spark/DataSourceApiIT.java
@@ -19,6 +19,7 @@ package org.apache.phoenix.spark;
import org.apache.hadoop.conf.Configuration;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.query.ConfigurationFactory;
import org.apache.phoenix.spark.datasource.v2.PhoenixDataSource;
import org.apache.phoenix.util.InstanceResolver;
@@ -32,6 +33,7 @@ import org.apache.spark.sql.types.StructType;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.*;
import java.util.Arrays;
@@ -42,6 +44,7 @@ import static org.apache.phoenix.util.PhoenixRuntime.JDBC_PROTOCOL;
import static org.apache.phoenix.util.PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR;
import static org.junit.Assert.*;
+@Category(ParallelStatsDisabledTest.class)
public class DataSourceApiIT extends ParallelStatsDisabledIT {
public DataSourceApiIT() {
diff --git a/phoenix5-spark/src/it/java/org/apache/phoenix/spark/OrderByIT.java b/phoenix5-spark/src/it/java/org/apache/phoenix/spark/OrderByIT.java
index 043bb32..342edae 100644
--- a/phoenix5-spark/src/it/java/org/apache/phoenix/spark/OrderByIT.java
+++ b/phoenix5-spark/src/it/java/org/apache/phoenix/spark/OrderByIT.java
@@ -36,6 +36,7 @@ import java.util.List;
import java.util.Properties;
import org.apache.phoenix.end2end.BaseOrderByIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.spark.datasource.v2.PhoenixDataSource;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryBuilder;
@@ -44,6 +45,7 @@ import org.apache.spark.sql.Row;
import org.apache.spark.sql.SQLContext;
import org.apache.spark.sql.sources.v2.DataSourceOptions;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.Ignore;
@@ -51,6 +53,7 @@ import org.junit.Ignore;
import scala.Option;
import scala.collection.JavaConverters;
+@Category(ParallelStatsDisabledTest.class)
public class OrderByIT extends BaseOrderByIT {
@Override
diff --git a/phoenix5-spark/src/it/java/org/apache/phoenix/spark/SaltedTableIT.java b/phoenix5-spark/src/it/java/org/apache/phoenix/spark/SaltedTableIT.java
index d72acbd..9f2cc91 100644
--- a/phoenix5-spark/src/it/java/org/apache/phoenix/spark/SaltedTableIT.java
+++ b/phoenix5-spark/src/it/java/org/apache/phoenix/spark/SaltedTableIT.java
@@ -26,9 +26,12 @@ import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.end2end.salted.BaseSaltedTableIT;
import org.apache.phoenix.util.QueryBuilder;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class SaltedTableIT extends BaseSaltedTableIT {
@Override
diff --git a/phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/AggregateIT.java b/phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/AggregateIT.java
index e4b96a3..b00c613 100644
--- a/phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/AggregateIT.java
+++ b/phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/AggregateIT.java
@@ -27,8 +27,11 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import org.apache.phoenix.end2end.BaseAggregateIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.util.QueryBuilder;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class AggregateIT extends BaseAggregateIT {
@Override
diff --git a/phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/DataSourceApiIT.java b/phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/DataSourceApiIT.java
index 774454f..f25a693 100644
--- a/phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/DataSourceApiIT.java
+++ b/phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/DataSourceApiIT.java
@@ -19,6 +19,7 @@ package org.apache.phoenix.spark;
import org.apache.hadoop.conf.Configuration;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.query.ConfigurationFactory;
import org.apache.phoenix.spark.sql.connector.PhoenixDataSource;
import org.apache.phoenix.util.InstanceResolver;
@@ -32,6 +33,7 @@ import org.apache.spark.sql.types.StructType;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.*;
import java.util.Arrays;
@@ -42,6 +44,7 @@ import static org.apache.phoenix.util.PhoenixRuntime.JDBC_PROTOCOL;
import static org.apache.phoenix.util.PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR;
import static org.junit.Assert.*;
+@Category(ParallelStatsDisabledTest.class)
public class DataSourceApiIT extends ParallelStatsDisabledIT {
public DataSourceApiIT() {
diff --git a/phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/OrderByIT.java b/phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/OrderByIT.java
index e7aa424..ee87f45 100644
--- a/phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/OrderByIT.java
+++ b/phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/OrderByIT.java
@@ -36,6 +36,7 @@ import java.util.List;
import java.util.Properties;
import org.apache.phoenix.end2end.BaseOrderByIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.spark.sql.connector.PhoenixDataSource;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryBuilder;
@@ -44,6 +45,7 @@ import org.apache.spark.sql.Row;
import org.apache.spark.sql.SQLContext;
import org.apache.spark.sql.util.CaseInsensitiveStringMap;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.Ignore;
@@ -51,6 +53,7 @@ import org.junit.Ignore;
import scala.Option;
import scala.collection.JavaConverters;
+@Category(ParallelStatsDisabledTest.class)
public class OrderByIT extends BaseOrderByIT {
@Override
diff --git a/phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/SaltedTableIT.java b/phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/SaltedTableIT.java
index d72acbd..9f2cc91 100644
--- a/phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/SaltedTableIT.java
+++ b/phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/SaltedTableIT.java
@@ -26,9 +26,12 @@ import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.end2end.salted.BaseSaltedTableIT;
import org.apache.phoenix.util.QueryBuilder;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class SaltedTableIT extends BaseSaltedTableIT {
@Override