From a658f4aec649d0ea524a76b3fb0fd7424e8223f8 Mon Sep 17 00:00:00 2001 From: Divneet18 Date: Wed, 24 Jul 2024 12:04:48 -0700 Subject: [PATCH] PHOENIX-7211 : Identify IT tests that can be run successfully against real distributed cluster --- BUILDING.md | 8 ++ .../phoenix/end2end/AbsFunctionEnd2EndIT.java | 2 +- .../apache/phoenix/end2end/AggregateIT.java | 2 +- .../phoenix/end2end/AggregateQueryIT.java | 2 +- .../AggregateQueryWithRegionMoves2IT.java | 2 +- .../AggregateQueryWithRegionMovesIT.java | 2 +- .../end2end/AggregateWithRegionMoves2IT.java | 2 +- .../end2end/AggregateWithRegionMovesIT.java | 2 +- .../end2end/AlterAddCascadeIndexIT.java | 2 +- .../phoenix/end2end/AlterSessionIT.java | 2 +- .../apache/phoenix/end2end/AlterTableIT.java | 2 +- .../phoenix/end2end/AppendOnlySchemaIT.java | 2 +- .../phoenix/end2end/ArithmeticQueryIT.java | 2 +- .../org/apache/phoenix/end2end/Array1IT.java | 2 +- .../org/apache/phoenix/end2end/Array2IT.java | 2 +- .../org/apache/phoenix/end2end/Array3IT.java | 2 +- .../end2end/ArrayAppendFunctionIT.java | 2 +- .../end2end/ArrayConcatFunctionIT.java | 2 +- .../phoenix/end2end/ArrayFillFunctionIT.java | 2 +- .../end2end/ArrayPrependFunctionIT.java | 2 +- .../end2end/ArrayRemoveFunctionIT.java | 2 +- .../end2end/ArrayToStringFunctionIT.java | 2 +- .../phoenix/end2end/ArraysWithNullsIT.java | 2 +- .../phoenix/end2end/AuditLoggingIT.java | 2 +- .../apache/phoenix/end2end/AutoCommitIT.java | 2 +- .../phoenix/end2end/AutoPartitionViewsIT.java | 2 +- .../end2end/BackwardCompatibilityIT.java | 2 +- .../BaseAggregateWithRegionMoves2IT.java | 2 +- .../BaseAggregateWithRegionMoves3IT.java | 2 +- .../BaseAggregateWithRegionMoves4IT.java | 2 +- .../apache/phoenix/end2end/BaseViewIT.java | 2 +- .../phoenix/end2end/BinaryRowKeyIT.java | 2 +- .../end2end/BinaryStringLiteralIT.java | 2 +- .../phoenix/end2end/CSVCommonsLoaderIT.java | 2 +- .../phoenix/end2end/CaseStatementIT.java | 2 +- .../phoenix/end2end/CastAndCoerceIT.java | 2 +- .../end2end/CbrtFunctionEnd2EndIT.java | 2 +- .../end2end/ClientHashAggregateIT.java | 4 +- .../phoenix/end2end/CoalesceFunctionIT.java | 2 +- .../end2end/CollationKeyFunctionIT.java | 2 +- .../end2end/ColumnEncodedBytesPropIT.java | 2 +- .../ColumnProjectionOptimizationIT.java | 2 +- .../ConcurrentMutationsExtendedIT.java | 2 +- .../end2end/ConcurrentMutationsIT.java | 19 +--- ...ConcurrentUpsertsWithoutIndexedColsIT.java | 2 +- .../phoenix/end2end/ConfigurableCacheIT.java | 2 +- .../apache/phoenix/end2end/ConnectionIT.java | 2 +- .../phoenix/end2end/ConnectionUtilIT.java | 2 +- .../phoenix/end2end/ContextClassloaderIT.java | 2 +- .../end2end/ConvertTimezoneFunctionIT.java | 2 +- .../phoenix/end2end/CostBasedDecisionIT.java | 2 +- ...CountDistinctApproximateHyperLogLogIT.java | 2 +- .../end2end/CountDistinctCompressionIT.java | 2 +- .../phoenix/end2end/CreateSchemaIT.java | 2 +- .../apache/phoenix/end2end/CreateTableIT.java | 2 +- .../phoenix/end2end/CsvBulkLoadToolIT.java | 2 +- .../CursorWithRowValueConstructorIT.java | 2 +- .../phoenix/end2end/CustomEntityDataIT.java | 2 +- .../phoenix/end2end/DateArithmeticIT.java | 2 +- .../apache/phoenix/end2end/DateTimeIT.java | 2 +- .../phoenix/end2end/DecodeFunctionIT.java | 2 +- .../phoenix/end2end/DefaultColumnValueIT.java | 2 +- ...DefaultPhoenixMultiViewListProviderIT.java | 2 +- .../org/apache/phoenix/end2end/DeleteIT.java | 2 +- .../phoenix/end2end/DerivedTableIT.java | 2 +- .../phoenix/end2end/DescOrderKeysIT.java | 2 +- .../phoenix/end2end/DisableLocalIndexIT.java | 2 +- .../phoenix/end2end/DistinctCountIT.java | 2 +- .../end2end/DistinctPrefixFilterIT.java | 2 +- .../phoenix/end2end/DropIndexedColsIT.java | 2 +- .../apache/phoenix/end2end/DropSchemaIT.java | 2 +- .../apache/phoenix/end2end/DropTableIT.java | 2 +- .../phoenix/end2end/DynamicColumnIT.java | 2 +- .../phoenix/end2end/DynamicFamilyIT.java | 2 +- .../phoenix/end2end/DynamicUpsertIT.java | 2 +- .../apache/phoenix/end2end/EmptyColumnIT.java | 2 +- .../phoenix/end2end/EncodeFunctionIT.java | 2 +- .../phoenix/end2end/EvaluationOfORIT.java | 2 +- .../phoenix/end2end/ExecuteStatementsIT.java | 2 +- .../phoenix/end2end/ExpFunctionEnd2EndIT.java | 2 +- .../ExplainPlanWithStatsDisabledIT.java | 2 +- .../ExplainPlanWithStatsEnabledIT.java | 3 +- .../phoenix/end2end/ExtendedQueryExecIT.java | 2 +- .../phoenix/end2end/FirstValueFunctionIT.java | 2 +- .../end2end/FirstValuesFunctionIT.java | 2 +- .../phoenix/end2end/FlappingAlterTableIT.java | 2 +- .../apache/phoenix/end2end/FunkyNamesIT.java | 2 +- .../GetSetByteBitFunctionEnd2EndIT.java | 2 +- .../phoenix/end2end/GetSetObjectIT.java | 2 +- .../org/apache/phoenix/end2end/GroupByIT.java | 2 +- .../phoenix/end2end/ImmutableTableIT.java | 2 +- .../end2end/ImmutableTablePropertiesIT.java | 2 +- .../org/apache/phoenix/end2end/InListIT.java | 11 +-- .../org/apache/phoenix/end2end/InQueryIT.java | 2 +- .../end2end/IndexBuildTimestampIT.java | 4 +- .../phoenix/end2end/IndexExtendedIT.java | 2 +- .../phoenix/end2end/IndexRebuildTaskIT.java | 2 +- .../end2end/IndexRepairRegionScannerIT.java | 2 +- .../end2end/IndexScrutinyToolForTenantIT.java | 2 +- .../phoenix/end2end/IndexScrutinyToolIT.java | 3 +- .../IndexToolForDeleteBeforeRebuildIT.java | 2 +- .../IndexToolForNonTxGlobalIndexIT.java | 2 +- .../end2end/IndexToolForPartialBuildIT.java | 2 +- ...ForPartialBuildWithNamespaceEnabledIT.java | 2 +- .../apache/phoenix/end2end/IndexToolIT.java | 2 +- .../phoenix/end2end/IndexToolTimeRangeIT.java | 2 +- .../phoenix/end2end/IndexUpgradeToolIT.java | 2 +- .../end2end/IndexVerificationOldDesignIT.java | 2 +- .../end2end/IndexWithDefaultValueIT.java | 2 +- .../phoenix/end2end/InstrFunctionIT.java | 2 +- .../phoenix/end2end/IntArithmeticIT.java | 2 +- .../org/apache/phoenix/end2end/IsNullIT.java | 2 +- .../org/apache/phoenix/end2end/KeyOnlyIT.java | 4 +- .../phoenix/end2end/LastValueFunctionIT.java | 2 +- .../phoenix/end2end/LastValuesFunctionIT.java | 2 +- .../phoenix/end2end/LikeExpressionIT.java | 2 +- .../end2end/LnLogFunctionEnd2EndIT.java | 2 +- .../end2end/LocalIndexSplitMergeIT.java | 2 +- .../end2end/LogicalTableNameExtendedIT.java | 4 +- .../phoenix/end2end/LogicalTableNameIT.java | 3 +- .../apache/phoenix/end2end/MD5FunctionIT.java | 2 +- .../apache/phoenix/end2end/MapReduceIT.java | 2 +- .../end2end/MappingTableDataTypeIT.java | 2 +- .../end2end/MathPIFunctionEnd2EndIT.java | 2 +- .../end2end/MathTrigFunctionEnd2EndIT.java | 2 +- .../end2end/MaxLookbackExtendedIT.java | 2 +- .../apache/phoenix/end2end/MaxLookbackIT.java | 2 +- .../MergeViewIndexIdSequencesToolIT.java | 2 +- .../phoenix/end2end/MetaDataEndPointIT.java | 2 +- .../end2end/MetaDataEndpointImplIT.java | 2 +- ...igrateSystemTablesToSystemNamespaceIT.java | 2 +- .../end2end/MinMaxAggregateFunctionIT.java | 2 +- .../phoenix/end2end/ModulusExpressionIT.java | 2 +- .../phoenix/end2end/MultiCfQueryExecIT.java | 2 +- ...BatchFailedStateMetricWithAllDeleteIT.java | 2 +- ...BatchFailedStateMetricWithAllUpsertIT.java | 2 +- ...ailedStateMetricWithDeleteAndUpsertIT.java | 2 +- .../phoenix/end2end/MutationStateIT.java | 3 +- .../end2end/NamespaceSchemaMappingIT.java | 2 +- .../phoenix/end2end/NativeHBaseTypesIT.java | 2 +- .../NoLookbackMutableIndexExtendedIT.java | 2 +- .../NotQueryWithGlobalImmutableIndexesIT.java | 2 +- .../NotQueryWithLocalImmutableIndexesIT.java | 2 +- .../phoenix/end2end/NthValueFunctionIT.java | 2 +- .../org/apache/phoenix/end2end/NullIT.java | 2 +- .../phoenix/end2end/NumericArithmeticIT.java | 2 +- .../end2end/OctetLengthFunctionEnd2EndIT.java | 2 +- .../phoenix/end2end/OnDuplicateKeyIT.java | 2 +- .../end2end/OperationTimeoutWithReasonIT.java | 2 +- .../org/apache/phoenix/end2end/OrderByIT.java | 2 +- ...rByWithServerClientSpoolingDisabledIT.java | 2 +- .../OrderByWithServerMemoryLimitIT.java | 2 +- .../end2end/OrderByWithSpillingIT.java | 2 +- .../phoenix/end2end/OrphanViewToolIT.java | 2 +- .../phoenix/end2end/ParallelIteratorsIT.java | 2 +- .../end2end/ParallelStatsDisabledIT.java | 1 + .../ParameterizedIndexUpgradeToolIT.java | 2 +- .../PartialResultServerConfigurationIT.java | 2 +- .../PartialScannerResultsDisabledIT.java | 2 +- .../apache/phoenix/end2end/PercentileIT.java | 2 +- .../end2end/PermissionNSDisabledIT.java | 2 +- ...SDisabledWithCustomAccessControllerIT.java | 2 +- .../end2end/PermissionNSEnabledIT.java | 2 +- ...NSEnabledWithCustomAccessControllerIT.java | 2 +- .../phoenix/end2end/PermissionsCacheIT.java | 2 +- .../phoenix/end2end/PhoenixDriverIT.java | 2 +- .../PhoenixRowTimestampFunctionIT.java | 2 +- .../phoenix/end2end/PhoenixRuntimeIT.java | 2 +- .../phoenix/end2end/PhoenixTTLToolIT.java | 2 +- .../phoenix/end2end/PointInTimeQueryIT.java | 2 +- .../end2end/PointInTimeScanQueryIT.java | 2 +- .../end2end/PowerFunctionEnd2EndIT.java | 2 +- .../end2end/PreMatureTimelyAbortScanIt.java | 2 +- .../phoenix/end2end/PrimitiveTypeIT.java | 2 +- .../phoenix/end2end/ProductMetricsIT.java | 2 +- .../ProjectArrayElemAfterHashJoinIT.java | 2 +- .../phoenix/end2end/PropertiesInSyncIT.java | 2 +- .../end2end/QueryDatabaseMetaDataIT.java | 2 +- .../end2end/QueryExecWithoutSCNIT.java | 2 +- .../org/apache/phoenix/end2end/QueryIT.java | 4 +- .../apache/phoenix/end2end/QueryLoggerIT.java | 2 +- .../apache/phoenix/end2end/QueryMoreIT.java | 2 +- .../phoenix/end2end/QueryTimeoutIT.java | 2 +- .../phoenix/end2end/QueryWithLimitIT.java | 4 +- .../phoenix/end2end/QueryWithOffsetIT.java | 2 +- .../end2end/QueryWithTableSampleIT.java | 2 +- .../phoenix/end2end/RTrimFunctionIT.java | 2 +- .../apache/phoenix/end2end/RangeScanIT.java | 2 +- .../phoenix/end2end/ReadIsolationLevelIT.java | 2 +- .../apache/phoenix/end2end/ReadOnlyIT.java | 2 +- .../end2end/ReadOnlyViewOnReadOnlyIT.java | 2 +- .../RebuildIndexConnectionPropsIT.java | 2 +- .../phoenix/end2end/RegexBulkLoadToolIT.java | 2 +- .../end2end/RegexpReplaceFunctionIT.java | 2 +- .../end2end/RegexpSplitFunctionIT.java | 2 +- .../end2end/RegexpSubstrFunctionIT.java | 2 +- .../apache/phoenix/end2end/RenewLeaseIT.java | 2 +- .../phoenix/end2end/ReverseFunctionIT.java | 2 +- .../apache/phoenix/end2end/ReverseScanIT.java | 2 +- .../phoenix/end2end/RoundFloorCeilFuncIT.java | 4 +- .../end2end/RowKeyBytesStringFunctionIT.java | 2 +- .../phoenix/end2end/RowTimestampIT.java | 2 +- .../end2end/RowValueConstructorIT.java | 2 +- .../end2end/RowValueConstructorOffsetIT.java | 2 +- .../RowValueConstructorOffsetOptionalIT.java | 2 +- .../org/apache/phoenix/end2end/SCNIT.java | 3 +- .../ScanUncommittedWithRegionMovesIT.java | 2 +- .../end2end/SchemaRegistryFailureIT.java | 4 +- .../end2end/SequenceBulkAllocationIT.java | 2 +- .../apache/phoenix/end2end/SequenceIT.java | 3 +- .../end2end/SequencePointInTimeIT.java | 2 +- .../phoenix/end2end/SerialIteratorsIT.java | 2 +- .../phoenix/end2end/ServerExceptionIT.java | 2 +- .../phoenix/end2end/ServerPagingIT.java | 2 +- .../ServerPagingWithRegionMovesIT.java | 2 +- .../end2end/SetPropertyOnEncodedTableIT.java | 2 +- .../SetPropertyOnNonEncodedTableIT.java | 2 +- .../phoenix/end2end/ShowCreateTableIT.java | 2 +- .../end2end/SignFunctionEnd2EndIT.java | 2 +- .../end2end/SkipScanAfterManualSplitIT.java | 2 +- .../phoenix/end2end/SkipScanQueryIT.java | 4 +- .../phoenix/end2end/SortMergeJoinMoreIT.java | 2 +- .../apache/phoenix/end2end/SortOrderIT.java | 2 +- .../end2end/SortOrderWithRegionMoves2IT.java | 2 +- .../end2end/SortOrderWithRegionMovesIT.java | 2 +- .../phoenix/end2end/SpillableGroupByIT.java | 2 +- .../end2end/SpooledTmpFileDeleteIT.java | 2 +- .../end2end/SqrtFunctionEnd2EndIT.java | 2 +- .../phoenix/end2end/StatementHintsIT.java | 2 +- .../StatsEnabledSplitSystemCatalogIT.java | 2 +- .../org/apache/phoenix/end2end/StddevIT.java | 2 +- .../apache/phoenix/end2end/StoreNullsIT.java | 2 +- .../phoenix/end2end/StoreNullsPropIT.java | 2 +- .../org/apache/phoenix/end2end/StringIT.java | 2 +- .../end2end/StringToArrayFunctionIT.java | 2 +- .../apache/phoenix/end2end/SumFunctionIT.java | 2 +- .../SupportsDistributedClusterTest.java | 34 +++++++ .../SystemCatalogRegionObserverIT.java | 2 +- .../SystemCatalogRollbackEnabledIT.java | 2 +- .../SystemTablesCreationOnConnectionIT.java | 2 +- .../TableSnapshotReadsMapReduceIT.java | 2 +- .../apache/phoenix/end2end/TableTTLIT.java | 2 +- .../phoenix/end2end/TenantIdTypeIT.java | 2 +- .../end2end/TenantSpecificTablesDDLIT.java | 3 +- .../end2end/TenantSpecificTablesDMLIT.java | 2 +- .../end2end/TenantSpecificViewIndexIT.java | 2 +- .../TenantSpecificViewIndexSaltedIT.java | 2 +- .../end2end/TimeZoneDisplacementIT.java | 2 +- .../end2end/TimezoneOffsetFunctionIT.java | 2 +- .../phoenix/end2end/ToCharFunctionIT.java | 2 +- .../phoenix/end2end/ToDateFunctionIT.java | 2 +- .../phoenix/end2end/ToNumberFunctionIT.java | 2 +- .../org/apache/phoenix/end2end/TopNIT.java | 2 +- .../phoenix/end2end/TransactionalViewIT.java | 2 +- .../phoenix/end2end/TruncateFunctionIT.java | 2 +- .../UncoveredIndexWithRegionMovesIT.java | 2 +- .../apache/phoenix/end2end/UngroupedIT.java | 2 +- .../apache/phoenix/end2end/UnionAllIT.java | 2 +- .../apache/phoenix/end2end/UnnestArrayIT.java | 2 +- .../UpdateCacheAcrossDifferentClientsIT.java | 2 +- .../org/apache/phoenix/end2end/UpgradeIT.java | 2 +- .../phoenix/end2end/UpgradeNamespaceIT.java | 3 +- .../phoenix/end2end/UpperLowerFunctionIT.java | 2 +- .../phoenix/end2end/UpsertBigValuesIT.java | 2 +- .../end2end/UpsertSelectAutoCommitIT.java | 2 +- .../phoenix/end2end/UpsertSelectIT.java | 2 +- .../UpsertSelectWithRegionMovesIT.java | 2 +- .../phoenix/end2end/UpsertValuesIT.java | 3 +- .../phoenix/end2end/UpsertWithSCNIT.java | 2 +- .../apache/phoenix/end2end/UseSchemaIT.java | 2 +- .../end2end/UserDefinedFunctionsIT.java | 2 +- .../phoenix/end2end/VariableLengthPKIT.java | 2 +- .../end2end/ViewConcurrencyAndFailureIT.java | 2 +- .../end2end/ViewExtendsPkRestrictionsIT.java | 2 +- .../org/apache/phoenix/end2end/ViewIT.java | 2 +- .../end2end/ViewIndexIdRetrieveIT.java | 2 +- .../phoenix/end2end/ViewMetadataIT.java | 2 +- .../org/apache/phoenix/end2end/ViewTTLIT.java | 2 +- .../phoenix/end2end/ViewTTLNotEnabledIT.java | 2 +- .../apache/phoenix/end2end/ViewUtilIT.java | 2 +- .../phoenix/end2end/WALAnnotationIT.java | 2 +- .../apache/phoenix/PhoenixTestTableName.java | 57 +++++++++++ .../org/apache/phoenix/query/BaseTest.java | 95 ++++++++++++++++--- pom.xml | 13 ++- 284 files changed, 475 insertions(+), 342 deletions(-) create mode 100644 phoenix-core/src/it/java/org/apache/phoenix/end2end/SupportsDistributedClusterTest.java create mode 100644 phoenix-core/src/test/java/org/apache/phoenix/PhoenixTestTableName.java diff --git a/BUILDING.md b/BUILDING.md index ed148c58879..b178aafbb38 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -136,6 +136,14 @@ Note that the dependency check report generation is only enabled when run on Jav The reports are accessible via `target/site/index.html`, under the main project, as well as each of the subprojects. (not every project has all reports) +Running tests on local cluster +----------------------- + +Run IT tests part of a defined execution goal in pom.xml (e.g SignOffTests) +`$ mvn failsafe:integration-test@SignOffTests failsafe:verify@SignOffTests -Dhbase.profile=2.5 +-Dskip.code-coverage -Dmaven.test.failure.ignore=true -Dhbase.test.cluster.distributed=true +-Dhbase.zookeeper.quorum=localhost -Dhbase.zookeeper.property.clientPort=2181` + Generate Apache Web Site ------------------------ diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java index 0728a4a1acc..ea1c578d1be 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java @@ -35,7 +35,7 @@ /** * End to end tests for {@link AbsFunction} */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class AbsFunctionEnd2EndIT extends ParallelStatsDisabledIT { private static final String TABLE_NAME = generateUniqueName(); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateIT.java index 5d1a64f402a..bfcb055f715 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateIT.java @@ -39,7 +39,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class AggregateIT extends BaseAggregateIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryIT.java index 6cf51d11949..052ba455e8f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryIT.java @@ -48,7 +48,7 @@ import org.junit.experimental.categories.Category; import org.junit.runners.Parameterized.Parameters; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class AggregateQueryIT extends BaseQueryIT { @Parameters(name="AggregateQueryIT_{index}") // name is used by failsafe as file name in reports diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryWithRegionMoves2IT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryWithRegionMoves2IT.java index 20066ab3224..9a60db5bb22 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryWithRegionMoves2IT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryWithRegionMoves2IT.java @@ -38,7 +38,7 @@ import java.util.HashMap; import java.util.Map; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class AggregateQueryWithRegionMoves2IT extends AggregateQueryWithRegionMovesIT { private static final Logger LOGGER = diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryWithRegionMovesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryWithRegionMovesIT.java index ee1aae8f87b..03e58450711 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryWithRegionMovesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryWithRegionMovesIT.java @@ -51,7 +51,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class AggregateQueryWithRegionMovesIT extends BaseQueryWithRegionMovesIT { @Parameters(name = "AggregateQueryWithRegionMovesIT_{index}") diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateWithRegionMoves2IT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateWithRegionMoves2IT.java index 6bd47b8f00a..0e0f79c5116 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateWithRegionMoves2IT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateWithRegionMoves2IT.java @@ -36,7 +36,7 @@ import java.util.HashMap; import java.util.Map; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class AggregateWithRegionMoves2IT extends AggregateWithRegionMovesIT { private static final Logger LOGGER = diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateWithRegionMovesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateWithRegionMovesIT.java index e07bcb0d110..d647a8ecf68 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateWithRegionMovesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateWithRegionMovesIT.java @@ -40,7 +40,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class AggregateWithRegionMovesIT extends BaseAggregateWithRegionMovesIT { @Before diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterAddCascadeIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterAddCascadeIndexIT.java index 84aa678ee85..a22b497f1bc 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterAddCascadeIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterAddCascadeIndexIT.java @@ -58,7 +58,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) @RunWith(Parameterized.class) public class AlterAddCascadeIndexIT extends ParallelStatsDisabledIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterSessionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterSessionIT.java index a39db134386..316fe364fe8 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterSessionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterSessionIT.java @@ -41,7 +41,7 @@ * Basic tests for Alter Session Statements * */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class AlterSessionIT extends ParallelStatsDisabledIT { private String tableName; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java index 5648d0409c9..86dfdedc1bf 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java @@ -99,7 +99,7 @@ * or at the end of test class. * */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) @RunWith(Parameterized.class) public class AlterTableIT extends ParallelStatsDisabledIT { private String schemaName; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java index dba8c650451..69f144c1a4a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java @@ -63,7 +63,7 @@ import org.mockito.AdditionalMatchers; import org.mockito.Mockito; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class AppendOnlySchemaIT extends ParallelStatsDisabledIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java index d6acd099bd7..ed3fd4818b1 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java @@ -40,7 +40,7 @@ import org.apache.phoenix.thirdparty.com.google.common.primitives.Floats; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ArithmeticQueryIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/Array1IT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/Array1IT.java index f5e95877833..084f155c3b0 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/Array1IT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/Array1IT.java @@ -43,7 +43,7 @@ import org.junit.experimental.categories.Category; import org.apache.phoenix.thirdparty.com.google.common.primitives.Floats; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class Array1IT extends ArrayIT { private void assertArrayGetString(ResultSet rs, int arrayIndex, Array expectedArray, String expectedString) throws SQLException { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/Array2IT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/Array2IT.java index 6a533d4b08d..41785bf9e87 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/Array2IT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/Array2IT.java @@ -41,7 +41,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class Array2IT extends ArrayIT { private static final String TEST_QUERY = "select ?[2] from \"SYSTEM\".\"CATALOG\" limit 1"; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/Array3IT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/Array3IT.java index 7dde87bfbce..4c593936246 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/Array3IT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/Array3IT.java @@ -34,7 +34,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class Array3IT extends ArrayIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java index b86bac96224..a6977ca01c2 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java @@ -32,7 +32,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ArrayAppendFunctionIT extends ParallelStatsDisabledIT { private String initTables(Connection conn) throws Exception { String tableName = generateUniqueName(); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayConcatFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayConcatFunctionIT.java index 1775030470f..caed76a877b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayConcatFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayConcatFunctionIT.java @@ -32,7 +32,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ArrayConcatFunctionIT extends ParallelStatsDisabledIT { private String initTables(Connection conn) throws Exception { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayFillFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayFillFunctionIT.java index 8a7da7e4db1..18b74e877a6 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayFillFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayFillFunctionIT.java @@ -36,7 +36,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ArrayFillFunctionIT extends ParallelStatsDisabledIT { private String tableName; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayPrependFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayPrependFunctionIT.java index a04afe0a378..0e2ec55952d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayPrependFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayPrependFunctionIT.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT { private void initTableWithVarArray(Connection conn, String tableName, String type, Object[] objectArray, String value) throws SQLException { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayRemoveFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayRemoveFunctionIT.java index f8015c56085..cc8440fba3c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayRemoveFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayRemoveFunctionIT.java @@ -32,7 +32,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ArrayRemoveFunctionIT extends ParallelStatsDisabledIT { private Connection conn; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayToStringFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayToStringFunctionIT.java index f5524acb5cb..77b7b7c64e9 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayToStringFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayToStringFunctionIT.java @@ -30,7 +30,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ArrayToStringFunctionIT extends ParallelStatsDisabledIT { private String tableName; private Connection conn; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArraysWithNullsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArraysWithNullsIT.java index 22743b42b58..11732a4de2e 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArraysWithNullsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArraysWithNullsIT.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ArraysWithNullsIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AuditLoggingIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AuditLoggingIT.java index 14e24f09dd4..d4b5fce3716 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AuditLoggingIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AuditLoggingIT.java @@ -31,7 +31,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class AuditLoggingIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java index a9228b736ea..d7b77cfd910 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java @@ -33,7 +33,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class AutoCommitIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoPartitionViewsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoPartitionViewsIT.java index 590ec7636f1..18f3f520239 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoPartitionViewsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoPartitionViewsIT.java @@ -47,7 +47,7 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) @RunWith(Parameterized.class) public class AutoPartitionViewsIT extends ParallelStatsDisabledIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BackwardCompatibilityIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BackwardCompatibilityIT.java index 6348497119a..41bad14dde1 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BackwardCompatibilityIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BackwardCompatibilityIT.java @@ -88,7 +88,7 @@ */ @RunWith(Parameterized.class) -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class BackwardCompatibilityIT { private static final Logger LOGGER = LoggerFactory.getLogger( diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateWithRegionMoves2IT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateWithRegionMoves2IT.java index 2e6c15a6515..362a0a976c0 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateWithRegionMoves2IT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateWithRegionMoves2IT.java @@ -49,7 +49,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class BaseAggregateWithRegionMoves2IT extends ParallelStatsDisabledWithRegionMovesIT { @Before diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateWithRegionMoves3IT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateWithRegionMoves3IT.java index 7e8caf90c07..b88c9ee3b91 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateWithRegionMoves3IT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateWithRegionMoves3IT.java @@ -36,7 +36,7 @@ import java.util.HashMap; import java.util.Map; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class BaseAggregateWithRegionMoves3IT extends BaseAggregateWithRegionMoves2IT { private static final Logger LOGGER = diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateWithRegionMoves4IT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateWithRegionMoves4IT.java index cab93de4e25..3558b925359 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateWithRegionMoves4IT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateWithRegionMoves4IT.java @@ -42,7 +42,7 @@ import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class BaseAggregateWithRegionMoves4IT extends BaseAggregateWithRegionMoves2IT { private static final Logger LOGGER = diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java index 112aa6be747..839a5caeaad 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java @@ -53,7 +53,7 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -@Category(ParallelStatsEnabledTest.class) +@Category({ParallelStatsEnabledTest.class}) @RunWith(Parameterized.class) public abstract class BaseViewIT extends ParallelStatsEnabledIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java index 76ec18825e3..a93bff29061 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java @@ -35,7 +35,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class BinaryRowKeyIT extends ParallelStatsDisabledIT { private static void initTableValues(String tableName) throws SQLException { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryStringLiteralIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryStringLiteralIT.java index a6632166d88..3c54c9fae74 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryStringLiteralIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryStringLiteralIT.java @@ -27,7 +27,7 @@ /** * End to end tests for Hexadecimal and Binary literals */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class BinaryStringLiteralIT extends ParallelStatsDisabledIT { private static String EMPTY = ""; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java index 0e5e7f5a128..bba26c9a046 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java @@ -51,7 +51,7 @@ import org.junit.experimental.categories.Category; import org.junit.rules.TemporaryFolder; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class CSVCommonsLoaderIT extends ParallelStatsDisabledIT { private static final String DATATYPE_TABLE = "DATATYPE"; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java index 5fbb1c9a93b..e24ecb67ec0 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java @@ -53,7 +53,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Lists; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) @RunWith(Parameterized.class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class CaseStatementIT extends BaseQueryIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java index d5183c36da5..9537e3b8323 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java @@ -40,7 +40,7 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) @RunWith(Parameterized.class) public class CastAndCoerceIT extends BaseQueryIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CbrtFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CbrtFunctionEnd2EndIT.java index 2675df8e013..3f8b4b35f87 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CbrtFunctionEnd2EndIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CbrtFunctionEnd2EndIT.java @@ -34,7 +34,7 @@ /** * End to end tests for {@link CbrtFunction} */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class CbrtFunctionEnd2EndIT extends ParallelStatsDisabledIT { private static final String KEY = "key"; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientHashAggregateIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientHashAggregateIT.java index c071b7a836d..95864da4014 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientHashAggregateIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientHashAggregateIT.java @@ -34,7 +34,9 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) +//@Category(ParallelStatsDisabledTest.class) + public class ClientHashAggregateIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java index 9c42c79397e..736357ffa06 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java @@ -46,7 +46,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class CoalesceFunctionIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CollationKeyFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CollationKeyFunctionIT.java index d0acb6b94dc..0ec591f2456 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CollationKeyFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CollationKeyFunctionIT.java @@ -35,7 +35,7 @@ * End2End test that tests the COLLATION_KEY in an ORDER BY clause * */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class CollationKeyFunctionIT extends ParallelStatsDisabledIT { private String tableName; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedBytesPropIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedBytesPropIT.java index c44db76a59e..745ad7afbc8 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedBytesPropIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedBytesPropIT.java @@ -45,7 +45,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ColumnEncodedBytesPropIT extends ParallelStatsDisabledIT { private String generateColsDDL(int numCols) { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnProjectionOptimizationIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnProjectionOptimizationIT.java index a26100a4596..4aaf940d0c2 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnProjectionOptimizationIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnProjectionOptimizationIT.java @@ -60,7 +60,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ColumnProjectionOptimizationIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsExtendedIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsExtendedIT.java index 91802ab49ca..23d903c091d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsExtendedIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsExtendedIT.java @@ -59,7 +59,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) @RunWith(Parameterized.class) public class ConcurrentMutationsExtendedIT extends ParallelStatsDisabledIT { private static final Logger LOGGER = diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsIT.java index 8a3dc5e1367..e3f3719d1b7 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsIT.java @@ -22,32 +22,17 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import java.io.IOException; import java.sql.Connection; import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.sql.SQLException; import java.sql.Timestamp; import java.util.Properties; -import java.util.Random; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - -import org.apache.hadoop.hbase.DoNotRetryIOException; -import org.apache.hadoop.hbase.HBaseIOException; -import org.apache.hadoop.hbase.client.Mutation; -import org.apache.hadoop.hbase.coprocessor.ObserverContext; -import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; -import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver; -import org.apache.hadoop.hbase.regionserver.MiniBatchOperationInProgress; -import org.apache.hadoop.hbase.util.Bytes; -import org.apache.phoenix.jdbc.PhoenixConnection; + import org.apache.phoenix.util.EnvironmentEdge; import org.apache.phoenix.util.EnvironmentEdgeManager; import org.apache.phoenix.util.IndexScrutiny; import org.apache.phoenix.util.PropertiesUtil; -import org.apache.phoenix.util.Repeat; import org.apache.phoenix.util.RunUntilFailure; import org.apache.phoenix.util.TestUtil; import org.junit.Ignore; @@ -55,7 +40,7 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) @RunWith(RunUntilFailure.class) public class ConcurrentMutationsIT extends ParallelStatsDisabledIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentUpsertsWithoutIndexedColsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentUpsertsWithoutIndexedColsIT.java index 55a4d3c3f2c..81db37dbc26 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentUpsertsWithoutIndexedColsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentUpsertsWithoutIndexedColsIT.java @@ -47,7 +47,7 @@ import static org.junit.Assert.assertTrue; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) @RunWith(RunUntilFailure.class) public class ConcurrentUpsertsWithoutIndexedColsIT extends BaseTest { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConfigurableCacheIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConfigurableCacheIT.java index eca73ce50bf..f2748c31f06 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConfigurableCacheIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConfigurableCacheIT.java @@ -32,7 +32,7 @@ * use a class ITGuidePostsCacheFactory which is for testing only that keeps track of the number * of cache instances generated. */ -@Category(ParallelStatsEnabledTest.class) +@Category({ParallelStatsEnabledTest.class}) public class ConfigurableCacheIT extends ParallelStatsEnabledIT { static String table; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionIT.java index 1edc4b9843a..d216c0d3e4c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionIT.java @@ -46,7 +46,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class ConnectionIT { private static HBaseTestingUtility hbaseTestUtil; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionUtilIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionUtilIT.java index d8454a8ff53..e4f3a449e46 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionUtilIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionUtilIT.java @@ -37,7 +37,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class ConnectionUtilIT { private static HBaseTestingUtility hbaseTestUtil; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ContextClassloaderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ContextClassloaderIT.java index 9592e47498c..cef37a5b0c1 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ContextClassloaderIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ContextClassloaderIT.java @@ -46,7 +46,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class ContextClassloaderIT extends BaseTest { private static HBaseTestingUtility hbaseTestUtil; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java index 183c1a36ab6..8dad9d33de5 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java @@ -37,7 +37,7 @@ * */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ConvertTimezoneFunctionIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CostBasedDecisionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CostBasedDecisionIT.java index a76c40962e5..9e9c7298251 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CostBasedDecisionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CostBasedDecisionIT.java @@ -42,7 +42,7 @@ import org.junit.experimental.categories.Category; import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class CostBasedDecisionIT extends BaseTest { private final String testTable500; private final String testTable990; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctApproximateHyperLogLogIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctApproximateHyperLogLogIT.java index 03a3d576b8b..90f5eb11691 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctApproximateHyperLogLogIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctApproximateHyperLogLogIT.java @@ -32,7 +32,7 @@ import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES; import static org.junit.Assert.*; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class CountDistinctApproximateHyperLogLogIT extends ParallelStatsDisabledIT { private String tableName; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctCompressionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctCompressionIT.java index e530d752528..bdcaf4a3240 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctCompressionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctCompressionIT.java @@ -40,7 +40,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class CountDistinctCompressionIT extends BaseTest { @BeforeClass public static synchronized void doSetup() throws Exception { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateSchemaIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateSchemaIT.java index 0396d6401a4..8c758c45252 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateSchemaIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateSchemaIT.java @@ -38,7 +38,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class CreateSchemaIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java index bf3bb26fc06..6d5d0766822 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java @@ -94,7 +94,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class CreateTableIT extends ParallelStatsDisabledIT { @BeforeClass diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java index 86acbe1df3c..b791916c526 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java @@ -55,7 +55,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class CsvBulkLoadToolIT extends BaseOwnClusterIT { private static Connection conn; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CursorWithRowValueConstructorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CursorWithRowValueConstructorIT.java index 12aa43b1305..86f96eadb62 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CursorWithRowValueConstructorIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CursorWithRowValueConstructorIT.java @@ -55,7 +55,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class CursorWithRowValueConstructorIT extends ParallelStatsDisabledIT { private String tableName = generateUniqueName(); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java index 182570776ac..8821d121518 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java @@ -38,7 +38,7 @@ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class CustomEntityDataIT extends ParallelStatsDisabledIT { private static void initTableValues(Connection conn, String tenantId, String tableName) throws Exception { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateArithmeticIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateArithmeticIT.java index 312c3ec62ca..4b176f5f148 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateArithmeticIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateArithmeticIT.java @@ -47,7 +47,7 @@ import org.junit.experimental.categories.Category; import org.apache.phoenix.thirdparty.com.google.common.collect.Lists; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class DateArithmeticIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java index 09405844623..6f692f61c8b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java @@ -85,7 +85,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class DateTimeIT extends ParallelStatsDisabledIT { private static final String PRODUCT_METRICS_NAME = "PRODUCT_METRICS"; private static final Date SPLIT1 = toDate("1970-01-01 01:30:00"); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java index f4e949958cb..1754a0eb54d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java @@ -37,7 +37,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class DecodeFunctionIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultColumnValueIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultColumnValueIT.java index 9231eed48cc..4a705e49e9f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultColumnValueIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultColumnValueIT.java @@ -42,7 +42,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class DefaultColumnValueIT extends ParallelStatsDisabledIT { private String sharedTable1; private String sharedTable2; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultPhoenixMultiViewListProviderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultPhoenixMultiViewListProviderIT.java index 1e69e3a0489..2c34bc26772 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultPhoenixMultiViewListProviderIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultPhoenixMultiViewListProviderIT.java @@ -40,7 +40,7 @@ * TODO:- To enable this test after re-enabling TTL for view for more info check :- PHOENIX-6978 */ @Ignore -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class DefaultPhoenixMultiViewListProviderIT extends ParallelStatsDisabledIT { private final String BASE_TABLE_DDL = "CREATE TABLE %s (TENANT_ID CHAR(10) NOT NULL, " + "ID CHAR(10) NOT NULL, NUM BIGINT CONSTRAINT " + diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java index bfd96df678d..bd7d8f1ab90 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java @@ -69,7 +69,7 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) @RunWith(Parameterized.class) public class DeleteIT extends ParallelStatsDisabledIT { private static final int NUMBER_OF_ROWS = 20; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java index b86b75cee15..613d2dc9a2e 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java @@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) @RunWith(Parameterized.class) public class DerivedTableIT extends ParallelStatsDisabledIT { private static final String tenantId = getOrganizationId(); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DescOrderKeysIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DescOrderKeysIT.java index 8fb2ee5cb34..b8919b6a716 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DescOrderKeysIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DescOrderKeysIT.java @@ -30,7 +30,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class DescOrderKeysIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DisableLocalIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DisableLocalIndexIT.java index a14fd059be4..f50c6d42a38 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DisableLocalIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DisableLocalIndexIT.java @@ -40,7 +40,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class DisableLocalIndexIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctCountIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctCountIT.java index 9463d041c8f..919ad8375c3 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctCountIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctCountIT.java @@ -51,7 +51,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class DistinctCountIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java index 76a39a0a930..5b15a3aece1 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java @@ -36,7 +36,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class DistinctPrefixFilterIT extends ParallelStatsDisabledIT { private static final String PREFIX = "SERVER DISTINCT PREFIX"; private String testTableF; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DropIndexedColsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DropIndexedColsIT.java index be020b267d1..367f6d3a4e4 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DropIndexedColsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DropIndexedColsIT.java @@ -40,7 +40,7 @@ import static org.apache.phoenix.util.PhoenixRuntime.TENANT_ID_ATTRIB; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) @RunWith(Parameterized.class) public class DropIndexedColsIT extends SplitSystemCatalogIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DropSchemaIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DropSchemaIT.java index f3340c91ae7..e51e47437bf 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DropSchemaIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DropSchemaIT.java @@ -49,7 +49,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) @RunWith(Parameterized.class) public class DropSchemaIT extends BaseTest { private String schema; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DropTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DropTableIT.java index 3c8c45bd0c6..ba845b9c6f5 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DropTableIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DropTableIT.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class DropTableIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnIT.java index a2df06060d4..08556eefa1f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnIT.java @@ -58,7 +58,7 @@ */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class DynamicColumnIT extends ParallelStatsDisabledIT { private static final byte[] FAMILY_NAME_A = Bytes.toBytes(SchemaUtil.normalizeIdentifier("A")); private static final byte[] FAMILY_NAME_B = Bytes.toBytes(SchemaUtil.normalizeIdentifier("B")); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java index 7ebde4ab178..63424a4d7a4 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java @@ -63,7 +63,7 @@ value="RV_RETURN_VALUE_IGNORED", justification="Designed to ignore.") -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class DynamicFamilyIT extends ParallelStatsDisabledIT { private static final String WEB_STATS = generateUniqueName(); private static final String WEB_STATS_SCHEMA_NAME = ""; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java index 16ccb6a7c20..bb88edde21d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java @@ -47,7 +47,7 @@ */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class DynamicUpsertIT extends ParallelStatsDisabledIT { private String tableName; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/EmptyColumnIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/EmptyColumnIT.java index 515e315c2f7..f0368f74787 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/EmptyColumnIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/EmptyColumnIT.java @@ -74,7 +74,7 @@ * 2. Behavior under different CF's combinations. * 3. Behavior under different COLUMN ENCODINGS */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class EmptyColumnIT extends ParallelStatsDisabledIT { private static final Logger LOGGER = LoggerFactory.getLogger(EmptyColumnIT.class); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/EncodeFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/EncodeFunctionIT.java index 6d6095a05c0..0b7a719fe2f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/EncodeFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/EncodeFunctionIT.java @@ -36,7 +36,7 @@ import org.junit.experimental.categories.Category; import org.apache.phoenix.thirdparty.com.google.common.collect.Lists; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class EncodeFunctionIT extends ParallelStatsDisabledIT { /** diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java index e859b4e1451..673174e0700 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java @@ -34,7 +34,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class EvaluationOfORIT extends ParallelStatsDisabledIT{ @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java index db44fbc8e30..a12b36aefdb 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java @@ -47,7 +47,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ExecuteStatementsIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExpFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExpFunctionEnd2EndIT.java index 4c59ad4e363..77a759625c6 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExpFunctionEnd2EndIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExpFunctionEnd2EndIT.java @@ -35,7 +35,7 @@ /** * End to end tests for {@link ExpFunction} */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class ExpFunctionEnd2EndIT extends ParallelStatsDisabledIT { private static final String KEY = "key"; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExplainPlanWithStatsDisabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExplainPlanWithStatsDisabledIT.java index 3928f386eae..0cf3a9b9a5d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExplainPlanWithStatsDisabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExplainPlanWithStatsDisabledIT.java @@ -45,7 +45,7 @@ * This class has tests for asserting the bytes and rows information exposed in the explain plan * when statistics are disabled. */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ExplainPlanWithStatsDisabledIT extends ParallelStatsDisabledIT { private static void initData(Connection conn, String tableName) throws Exception { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExplainPlanWithStatsEnabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExplainPlanWithStatsEnabledIT.java index 74c5fac1cd5..97a540318d0 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExplainPlanWithStatsEnabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExplainPlanWithStatsEnabledIT.java @@ -37,7 +37,6 @@ import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.jdbc.PhoenixResultSet; -import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil; import org.apache.phoenix.schema.PTable; import org.apache.phoenix.schema.PTableKey; import org.apache.phoenix.schema.TableNotFoundException; @@ -57,7 +56,7 @@ * This class has tests for asserting the bytes and rows information exposed in the explain plan * when statistics are enabled. */ -@Category(ParallelStatsEnabledTest.class) +@Category({ParallelStatsEnabledTest.class}) public class ExplainPlanWithStatsEnabledIT extends ParallelStatsEnabledIT { private static String tableA; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java index 9add3a31238..95783633809 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java @@ -41,7 +41,7 @@ * */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ExtendedQueryExecIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java index 78a616f1606..4af5c8a1c74 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class FirstValueFunctionIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValuesFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValuesFunctionIT.java index 2ebd46e2597..6612f2c1dab 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValuesFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValuesFunctionIT.java @@ -31,7 +31,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class FirstValuesFunctionIT extends ParallelStatsDisabledIT { //@Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/FlappingAlterTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/FlappingAlterTableIT.java index 055bee49cb4..978a81d0969 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/FlappingAlterTableIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/FlappingAlterTableIT.java @@ -43,7 +43,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class FlappingAlterTableIT extends ParallelStatsDisabledIT { private String dataTableFullName; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/FunkyNamesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/FunkyNamesIT.java index 86bd6cfdaaf..4f6931e0986 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/FunkyNamesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/FunkyNamesIT.java @@ -36,7 +36,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class FunkyNamesIT extends ParallelStatsDisabledIT { protected static String initTableValues(byte[][] splits) throws Exception { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GetSetByteBitFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GetSetByteBitFunctionEnd2EndIT.java index 3590be30b15..502fdda4500 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GetSetByteBitFunctionEnd2EndIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GetSetByteBitFunctionEnd2EndIT.java @@ -39,7 +39,7 @@ * End to end tests for {@link GetByteFunction} {@link SetByteFunction} {@link GetBitFunction} * {@link SetBitFunction} */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class GetSetByteBitFunctionEnd2EndIT extends ParallelStatsDisabledIT { private static final String KEY = "key"; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GetSetObjectIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GetSetObjectIT.java index 4d3a9dc80e1..1a02b92a6d9 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GetSetObjectIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GetSetObjectIT.java @@ -41,7 +41,7 @@ /** * End to end tests for {@link SqrtFunction} */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class GetSetObjectIT extends ParallelStatsDisabledIT { // Temporals are tested in DateTimeIT diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java index 7fa9329fad8..a30383248c8 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java @@ -52,7 +52,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Lists; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) @RunWith(Parameterized.class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class GroupByIT extends BaseQueryIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ImmutableTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ImmutableTableIT.java index 24d01ab7d9a..78c63bff3d1 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ImmutableTableIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ImmutableTableIT.java @@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ImmutableTableIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ImmutableTablePropertiesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ImmutableTablePropertiesIT.java index 1e169b7b1fd..51ff438d320 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ImmutableTablePropertiesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ImmutableTablePropertiesIT.java @@ -39,7 +39,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ImmutableTablePropertiesIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java index 04416fa2feb..193c7c0aad3 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java @@ -47,19 +47,11 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.RandomStringUtils; -import org.apache.phoenix.compile.ColumnResolver; import org.apache.phoenix.compile.ExpressionCompiler; -import org.apache.phoenix.compile.FromCompiler; import org.apache.phoenix.compile.StatementContext; -import org.apache.phoenix.compile.WhereOptimizer; -import org.apache.phoenix.expression.AndExpression; import org.apache.phoenix.expression.Expression; -import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.jdbc.PhoenixPreparedStatement; import org.apache.phoenix.parse.ColumnParseNode; -import org.apache.phoenix.parse.ParseNode; -import org.apache.phoenix.parse.SQLParser; -import org.apache.phoenix.parse.SelectStatement; import org.apache.phoenix.query.QueryConstants; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.schema.AmbiguousColumnException; @@ -82,7 +74,6 @@ import org.apache.phoenix.schema.types.PInteger; import org.apache.phoenix.thirdparty.com.google.common.base.Function; import org.apache.phoenix.thirdparty.com.google.common.base.Joiner; -import org.apache.phoenix.thirdparty.com.google.common.base.Optional; import org.apache.phoenix.thirdparty.com.google.common.collect.Lists; import org.apache.phoenix.util.EnvironmentEdgeManager; import org.apache.phoenix.util.EncodedColumnsUtil; @@ -99,7 +90,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) @RunWith(Parameterized.class) public class InListIT extends ParallelStatsDisabledIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InQueryIT.java index 4d24ff66c5a..9d9be543c02 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InQueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InQueryIT.java @@ -50,7 +50,7 @@ import org.junit.experimental.categories.Category; import org.junit.runners.Parameterized.Parameters; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class InQueryIT extends BaseQueryIT { public InQueryIT(String indexDDL, boolean columnEncoded, boolean keepDeletedCells) { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexBuildTimestampIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexBuildTimestampIT.java index e5d737fe887..771d827d2cf 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexBuildTimestampIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexBuildTimestampIT.java @@ -42,7 +42,6 @@ import org.apache.phoenix.schema.PTable; import org.apache.phoenix.util.EnvironmentEdge; import org.apache.phoenix.util.EnvironmentEdgeManager; -import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.QueryUtil; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.BeforeClass; @@ -54,9 +53,8 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Lists; import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; -import org.apache.phoenix.transaction.TransactionFactory; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) @RunWith(Parameterized.class) public class IndexBuildTimestampIT extends BaseTest { private final boolean localIndex; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java index 3fc92969b17..42f3ddc35c0 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java @@ -65,7 +65,7 @@ * Tests for the {@link IndexTool} */ @RunWith(Parameterized.class) -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class IndexExtendedIT extends BaseTest { private final boolean localIndex; private final boolean useViewIndex; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexRebuildTaskIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexRebuildTaskIT.java index eb597ed5e09..552fc90a123 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexRebuildTaskIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexRebuildTaskIT.java @@ -54,7 +54,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class IndexRebuildTaskIT extends BaseTest { protected static String TENANT1 = "tenant1"; private static RegionCoprocessorEnvironment TaskRegionEnvironment; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexRepairRegionScannerIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexRepairRegionScannerIT.java index 7d31ce48fe3..a6dc446f0ff 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexRepairRegionScannerIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexRepairRegionScannerIT.java @@ -94,7 +94,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) @RunWith(Parameterized.class) public class IndexRepairRegionScannerIT extends ParallelStatsDisabledIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolForTenantIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolForTenantIT.java index 49be8212af8..9caf6aa221b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolForTenantIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolForTenantIT.java @@ -52,7 +52,7 @@ /** * Tests for the {@link IndexScrutinyTool} */ -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class IndexScrutinyToolForTenantIT extends IndexScrutinyToolBaseIT { private Connection connGlobal = null; private Connection connTenant = null; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java index a6111a5ea9a..280568e732f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java @@ -58,7 +58,6 @@ import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil; import org.apache.phoenix.schema.PTable; import org.apache.phoenix.util.EnvironmentEdgeManager; -import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.SchemaUtil; import org.junit.After; @@ -77,7 +76,7 @@ /** * Tests for the {@link IndexScrutinyTool} */ -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) @RunWith(Parameterized.class) public class IndexScrutinyToolIT extends IndexScrutinyToolBaseIT { private static final Logger LOGGER = LoggerFactory.getLogger(IndexScrutinyToolIT.class); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForDeleteBeforeRebuildIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForDeleteBeforeRebuildIT.java index 0171a0ca096..e564155eb1a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForDeleteBeforeRebuildIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForDeleteBeforeRebuildIT.java @@ -52,7 +52,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class IndexToolForDeleteBeforeRebuildIT extends ParallelStatsDisabledIT { private Connection conn; private String dataTableName; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForNonTxGlobalIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForNonTxGlobalIndexIT.java index e75a1f6dbbf..6ef2ef730fd 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForNonTxGlobalIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForNonTxGlobalIndexIT.java @@ -125,7 +125,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) @RunWith(Parameterized.class) public class IndexToolForNonTxGlobalIndexIT extends BaseTest { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildIT.java index 505ac8b01b6..fa6d8397b91 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildIT.java @@ -66,7 +66,7 @@ /** * Tests for the {@link IndexToolForPartialBuildIT} */ -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class IndexToolForPartialBuildIT extends BaseOwnClusterIT { protected boolean isNamespaceEnabled = false; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildWithNamespaceEnabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildWithNamespaceEnabledIT.java index 389aad4e473..bbc5cb196c9 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildWithNamespaceEnabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildWithNamespaceEnabledIT.java @@ -34,7 +34,7 @@ /** * Tests for the {@link IndexToolForPartialBuildWithNamespaceEnabled} */ -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) @RunWith(Parameterized.class) public class IndexToolForPartialBuildWithNamespaceEnabledIT extends IndexToolForPartialBuildIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java index df82cdee281..be5a6acfd69 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java @@ -118,7 +118,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) @RunWith(Parameterized.class) public class IndexToolIT extends BaseTest { private static final Logger LOGGER = LoggerFactory.getLogger(IndexToolIT.class); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolTimeRangeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolTimeRangeIT.java index 599b050c4cc..834bde58b73 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolTimeRangeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolTimeRangeIT.java @@ -41,7 +41,7 @@ import static org.junit.Assert.assertFalse; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class IndexToolTimeRangeIT extends BaseTest { private static final String CREATE_TABLE_DDL = "CREATE TABLE %s (ID INTEGER NOT NULL PRIMARY KEY, " diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexUpgradeToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexUpgradeToolIT.java index 45ca69993a5..7da066aedaf 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexUpgradeToolIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexUpgradeToolIT.java @@ -41,7 +41,7 @@ import org.junit.runners.Parameterized.Parameters; @RunWith(Parameterized.class) -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class IndexUpgradeToolIT extends ParallelStatsDisabledIT { public static final String diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexVerificationOldDesignIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexVerificationOldDesignIT.java index d26cafa0591..4f399095238 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexVerificationOldDesignIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexVerificationOldDesignIT.java @@ -48,7 +48,7 @@ import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES; import static org.junit.Assert.assertEquals; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class IndexVerificationOldDesignIT extends BaseTest { ManualEnvironmentEdge injectEdge; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexWithDefaultValueIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexWithDefaultValueIT.java index d1827ae3d2a..9edb51247db 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexWithDefaultValueIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexWithDefaultValueIT.java @@ -31,7 +31,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertEquals; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class IndexWithDefaultValueIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java index b2bad7a1ec6..a62bdb630c4 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class InstrFunctionIT extends ParallelStatsDisabledIT { private void initTable(Connection conn, String tableName, String sortOrder, String s, String subStr) throws Exception { String ddl = "CREATE TABLE " + tableName + " (name VARCHAR NOT NULL PRIMARY KEY " + sortOrder + ", substr VARCHAR)"; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IntArithmeticIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IntArithmeticIT.java index 978e7bfefc1..228859192d4 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IntArithmeticIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IntArithmeticIT.java @@ -45,7 +45,7 @@ import org.junit.runners.Parameterized.Parameters; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) @RunWith(Parameterized.class) public class IntArithmeticIT extends BaseQueryIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java index 22b1f37dbd0..f6d9410f790 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java @@ -31,7 +31,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class IsNullIT extends ParallelStatsDisabledIT { @Test public void testIsNullInPk() throws Exception { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java index e942e3dfeaf..6e1aa53a5a2 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java @@ -35,9 +35,7 @@ import org.apache.phoenix.compile.ExplainPlan; import org.apache.phoenix.compile.ExplainPlanAttributes; -import org.apache.phoenix.compile.QueryPlan; import org.apache.phoenix.jdbc.PhoenixPreparedStatement; -import org.apache.phoenix.jdbc.PhoenixStatement; import org.apache.phoenix.query.KeyRange; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.TestUtil; @@ -46,7 +44,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsEnabledTest.class) +@Category({ParallelStatsEnabledTest.class}) public class KeyOnlyIT extends ParallelStatsEnabledIT { private String tableName; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java index 448c2bc4f4e..741ee55dde5 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java @@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class LastValueFunctionIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValuesFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValuesFunctionIT.java index 3f504682cac..994895a9d30 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValuesFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValuesFunctionIT.java @@ -31,7 +31,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class LastValuesFunctionIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java index 9d724d16877..b76a92113b4 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java @@ -33,7 +33,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class LikeExpressionIT extends ParallelStatsDisabledIT { private String tableName; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LnLogFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LnLogFunctionEnd2EndIT.java index 4e68c9421fc..5475e49c8ce 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LnLogFunctionEnd2EndIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LnLogFunctionEnd2EndIT.java @@ -34,7 +34,7 @@ /** * End to end tests for {@link LnFunction} and {@link LogFunction} */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class LnLogFunctionEnd2EndIT extends ParallelStatsDisabledIT { private static final String KEY = "key"; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LocalIndexSplitMergeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LocalIndexSplitMergeIT.java index 07e4e731c5b..71dfe8668d0 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LocalIndexSplitMergeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LocalIndexSplitMergeIT.java @@ -52,7 +52,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class LocalIndexSplitMergeIT extends BaseTest { @BeforeClass diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LogicalTableNameExtendedIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LogicalTableNameExtendedIT.java index b99f66d1ca0..e3870b03e42 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LogicalTableNameExtendedIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LogicalTableNameExtendedIT.java @@ -22,8 +22,6 @@ import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.phoenix.end2end.index.SingleCellIndexIT; -import org.apache.phoenix.hbase.index.IndexRegionObserver; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.query.QueryConstants; import org.apache.phoenix.query.QueryServices; @@ -45,7 +43,7 @@ import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES; import static org.junit.Assert.assertEquals; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class LogicalTableNameExtendedIT extends LogicalTableNameBaseIT { private Properties propsNamespace = PropertiesUtil.deepCopy(TEST_PROPERTIES); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LogicalTableNameIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LogicalTableNameIT.java index 542176e0846..9481a8d3c79 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LogicalTableNameIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LogicalTableNameIT.java @@ -25,7 +25,6 @@ import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.mapreduce.index.IndexScrutinyTool; import org.apache.phoenix.schema.PTable; -import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.QueryUtil; import org.apache.phoenix.util.SchemaUtil; @@ -57,7 +56,7 @@ import static org.junit.Assert.*; @RunWith(Parameterized.class) -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class LogicalTableNameIT extends LogicalTableNameBaseIT { private static final Logger LOGGER = LoggerFactory.getLogger(LogicalTableNameIT.class); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java index 15d9cac0d0e..4e53b2bc141 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java @@ -31,7 +31,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class MD5FunctionIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MapReduceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MapReduceIT.java index 0631ddf6e6e..d27e30d614d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MapReduceIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MapReduceIT.java @@ -56,7 +56,7 @@ /** * Test that our MapReduce basic tools work as expected */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class MapReduceIT extends ParallelStatsDisabledIT { private static final String STOCK_NAME = "STOCK_NAME"; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java index f205467f2f1..5f761c9a656 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java @@ -50,7 +50,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class MappingTableDataTypeIT extends ParallelStatsDisabledIT { @Test public void testMappingHbaseTableToPhoenixTable() throws Exception { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MathPIFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MathPIFunctionEnd2EndIT.java index 759f8c85e37..920e89017b7 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MathPIFunctionEnd2EndIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MathPIFunctionEnd2EndIT.java @@ -30,7 +30,7 @@ /** * End to end tests for {@link MathPIFunction} */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class MathPIFunctionEnd2EndIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MathTrigFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MathTrigFunctionEnd2EndIT.java index a5daee16bea..7b129381ccf 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MathTrigFunctionEnd2EndIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MathTrigFunctionEnd2EndIT.java @@ -39,7 +39,7 @@ * {@link org.apache.phoenix.expression.function.TanFunction} */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class MathTrigFunctionEnd2EndIT extends ParallelStatsDisabledIT { private static final String KEY = "key"; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MaxLookbackExtendedIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MaxLookbackExtendedIT.java index 987d631bfe3..82e13e1ccb1 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MaxLookbackExtendedIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MaxLookbackExtendedIT.java @@ -68,7 +68,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) @RunWith(Parameterized.class) public class MaxLookbackExtendedIT extends BaseTest { private static final int MAX_LOOKBACK_AGE = 15; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MaxLookbackIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MaxLookbackIT.java index d1badf67f2b..bbd9e5bcf2e 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MaxLookbackIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MaxLookbackIT.java @@ -58,7 +58,7 @@ import static org.apache.phoenix.util.TestUtil.assertTableHasVersions; import static org.junit.Assert.assertFalse; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class MaxLookbackIT extends BaseTest { private static final int MAX_LOOKBACK_AGE = 15; private static final int ROWS_POPULATED = 2; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MergeViewIndexIdSequencesToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MergeViewIndexIdSequencesToolIT.java index a74fed591a4..dab182e2070 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MergeViewIndexIdSequencesToolIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MergeViewIndexIdSequencesToolIT.java @@ -29,7 +29,7 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertTrue; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class MergeViewIndexIdSequencesToolIT extends ParallelStatsDisabledIT { private final String CLEAN_QUERY = "DELETE FROM SYSTEM.\"SEQUENCE\""; private final String COUNT_QUERY = "SELECT COUNT(*) FROM SYSTEM.\"SEQUENCE\""; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MetaDataEndPointIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MetaDataEndPointIT.java index 3c1446e4673..6349bce0c63 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MetaDataEndPointIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MetaDataEndPointIT.java @@ -40,7 +40,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class MetaDataEndPointIT extends ParallelStatsDisabledIT { @Test public void testUpdateIndexState() throws Throwable { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MetaDataEndpointImplIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MetaDataEndpointImplIT.java index 93e5557c4df..91727a29d93 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MetaDataEndpointImplIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MetaDataEndpointImplIT.java @@ -46,7 +46,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class MetaDataEndpointImplIT extends ParallelStatsDisabledIT { private final TableName catalogTable = TableName.valueOf(PhoenixDatabaseMetaData.SYSTEM_CATALOG_NAME_BYTES); private final TableName linkTable = TableName.valueOf(PhoenixDatabaseMetaData.SYSTEM_CHILD_LINK_NAME_BYTES); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java index 6aaba958ffa..adf67229771 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java @@ -61,7 +61,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class MigrateSystemTablesToSystemNamespaceIT extends BaseTest { private static final Set PHOENIX_SYSTEM_TABLES = new HashSet<>(Arrays.asList( diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MinMaxAggregateFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MinMaxAggregateFunctionIT.java index 60302550952..7f90f8fccd0 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MinMaxAggregateFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MinMaxAggregateFunctionIT.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class MinMaxAggregateFunctionIT extends ParallelStatsDisabledIT { private static final String TABLE_NAME = generateUniqueName(); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java index 2d51f922813..8b42c0920fd 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java @@ -33,7 +33,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ModulusExpressionIT extends ParallelStatsDisabledIT { private static final long SMALL_VALUE = 31L; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java index 837835a3ebc..55defba6589 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java @@ -45,7 +45,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsEnabledTest.class) +@Category({ParallelStatsEnabledTest.class}) public class MultiCfQueryExecIT extends ParallelStatsEnabledIT { private String fullTableName; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutationBatchFailedStateMetricWithAllDeleteIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutationBatchFailedStateMetricWithAllDeleteIT.java index a4b3d4a1e06..abc91f99459 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutationBatchFailedStateMetricWithAllDeleteIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutationBatchFailedStateMetricWithAllDeleteIT.java @@ -43,7 +43,7 @@ import org.junit.runners.Parameterized; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) @RunWith(Parameterized.class) public class MutationBatchFailedStateMetricWithAllDeleteIT extends BaseMutationBatchFailedStateMetricIT { String transactionProvider; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutationBatchFailedStateMetricWithAllUpsertIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutationBatchFailedStateMetricWithAllUpsertIT.java index a7c14d5f113..d436d7baa31 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutationBatchFailedStateMetricWithAllUpsertIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutationBatchFailedStateMetricWithAllUpsertIT.java @@ -42,7 +42,7 @@ import org.junit.runners.Parameterized; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) @RunWith(Parameterized.class) public class MutationBatchFailedStateMetricWithAllUpsertIT extends BaseMutationBatchFailedStateMetricIT { String transactionProvider; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutationBatchFailedStateMetricWithDeleteAndUpsertIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutationBatchFailedStateMetricWithDeleteAndUpsertIT.java index fc135890a6f..1fbde5e45ba 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutationBatchFailedStateMetricWithDeleteAndUpsertIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutationBatchFailedStateMetricWithDeleteAndUpsertIT.java @@ -44,7 +44,7 @@ import org.junit.runners.Parameterized; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) @RunWith(Parameterized.class) public class MutationBatchFailedStateMetricWithDeleteAndUpsertIT extends BaseMutationBatchFailedStateMetricIT { String transactionProvider; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutationStateIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutationStateIT.java index 6ca3c0de7a3..582f49e3aef 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutationStateIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutationStateIT.java @@ -51,7 +51,6 @@ import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.schema.PIndexState; import org.apache.phoenix.schema.PTableType; -import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.Repeat; import org.apache.phoenix.util.RunUntilFailure; import org.apache.phoenix.util.SchemaUtil; @@ -63,7 +62,7 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) @RunWith(RunUntilFailure.class) public class MutationStateIT extends ParallelStatsDisabledIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NamespaceSchemaMappingIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NamespaceSchemaMappingIT.java index e2c6a0fa470..79d15b33f41 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NamespaceSchemaMappingIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NamespaceSchemaMappingIT.java @@ -45,7 +45,7 @@ /* * since 4.8 */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class NamespaceSchemaMappingIT extends ParallelStatsDisabledIT { /** * Tests that when: There is a table created with older version of phoenix and a table created with newer version diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NativeHBaseTypesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NativeHBaseTypesIT.java index 26a0ede7240..373d4d7a82a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NativeHBaseTypesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NativeHBaseTypesIT.java @@ -67,7 +67,7 @@ * @since 0.1 */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class NativeHBaseTypesIT extends ParallelStatsDisabledIT { private String initTableValues() throws Exception { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NoLookbackMutableIndexExtendedIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NoLookbackMutableIndexExtendedIT.java index 08c331d416e..37d920c2fa7 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NoLookbackMutableIndexExtendedIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NoLookbackMutableIndexExtendedIT.java @@ -52,7 +52,7 @@ import org.junit.runners.Parameterized; @RunWith(Parameterized.class) -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class NoLookbackMutableIndexExtendedIT extends BaseTest { protected final boolean localIndex; protected final String tableDDLOptions; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryWithGlobalImmutableIndexesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryWithGlobalImmutableIndexesIT.java index f98eaad43ca..82fc3eaeed2 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryWithGlobalImmutableIndexesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryWithGlobalImmutableIndexesIT.java @@ -25,7 +25,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Lists; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class NotQueryWithGlobalImmutableIndexesIT extends NotQueryIT { public NotQueryWithGlobalImmutableIndexesIT(String indexDDL, boolean columnEncoded, boolean keepDeleted) throws Exception { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryWithLocalImmutableIndexesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryWithLocalImmutableIndexesIT.java index cdd20272130..9c52328eaf9 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryWithLocalImmutableIndexesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryWithLocalImmutableIndexesIT.java @@ -25,7 +25,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Lists; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class NotQueryWithLocalImmutableIndexesIT extends NotQueryIT { public NotQueryWithLocalImmutableIndexesIT(String indexDDL, boolean columnEncoded, boolean keepDeleted) throws Exception { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java index c65b6fcd784..d84ebb53e4f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java @@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class NthValueFunctionIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NullIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NullIT.java index 36a008b71bc..bb90274fea5 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NullIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NullIT.java @@ -50,7 +50,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Lists; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class NullIT extends BaseQueryIT { @Parameters(name="NullIT_{index},columnEncoded={1}") diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NumericArithmeticIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NumericArithmeticIT.java index 280ef4b7d24..fe6db7bb3b7 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NumericArithmeticIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NumericArithmeticIT.java @@ -45,7 +45,7 @@ import org.apache.phoenix.thirdparty.com.google.common.primitives.Doubles; import org.apache.phoenix.thirdparty.com.google.common.primitives.Floats; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class NumericArithmeticIT extends ParallelStatsDisabledIT { private String tableName; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OctetLengthFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OctetLengthFunctionEnd2EndIT.java index c77c5b217c6..e736a15fa1f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OctetLengthFunctionEnd2EndIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OctetLengthFunctionEnd2EndIT.java @@ -34,7 +34,7 @@ /** * End to end tests for {@link OctetLengthFunction} */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class OctetLengthFunctionEnd2EndIT extends ParallelStatsDisabledIT { private static final String KEY = "key"; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OnDuplicateKeyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OnDuplicateKeyIT.java index 4bc4dc33743..d87fbc6a1f0 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OnDuplicateKeyIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OnDuplicateKeyIT.java @@ -58,7 +58,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Lists; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) @RunWith(Parameterized.class) public class OnDuplicateKeyIT extends ParallelStatsDisabledIT { private final String indexDDL; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OperationTimeoutWithReasonIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OperationTimeoutWithReasonIT.java index dc0867bbf14..c42136d6099 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OperationTimeoutWithReasonIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OperationTimeoutWithReasonIT.java @@ -35,7 +35,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class OperationTimeoutWithReasonIT extends ParallelStatsDisabledIT { private static final class MyClock extends EnvironmentEdge { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java index 490dd458957..bf696f4d77f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java @@ -25,7 +25,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class OrderByIT extends BaseOrderByIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByWithServerClientSpoolingDisabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByWithServerClientSpoolingDisabledIT.java index 91f2a694a99..30c830f40aa 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByWithServerClientSpoolingDisabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByWithServerClientSpoolingDisabledIT.java @@ -31,7 +31,7 @@ * Same as the order by test but with spooling disabled both on the server and client. This will use * {@link SizeBoundQueue} for all its operations */ -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class OrderByWithServerClientSpoolingDisabledIT extends BaseOrderByIT { @BeforeClass diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByWithServerMemoryLimitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByWithServerMemoryLimitIT.java index 8bf0589adbc..31944bb914f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByWithServerMemoryLimitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByWithServerMemoryLimitIT.java @@ -32,7 +32,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class OrderByWithServerMemoryLimitIT extends BaseTest { @BeforeClass diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByWithSpillingIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByWithSpillingIT.java index 3c8308924cb..f9bc7846c96 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByWithSpillingIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByWithSpillingIT.java @@ -26,7 +26,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class OrderByWithSpillingIT extends BaseOrderByIT { @BeforeClass public static synchronized void doSetup() throws Exception { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrphanViewToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrphanViewToolIT.java index 25e684f1d95..485bcda6f65 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrphanViewToolIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrphanViewToolIT.java @@ -59,7 +59,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) @RunWith(Parameterized.class) public class OrphanViewToolIT extends BaseOwnClusterIT { private static final Logger LOGGER = LoggerFactory.getLogger(OrphanViewToolIT.class); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java index d17c433d197..9502f1b455c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java @@ -50,7 +50,7 @@ import org.apache.phoenix.thirdparty.com.google.common.base.Joiner; -@Category(ParallelStatsEnabledTest.class) +@Category({ParallelStatsEnabledTest.class}) public class ParallelIteratorsIT extends ParallelStatsEnabledIT { protected static final byte[] KMIN = new byte[] {'!'}; 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 e4941332ed0..76a71b19ce0 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 @@ -58,6 +58,7 @@ public static synchronized void doSetup() throws Exception { Map props = Maps.newHashMapWithExpectedSize(1); props.put(BaseScannerRegionObserverConstants.PHOENIX_MAX_LOOKBACK_AGE_CONF_KEY, Integer.toString(60*60)); // An hour props.put(QueryServices.USE_STATS_FOR_PARALLELIZATION, Boolean.toString(false)); + props.put(QueryServices.STATS_COLLECTION_ENABLED, Boolean.toString(true)); setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator())); } diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParameterizedIndexUpgradeToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParameterizedIndexUpgradeToolIT.java index 86162ac03da..de491c59cb1 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParameterizedIndexUpgradeToolIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParameterizedIndexUpgradeToolIT.java @@ -75,7 +75,7 @@ import static org.mockito.Mockito.times; @RunWith(Parameterized.class) -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class ParameterizedIndexUpgradeToolIT extends BaseTest { private static final String [] INDEXES_LIST = new String[8]; private static final String [] INDEXES_LIST_NAMESPACE = new String[8]; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialResultServerConfigurationIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialResultServerConfigurationIT.java index b77231520e0..311f6545291 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialResultServerConfigurationIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialResultServerConfigurationIT.java @@ -57,7 +57,7 @@ /** * This is a separate from @PartialResultDisabledIT because it requires server side configuration */ -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class PartialResultServerConfigurationIT { private static HBaseTestingUtility hbaseTestUtil; private static String zkQuorum; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java index a412125fb6a..15a4da35d39 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PartialScannerResultsDisabledIT.java @@ -35,7 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class PartialScannerResultsDisabledIT extends ParallelStatsDisabledIT { public static final String TEST_TABLE_DDL = "CREATE TABLE IF NOT EXISTS %s\n" + "(\n" + " ORGANIZATION_ID CHAR(15) NOT NULL,\n" diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java index 98e92a72b48..49181f96af1 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java @@ -59,7 +59,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class PercentileIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledIT.java index 95c7995dde0..7a331dcee02 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledIT.java @@ -20,7 +20,7 @@ import org.junit.BeforeClass; import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class PermissionNSDisabledIT extends BasePermissionsIT { public PermissionNSDisabledIT() throws Exception { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledWithCustomAccessControllerIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledWithCustomAccessControllerIT.java index fb5841f2294..95fd5945c16 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledWithCustomAccessControllerIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledWithCustomAccessControllerIT.java @@ -20,7 +20,7 @@ import org.junit.BeforeClass; import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class PermissionNSDisabledWithCustomAccessControllerIT extends PermissionNSDisabledIT{ public PermissionNSDisabledWithCustomAccessControllerIT() throws Exception { super(); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledIT.java index 292654f79cd..ad34fcc618c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledIT.java @@ -45,7 +45,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class PermissionNSEnabledIT extends BasePermissionsIT { public PermissionNSEnabledIT() throws Exception { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledWithCustomAccessControllerIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledWithCustomAccessControllerIT.java index 5f36c09214f..22b80b1cfe1 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledWithCustomAccessControllerIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledWithCustomAccessControllerIT.java @@ -20,7 +20,7 @@ import org.junit.BeforeClass; import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class PermissionNSEnabledWithCustomAccessControllerIT extends PermissionNSEnabledIT{ public PermissionNSEnabledWithCustomAccessControllerIT() throws Exception { super(); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionsCacheIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionsCacheIT.java index 1110cd1d1c9..473d229ffaa 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionsCacheIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionsCacheIT.java @@ -39,7 +39,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class PermissionsCacheIT extends BasePermissionsIT { public PermissionsCacheIT() throws Exception { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java index 5a6f94c960a..338b0fa822b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java @@ -59,7 +59,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class PhoenixDriverIT extends BaseTest { private static HBaseTestingUtility hbaseTestUtil; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRowTimestampFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRowTimestampFunctionIT.java index e1a39a020f9..afb3ec0678e 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRowTimestampFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRowTimestampFunctionIT.java @@ -51,7 +51,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) @RunWith(Parameterized.class) public class PhoenixRowTimestampFunctionIT extends ParallelStatsDisabledIT { private final boolean encoded; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRuntimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRuntimeIT.java index e494b4f81d9..b9e73b2b559 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRuntimeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRuntimeIT.java @@ -58,7 +58,7 @@ import org.junit.experimental.categories.Category; import org.apache.phoenix.thirdparty.com.google.common.collect.Sets; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class PhoenixRuntimeIT extends ParallelStatsDisabledIT { private static void assertTenantIds(Expression e, Table htable, Filter filter, String[] tenantIds) throws IOException { ImmutableBytesWritable ptr = new ImmutableBytesWritable(); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixTTLToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixTTLToolIT.java index d27cea12d6a..bb605935747 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixTTLToolIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixTTLToolIT.java @@ -76,7 +76,7 @@ * TODO:- To enable this test after re-enabling TTL for view for more info check :- PHOENIX-6978 */ @Ignore -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class PhoenixTTLToolIT extends ParallelStatsDisabledIT { @BeforeClass diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PointInTimeQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PointInTimeQueryIT.java index ba7fa159d76..42245867f36 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PointInTimeQueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PointInTimeQueryIT.java @@ -44,7 +44,7 @@ import org.junit.runners.Parameterized.Parameters; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class PointInTimeQueryIT extends BaseQueryIT { @Parameters(name="PointInTimeQueryIT_{index},columnEncoded={1}") diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PointInTimeScanQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PointInTimeScanQueryIT.java index da068aafa47..f11a954e5eb 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PointInTimeScanQueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PointInTimeScanQueryIT.java @@ -46,7 +46,7 @@ import static org.junit.Assert.assertTrue; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class PointInTimeScanQueryIT extends BaseQueryIT { @Parameters(name="PointInTimeScanQueryIT_{index},columnEncoded={1}") diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PowerFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PowerFunctionEnd2EndIT.java index 13a24385e43..a5cdec6e94f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PowerFunctionEnd2EndIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PowerFunctionEnd2EndIT.java @@ -33,7 +33,7 @@ /** * End to end tests for {@link PowerFunction} */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class PowerFunctionEnd2EndIT extends ParallelStatsDisabledIT { private static final String KEY = "key"; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PreMatureTimelyAbortScanIt.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PreMatureTimelyAbortScanIt.java index 4567b280b14..20e5d7295de 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PreMatureTimelyAbortScanIt.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PreMatureTimelyAbortScanIt.java @@ -37,7 +37,7 @@ import java.util.Map; import static org.junit.Assert.*; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class PreMatureTimelyAbortScanIt extends ParallelStatsDisabledIT { private static final Logger LOG = LoggerFactory.getLogger(PreMatureTimelyAbortScanIt.class); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PrimitiveTypeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PrimitiveTypeIT.java index 49616b17c03..5832ec5c7fe 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PrimitiveTypeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PrimitiveTypeIT.java @@ -33,7 +33,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class PrimitiveTypeIT extends ParallelStatsDisabledIT { private static final Properties PROPS = PropertiesUtil.deepCopy(TestUtil.TEST_PROPERTIES); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProductMetricsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProductMetricsIT.java index 6a99671ba44..8c4ce98a1cf 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProductMetricsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProductMetricsIT.java @@ -52,7 +52,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Ordering; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ProductMetricsIT extends ParallelStatsDisabledIT { private static final String PRODUCT_METRICS_NAME = "PRODUCT_METRICS"; private static final String PRODUCT_METRICS_SCHEMA_NAME = ""; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProjectArrayElemAfterHashJoinIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProjectArrayElemAfterHashJoinIT.java index ae18506e297..cc29ae95b0f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProjectArrayElemAfterHashJoinIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProjectArrayElemAfterHashJoinIT.java @@ -34,7 +34,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class ProjectArrayElemAfterHashJoinIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PropertiesInSyncIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PropertiesInSyncIT.java index 2e80994815b..7955ba9cecd 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PropertiesInSyncIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PropertiesInSyncIT.java @@ -66,7 +66,7 @@ /** * Test properties that need to be kept in sync amongst all column families and indexes of a table */ -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class PropertiesInSyncIT extends ParallelStatsDisabledIT { private static final String COL_FAM1 = "CF1"; private static final String COL_FAM2 = "CF2"; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java index 2549517fd0d..e95562d101b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java @@ -83,7 +83,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class QueryDatabaseMetaDataIT extends ParallelStatsDisabledIT { private static void createMDTestTable(Connection conn, String tableName, String extraProps) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java index 0e2b9225abc..fb203a971a4 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java @@ -33,7 +33,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class QueryExecWithoutSCNIT extends ParallelStatsDisabledIT { @Test public void testScanNoSCN() throws Exception { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java index 1bee00e2d26..572b0b17938 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java @@ -47,9 +47,9 @@ * Basic tests for Phoenix JDBC implementation * */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class QueryIT extends BaseQueryIT { - + @Parameters(name="QueryIT_{index}") // name is used by failsafe as file name in reports public static synchronized Collection data() { return BaseQueryIT.allIndexes(); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryLoggerIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryLoggerIT.java index 7f780305971..c8530a86f54 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryLoggerIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryLoggerIT.java @@ -66,7 +66,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class QueryLoggerIT extends BaseTest { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java index 3f601e00b39..d811d34e22e 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java @@ -49,7 +49,7 @@ import static org.junit.Assert.assertTrue; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class QueryMoreIT extends ParallelStatsDisabledIT { private final String TENANT_SPECIFIC_URL1 = getUrl() + ';' + TENANT_ID_ATTRIB + "=tenant1"; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java index 0ac5d50c100..e549e512973 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java @@ -55,7 +55,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class QueryTimeoutIT extends BaseTest { private String tableName; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithLimitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithLimitIT.java index 377b6d7cfc6..98dc76859a0 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithLimitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithLimitIT.java @@ -18,7 +18,6 @@ package org.apache.phoenix.end2end; import static org.apache.phoenix.query.QueryServicesOptions.UNLIMITED_QUEUE_SIZE; -import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -38,7 +37,6 @@ import org.apache.phoenix.jdbc.PhoenixPreparedStatement; import org.apache.phoenix.query.BaseTest; import org.apache.phoenix.query.QueryServices; -import org.apache.phoenix.query.QueryServicesOptions; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.TestUtil; @@ -48,7 +46,7 @@ import org.junit.experimental.categories.Category; import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class QueryWithLimitIT extends BaseTest { private String tableName; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithOffsetIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithOffsetIT.java index bd258173005..ead58bdf0eb 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithOffsetIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithOffsetIT.java @@ -46,7 +46,7 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) @RunWith(Parameterized.class) public class QueryWithOffsetIT extends ParallelStatsDisabledIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithTableSampleIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithTableSampleIT.java index 673c3aabd7c..7e749245bbe 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithTableSampleIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithTableSampleIT.java @@ -39,7 +39,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsEnabledTest.class) +@Category({ParallelStatsEnabledTest.class}) public class QueryWithTableSampleIT extends ParallelStatsEnabledIT { private String tableName; private String joinedTableName; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RTrimFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RTrimFunctionIT.java index dc075e7272f..fa06ce3fcc3 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RTrimFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RTrimFunctionIT.java @@ -34,7 +34,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class RTrimFunctionIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RangeScanIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RangeScanIT.java index e56b41bc137..4f598744a4a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RangeScanIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RangeScanIT.java @@ -49,7 +49,7 @@ import org.junit.runners.Parameterized.Parameters; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) @RunWith(Parameterized.class) public class RangeScanIT extends BaseQueryIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadIsolationLevelIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadIsolationLevelIT.java index 84c88809ad4..24333df70ac 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadIsolationLevelIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadIsolationLevelIT.java @@ -36,7 +36,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsEnabledTest.class) +@Category({ParallelStatsEnabledTest.class}) public class ReadIsolationLevelIT extends ParallelStatsEnabledIT { private static final String ENTITY_ID1= "000000000000001"; private static final String ENTITY_ID2= "000000000000002"; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java index ffadb17f0e7..f5dde6d4cff 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java @@ -33,7 +33,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ReadOnlyIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyViewOnReadOnlyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyViewOnReadOnlyIT.java index 4c2a82ed722..04d1edfc417 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyViewOnReadOnlyIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyViewOnReadOnlyIT.java @@ -30,7 +30,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class ReadOnlyViewOnReadOnlyIT extends BaseTenantSpecificViewIndexIT { private static final long DEFAULT_TTL_FOR_TEST = 86400; private Connection getTenantConnection(final String tenantId) throws Exception { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RebuildIndexConnectionPropsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RebuildIndexConnectionPropsIT.java index a0b5ff1145a..f7e976f3ebd 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RebuildIndexConnectionPropsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RebuildIndexConnectionPropsIT.java @@ -51,7 +51,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class RebuildIndexConnectionPropsIT extends BaseTest { private static HBaseTestingUtility hbaseTestUtil; private static String zkQuorum; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexBulkLoadToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexBulkLoadToolIT.java index e96f97cd323..d4e39e3bd6e 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexBulkLoadToolIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexBulkLoadToolIT.java @@ -43,7 +43,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class RegexBulkLoadToolIT extends BaseOwnClusterIT { private static Connection conn; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpReplaceFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpReplaceFunctionIT.java index d226a4a2f54..08a05eda852 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpReplaceFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpReplaceFunctionIT.java @@ -34,7 +34,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class RegexpReplaceFunctionIT extends ParallelStatsDisabledIT { private int id; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java index b586395044e..2ca6775d7c4 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java @@ -35,7 +35,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class RegexpSplitFunctionIT extends ParallelStatsDisabledIT { private String tableName; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java index ba1d1eccba3..48b543de80d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java @@ -34,7 +34,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class RegexpSubstrFunctionIT extends ParallelStatsDisabledIT { private int id; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RenewLeaseIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RenewLeaseIT.java index 938af05f98d..1b25fd300ba 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RenewLeaseIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RenewLeaseIT.java @@ -44,7 +44,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class RenewLeaseIT extends BaseTest { private static final long SCANNER_LEASE_TIMEOUT = 12000; private static volatile boolean SLEEP_NOW = false; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java index 29dc58188c0..6450bbbc802 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java @@ -31,7 +31,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ReverseFunctionIT extends ParallelStatsDisabledIT { private String initTable(Connection conn, String sortOrder, String s) throws Exception { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java index 0f673c5250c..b98cea5c050 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java @@ -46,7 +46,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ReverseScanIT extends ParallelStatsDisabledIT { private static byte[][] getSplitsAtRowKeys(String tenantId) { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFuncIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFuncIT.java index f7facaf2539..4ed4e044e45 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFuncIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFuncIT.java @@ -32,7 +32,6 @@ import java.sql.Statement; import java.sql.Time; import java.sql.Timestamp; -import java.time.ZoneId; import java.time.ZoneOffset; import java.util.Properties; @@ -41,7 +40,6 @@ import org.apache.phoenix.expression.function.RoundFunction; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.DateUtil; -import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Before; import org.junit.Test; @@ -54,7 +52,7 @@ * End to end tests for {@link RoundFunction}, {@link FloorFunction}, {@link CeilFunction} * */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class RoundFloorCeilFuncIT extends ParallelStatsDisabledIT { private static final long millisPart = 660; private static final int nanosPart = 500100; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowKeyBytesStringFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowKeyBytesStringFunctionIT.java index 3f2167b062f..c86e4187be7 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowKeyBytesStringFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowKeyBytesStringFunctionIT.java @@ -35,7 +35,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class RowKeyBytesStringFunctionIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowTimestampIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowTimestampIT.java index 4795f16c014..572595124ea 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowTimestampIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowTimestampIT.java @@ -51,7 +51,7 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) @RunWith(Parameterized.class) public class RowTimestampIT extends ParallelStatsDisabledIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java index f40ca609494..6006c787cb7 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java @@ -69,7 +69,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Lists; import org.apache.phoenix.util.TestUtil; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class RowValueConstructorIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorOffsetIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorOffsetIT.java index 8ee6de18bca..d379fe763a2 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorOffsetIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorOffsetIT.java @@ -48,7 +48,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class RowValueConstructorOffsetIT extends ParallelStatsDisabledIT { private static final String SIMPLE_DDL = "CREATE TABLE %s (t_id VARCHAR NOT NULL,\n" + "k1 INTEGER NOT NULL,\n" diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorOffsetOptionalIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorOffsetOptionalIT.java index f46bdea9088..f3751e5fa06 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorOffsetOptionalIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorOffsetOptionalIT.java @@ -47,7 +47,7 @@ * A set of lightweight ITs should run every build, and another fully covered ITs build for daily or * weekly. */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class RowValueConstructorOffsetOptionalIT extends ParallelStatsDisabledIT { private final long TS = System.currentTimeMillis(); private final String[] stringDataSet = new String[] {"aaa", "aab", "aac"}; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SCNIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SCNIT.java index d0a83d1d76a..66689d7850a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SCNIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SCNIT.java @@ -33,7 +33,8 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) + public class SCNIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanUncommittedWithRegionMovesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanUncommittedWithRegionMovesIT.java index cf4e69b4290..a74bb2f87cd 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanUncommittedWithRegionMovesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanUncommittedWithRegionMovesIT.java @@ -55,7 +55,7 @@ * only be able to cover the region state that was present before the scanner was opened. HBase * provides this guarantee by using region level MVCC. */ -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class ScanUncommittedWithRegionMovesIT extends ParallelStatsDisabledIT { private static final Logger LOGGER = diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SchemaRegistryFailureIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SchemaRegistryFailureIT.java index 3273ae66262..87ed0b6b6fc 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SchemaRegistryFailureIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SchemaRegistryFailureIT.java @@ -26,7 +26,6 @@ import org.apache.phoenix.schema.export.SchemaRegistryRepository; import org.apache.phoenix.schema.export.SchemaWriter; import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; -import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.SchemaUtil; import org.junit.Assert; @@ -35,14 +34,13 @@ import org.junit.experimental.categories.Category; import java.io.IOException; -import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; import java.util.Map; import static org.apache.phoenix.coprocessorclient.BaseScannerRegionObserverConstants.PHOENIX_MAX_LOOKBACK_AGE_CONF_KEY; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class SchemaRegistryFailureIT extends ParallelStatsDisabledIT{ @BeforeClass diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceBulkAllocationIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceBulkAllocationIT.java index 5d26d2e8eb1..29281dc7457 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceBulkAllocationIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceBulkAllocationIT.java @@ -56,7 +56,7 @@ * All tests are run with both a generic connection and a multi-tenant connection. * */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) @RunWith(Parameterized.class) public class SequenceBulkAllocationIT extends ParallelStatsDisabledIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java index 9dc82258ca2..aaf322aedcd 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java @@ -51,7 +51,6 @@ import org.apache.phoenix.schema.SequenceNotFoundException; import org.apache.phoenix.util.EnvironmentEdge; import org.apache.phoenix.util.EnvironmentEdgeManager; -import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.SchemaUtil; import org.apache.phoenix.util.SequenceUtil; @@ -63,7 +62,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Lists; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class SequenceIT extends ParallelStatsDisabledIT { private static final String SELECT_NEXT_VALUE_SQL = "SELECT NEXT VALUE FOR %s"; private static final String SCHEMA_NAME = "S"; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequencePointInTimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequencePointInTimeIT.java index 7159d196b2d..214ed35b268 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequencePointInTimeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequencePointInTimeIT.java @@ -43,7 +43,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class SequencePointInTimeIT extends BaseTest { private static final String SCHEMA_NAME = "S"; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SerialIteratorsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SerialIteratorsIT.java index 5bdef0ae5d1..23613cfc677 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SerialIteratorsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SerialIteratorsIT.java @@ -33,7 +33,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class SerialIteratorsIT extends ParallelStatsDisabledIT { private String tableName = generateUniqueName(); private final String[] strings = { "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java index 3f57522da21..e4b9b780a6d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java @@ -33,7 +33,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ServerExceptionIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerPagingIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerPagingIT.java index f9fb3fc9e4a..1aff5afd3d1 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerPagingIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerPagingIT.java @@ -53,7 +53,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class ServerPagingIT extends ParallelStatsDisabledIT { @BeforeClass diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerPagingWithRegionMovesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerPagingWithRegionMovesIT.java index 76aea5b6816..07dfd5cee2f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerPagingWithRegionMovesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerPagingWithRegionMovesIT.java @@ -66,7 +66,7 @@ /** * ServerPagingIT tests that include some region moves while performing rs#next. */ -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class ServerPagingWithRegionMovesIT extends ParallelStatsDisabledIT { private static final Logger LOGGER = diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SetPropertyOnEncodedTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SetPropertyOnEncodedTableIT.java index 42653ac53da..9261264e936 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SetPropertyOnEncodedTableIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SetPropertyOnEncodedTableIT.java @@ -23,7 +23,7 @@ import org.junit.experimental.categories.Category; import org.junit.runners.Parameterized.Parameters; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class SetPropertyOnEncodedTableIT extends SetPropertyIT { public SetPropertyOnEncodedTableIT(boolean columnEncoded) { super(columnEncoded); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SetPropertyOnNonEncodedTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SetPropertyOnNonEncodedTableIT.java index 6a9c4ab01b4..12068f35f95 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SetPropertyOnNonEncodedTableIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SetPropertyOnNonEncodedTableIT.java @@ -23,7 +23,7 @@ import org.junit.experimental.categories.Category; import org.junit.runners.Parameterized.Parameters; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class SetPropertyOnNonEncodedTableIT extends SetPropertyIT { public SetPropertyOnNonEncodedTableIT(boolean columnEncoded) { super(columnEncoded); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ShowCreateTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ShowCreateTableIT.java index 051281d18d8..f9c2c8927f9 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ShowCreateTableIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ShowCreateTableIT.java @@ -31,7 +31,7 @@ import static org.apache.phoenix.query.QueryConstants.ENCODED_CQ_COUNTER_INITIAL_VALUE; import static org.junit.Assert.assertTrue; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ShowCreateTableIT extends ParallelStatsDisabledIT { @Test public void testShowCreateTableBasic() throws Exception { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SignFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SignFunctionEnd2EndIT.java index b0942f2a832..83e2cf1a6e4 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SignFunctionEnd2EndIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SignFunctionEnd2EndIT.java @@ -36,7 +36,7 @@ * End to end tests for {@link SignFunction} * @since 4.0.0 */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class SignFunctionEnd2EndIT extends ParallelStatsDisabledIT { private static final String KEY = "key"; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java index 22361c7eb33..41f9239ecff 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java @@ -44,7 +44,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class SkipScanAfterManualSplitIT extends ParallelStatsDisabledIT { private static final int BATCH_SIZE = 25; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java index 45a1a56d798..77e0a05a44f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java @@ -43,10 +43,8 @@ import org.apache.hadoop.hbase.filter.Filter; import org.apache.hadoop.hbase.filter.FilterList; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.phoenix.compile.ExplainPlan; import org.apache.phoenix.compile.QueryPlan; import org.apache.phoenix.filter.SkipScanFilter; -import org.apache.phoenix.jdbc.PhoenixPreparedStatement; import org.apache.phoenix.jdbc.PhoenixStatement; import org.apache.phoenix.util.TestUtil; import org.apache.phoenix.util.SchemaUtil; @@ -57,7 +55,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class SkipScanQueryIT extends ParallelStatsDisabledIT { private String initIntInTable(Connection conn, List data) throws SQLException { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java index fe64d7dfc65..ba13fa64354 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java @@ -35,7 +35,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java index e52dbb4e23c..74525a176a2 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java @@ -58,7 +58,7 @@ */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class SortOrderIT extends ParallelStatsDisabledIT { protected String baseTableName; protected static final Set TABLE_NAMES = new HashSet<>(); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderWithRegionMoves2IT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderWithRegionMoves2IT.java index ef317ec4c53..5234596b189 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderWithRegionMoves2IT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderWithRegionMoves2IT.java @@ -37,7 +37,7 @@ import java.util.Map; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class SortOrderWithRegionMoves2IT extends SortOrderIT { private static final Logger LOGGER = LoggerFactory.getLogger(SortOrderWithRegionMoves2IT.class); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderWithRegionMovesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderWithRegionMovesIT.java index d98f74f6250..1475fb8ac8e 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderWithRegionMovesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderWithRegionMovesIT.java @@ -49,7 +49,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class SortOrderWithRegionMovesIT extends SortOrderIT { private static final Logger LOGGER = LoggerFactory.getLogger(SortOrderWithRegionMovesIT.class); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java index 091a29e984e..37cb6ae67f1 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java @@ -52,7 +52,7 @@ * cluster. */ -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class SpillableGroupByIT extends BaseOwnClusterIT { private static final int NUM_ROWS_INSERTED = 1000; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java index 1acec125ae8..1ae49d01f0c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java @@ -35,7 +35,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class SpooledTmpFileDeleteIT extends ParallelStatsDisabledIT { private static final String PRINCIPAL = "noRenewLease"; private File spoolDir; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SqrtFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SqrtFunctionEnd2EndIT.java index f4fb4ff05ed..502b6a9ed69 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SqrtFunctionEnd2EndIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SqrtFunctionEnd2EndIT.java @@ -34,7 +34,7 @@ /** * End to end tests for {@link SqrtFunction} */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class SqrtFunctionEnd2EndIT extends ParallelStatsDisabledIT { private static final String KEY = "key"; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java index 4d7bb8351a5..e5dc25c59ca 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java @@ -38,7 +38,7 @@ */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class StatementHintsIT extends ParallelStatsDisabledIT { private static final String TABLE_NAME = generateUniqueName(); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java index 02a91373606..9256ce400a6 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java @@ -61,7 +61,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) @RunWith(Parameterized.class) public class StatsEnabledSplitSystemCatalogIT extends BaseTest { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java index c6298d2d300..50d9c091e91 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java @@ -31,7 +31,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class StddevIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsIT.java index 6c006e81c9b..b3c1ded91a2 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsIT.java @@ -75,7 +75,7 @@ * functionality allows having row-level versioning (similar to how KEEP_DELETED_CELLS works), but * also allows permanently deleting a row. */ -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) @RunWith(Parameterized.class) public class StoreNullsIT extends ParallelStatsDisabledIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsPropIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsPropIT.java index b6d547b7acb..09cd17a17ac 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsPropIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsPropIT.java @@ -30,7 +30,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class StoreNullsPropIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringIT.java index 692bde297e7..52102fd8bec 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringIT.java @@ -44,7 +44,7 @@ * Tests for the LPAD built-in function. */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class StringIT extends ParallelStatsDisabledIT { /** diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringToArrayFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringToArrayFunctionIT.java index 5742928f230..327a6982d49 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringToArrayFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringToArrayFunctionIT.java @@ -32,7 +32,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class StringToArrayFunctionIT extends ParallelStatsDisabledIT { private String tableName; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SumFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SumFunctionIT.java index b304e984f8f..329310c6e90 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SumFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SumFunctionIT.java @@ -29,7 +29,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class SumFunctionIT extends ParallelStatsDisabledIT { @Test public void testSumFunctionWithCaseWhenStatement() throws Exception { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SupportsDistributedClusterTest.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SupportsDistributedClusterTest.java new file mode 100644 index 00000000000..ce59c29e387 --- /dev/null +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SupportsDistributedClusterTest.java @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you maynot use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicablelaw or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.phoenix.end2end; + +/** + * Marker class to denote that the test needs to run its own + * mini cluster that is separate from the clusters used by + * tests annotated as {@link ParallelStatsDisabledTest} or + * {@link ParallelStatsEnabledTest}. + * As much as possible, tests should be able to run in one of the + * mini clusters used by {@link ParallelStatsDisabledTest} or + * {@link ParallelStatsEnabledTest}. In the *rare* case it can't + * you would need to annotate the test as {@link NeedsOwnMiniClusterTest} + * otherwise the test won't be executed when you run mvn verify or mvn install. + * @since 4.1 + */ +public class SupportsDistributedClusterTest { + +} diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogRegionObserverIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogRegionObserverIT.java index 764c7e21673..e0af09dae44 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogRegionObserverIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogRegionObserverIT.java @@ -42,7 +42,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class SystemCatalogRegionObserverIT extends BaseTest { public SystemCatalogRegionObserverIT() { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogRollbackEnabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogRollbackEnabledIT.java index fb2e379e594..9fd4268f9ab 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogRollbackEnabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogRollbackEnabledIT.java @@ -54,7 +54,7 @@ * is set to true and SYSTEM.CATALOG should not be allowed to split. * Note that this config must be set on both the client and server */ -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class SystemCatalogRollbackEnabledIT extends BaseTest { @BeforeClass diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemTablesCreationOnConnectionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemTablesCreationOnConnectionIT.java index 84074c349a7..14dfb609db1 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemTablesCreationOnConnectionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemTablesCreationOnConnectionIT.java @@ -84,7 +84,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class SystemTablesCreationOnConnectionIT { private static final Logger LOGGER = LoggerFactory.getLogger( diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java index 4f0b50bb029..b803c24cdb0 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java @@ -80,7 +80,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) @RunWith(Parameterized.class) public class TableSnapshotReadsMapReduceIT extends BaseTest { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableTTLIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableTTLIT.java index 1d68ce776c7..985b612459a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableTTLIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableTTLIT.java @@ -52,7 +52,7 @@ import static org.junit.Assert.*; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) @RunWith(Parameterized.class) public class TableTTLIT extends BaseTest { private static final Logger LOG = diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantIdTypeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantIdTypeIT.java index 8fe3a105ff3..b30f5ef81ef 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantIdTypeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantIdTypeIT.java @@ -42,7 +42,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Lists; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) @RunWith(Parameterized.class) public class TenantIdTypeIT extends ParallelStatsDisabledIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java index ab6e1831037..833cc15d9bd 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java @@ -35,7 +35,6 @@ import java.sql.Connection; import java.sql.DatabaseMetaData; -import java.sql.Driver; import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.SQLException; @@ -71,7 +70,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsEnabledTest.class) +@Category({ParallelStatsEnabledTest.class}) public class TenantSpecificTablesDDLIT extends BaseTenantSpecificTablesIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java index 3f406f72e33..98f030149e6 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java @@ -42,7 +42,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsEnabledTest.class) +@Category({ParallelStatsEnabledTest.class}) public class TenantSpecificTablesDMLIT extends BaseTenantSpecificTablesIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java index 6d60fb42068..0fb955e26e6 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java @@ -47,7 +47,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class TenantSpecificViewIndexIT extends BaseTenantSpecificViewIndexIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java index f6a123b92e8..81e2ce869c1 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java @@ -25,8 +25,8 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -@Category(NeedsOwnMiniClusterTest.class) @RunWith(Parameterized.class) +@Category({NeedsOwnMiniClusterTest.class}) public class TenantSpecificViewIndexSaltedIT extends BaseTenantSpecificViewIndexIT { private final Integer saltBuckets; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimeZoneDisplacementIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimeZoneDisplacementIT.java index 5c6c99a90b6..88673d6765c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimeZoneDisplacementIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimeZoneDisplacementIT.java @@ -37,7 +37,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsEnabledTest.class) +@Category({ParallelStatsEnabledTest.class}) public class TimeZoneDisplacementIT extends ParallelStatsEnabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java index 9ab72088ab6..ddd1e3426dd 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java @@ -35,7 +35,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class TimezoneOffsetFunctionIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java index ba26fd1806d..b1a9a3e3825 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java @@ -49,7 +49,7 @@ * @since 0.1 */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class ToCharFunctionIT extends ParallelStatsDisabledIT { private String TO_CHAR_TABLE_NAME; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToDateFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToDateFunctionIT.java index 48f7f1b77d7..32523d1ffef 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToDateFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToDateFunctionIT.java @@ -31,7 +31,7 @@ import static org.junit.Assert.*; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ToDateFunctionIT extends ParallelStatsDisabledIT { private static final long ONE_HOUR_IN_MILLIS = 1000L * 60L * 60L; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java index 477f69f7d31..0988d7e9a21 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java @@ -46,7 +46,7 @@ * @since 0.1 */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class ToNumberFunctionIT extends ParallelStatsDisabledIT { // This test changes to locale to en_US, and saves the previous locale here diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java index 429713dfb24..448447d0463 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java @@ -39,7 +39,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class TopNIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TransactionalViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TransactionalViewIT.java index 8e727c324c4..3746f77b782 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TransactionalViewIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TransactionalViewIT.java @@ -38,7 +38,7 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -@Category(ParallelStatsEnabledTest.class) +@Category({ParallelStatsEnabledTest.class}) @RunWith(Parameterized.class) public class TransactionalViewIT extends ParallelStatsEnabledIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java index 55636d8afe6..7db94c90e51 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java @@ -39,7 +39,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class TruncateFunctionIT extends ParallelStatsDisabledIT { private static final String DS1 = "1970-01-10 00:58:01.587"; private static final String DS2 = "1970-01-20 01:02:45.906"; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UncoveredIndexWithRegionMovesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UncoveredIndexWithRegionMovesIT.java index 91d793e966b..b835f13ef27 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UncoveredIndexWithRegionMovesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UncoveredIndexWithRegionMovesIT.java @@ -63,7 +63,7 @@ /** * Uncovered index tests that include some region moves while performing rs#next. */ -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class UncoveredIndexWithRegionMovesIT extends ParallelStatsDisabledIT { private static final Logger LOGGER = diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedIT.java index 411b2f2b83c..2b7d00194de 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedIT.java @@ -47,7 +47,7 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) @RunWith(Parameterized.class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class UngroupedIT extends BaseQueryIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnionAllIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnionAllIT.java index 728edc15e69..ec6730ea59c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnionAllIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnionAllIT.java @@ -44,7 +44,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class UnionAllIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java index b788f108ecf..adc8eb1e0f4 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java @@ -33,7 +33,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public abstract class UnnestArrayIT extends ParallelStatsDisabledIT { private String tableName; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpdateCacheAcrossDifferentClientsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpdateCacheAcrossDifferentClientsIT.java index a9d0f69cdaf..cb856ae5588 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpdateCacheAcrossDifferentClientsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpdateCacheAcrossDifferentClientsIT.java @@ -48,7 +48,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class UpdateCacheAcrossDifferentClientsIT extends BaseTest { @BeforeClass diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java index ba22c0e844d..82a647f54ef 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java @@ -107,7 +107,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class UpgradeIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeNamespaceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeNamespaceIT.java index ecc41e9c725..e94ba860877 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeNamespaceIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeNamespaceIT.java @@ -19,7 +19,6 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.snapshot.SnapshotCreationException; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.jdbc.PhoenixConnection; @@ -49,7 +48,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class UpgradeNamespaceIT extends ParallelStatsDisabledIT { @Test public void testMapTableToNamespaceDuringUpgrade() diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpperLowerFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpperLowerFunctionIT.java index beaeb879814..8b1077606e4 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpperLowerFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpperLowerFunctionIT.java @@ -31,7 +31,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class, SupportsDistributedClusterTest.class}) public class UpperLowerFunctionIT extends ParallelStatsDisabledIT { private static String tableName = generateUniqueName(); private static String firstName = "Joe"; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java index 1dd96796e83..ededb1b9ce9 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java @@ -36,7 +36,7 @@ import org.junit.experimental.categories.Category; import org.apache.phoenix.thirdparty.com.google.common.collect.Lists; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class UpsertBigValuesIT extends ParallelStatsDisabledIT { private static final long INTEGER_MIN_MINUS_ONE = (long)Integer.MIN_VALUE - 1; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java index d3f8fbd00d8..a8a9a9dbb9f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java @@ -37,7 +37,7 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) @RunWith(Parameterized.class) public class UpsertSelectAutoCommitIT extends ParallelStatsDisabledIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java index e63ccad707b..178ebd35533 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java @@ -73,7 +73,7 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) @RunWith(Parameterized.class) public class UpsertSelectIT extends ParallelStatsDisabledIT { private final String allowServerSideMutations; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectWithRegionMovesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectWithRegionMovesIT.java index b89a20bcc6f..d4aaed5374d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectWithRegionMovesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectWithRegionMovesIT.java @@ -75,7 +75,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) @RunWith(Parameterized.class) public class UpsertSelectWithRegionMovesIT extends ParallelStatsDisabledWithRegionMovesIT { private final String allowServerSideMutations; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java index 52a75538955..243890b5a3b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java @@ -61,10 +61,9 @@ import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.junit.function.ThrowingRunnable; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class UpsertValuesIT extends ParallelStatsDisabledIT { @Test public void testGroupByWithLimitOverRowKey() throws Exception { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertWithSCNIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertWithSCNIT.java index 8369d2eb543..322648c0a8e 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertWithSCNIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertWithSCNIT.java @@ -35,7 +35,7 @@ import static org.junit.Assert.assertTrue; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class UpsertWithSCNIT extends ParallelStatsDisabledIT { @Rule diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UseSchemaIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UseSchemaIT.java index d4dc1d5104a..aef359fca5e 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UseSchemaIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UseSchemaIT.java @@ -43,7 +43,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class UseSchemaIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UserDefinedFunctionsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UserDefinedFunctionsIT.java index 624fda60e6d..7b559bfe032 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UserDefinedFunctionsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UserDefinedFunctionsIT.java @@ -77,7 +77,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; import org.junit.rules.TestName; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class UserDefinedFunctionsIT extends BaseOwnClusterIT { protected static final String TENANT_ID = "ZZTop"; private static String url; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java index 8497fe0e791..3b6f41a7b25 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java @@ -48,7 +48,7 @@ import org.junit.experimental.categories.Category; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class VariableLengthPKIT extends ParallelStatsDisabledIT { private static final String DS1 = "1970-01-01 00:58:00"; private static final Date D1 = toDate(DS1); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewConcurrencyAndFailureIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewConcurrencyAndFailureIT.java index 22df710bc12..8a4e71789cf 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewConcurrencyAndFailureIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewConcurrencyAndFailureIT.java @@ -80,7 +80,7 @@ * Tests for views dealing with other ongoing concurrent operations and * failure scenarios */ -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) @RunWith(Parameterized.class) public class ViewConcurrencyAndFailureIT extends SplitSystemCatalogIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewExtendsPkRestrictionsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewExtendsPkRestrictionsIT.java index 05071ecba75..d7ae706598c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewExtendsPkRestrictionsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewExtendsPkRestrictionsIT.java @@ -41,7 +41,7 @@ /** * Tests for restrictions associated with view extending primary key of its parent. */ -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class ViewExtendsPkRestrictionsIT extends ParallelStatsDisabledIT { private static final Logger LOGGER = LoggerFactory.getLogger(ViewExtendsPkRestrictionsIT.class); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java index 60de875c401..6be0bc22b61 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java @@ -90,7 +90,7 @@ /** * Basic test suite for views */ -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) @RunWith(Parameterized.class) public class ViewIT extends SplitSystemCatalogIT { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIndexIdRetrieveIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIndexIdRetrieveIT.java index 82f64f7266c..c0541cc47d3 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIndexIdRetrieveIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIndexIdRetrieveIT.java @@ -51,7 +51,7 @@ a coproc that checks the client request version and send it back to the client. For more information, please see PHOENIX-3547, PHOENIX-5712 */ -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class, SupportsDistributedClusterTest.class}) public class ViewIndexIdRetrieveIT extends BaseTest { private final String BASE_TABLE_DDL = "CREATE TABLE %s (TENANT_ID CHAR(15) NOT NULL, " + "ID CHAR(3) NOT NULL, NUM BIGINT CONSTRAINT PK PRIMARY KEY (TENANT_ID, ID))" + diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewMetadataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewMetadataIT.java index 4cbfc8bf403..17a19877ada 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewMetadataIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewMetadataIT.java @@ -103,7 +103,7 @@ /** * Test suite related to view metadata */ -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class ViewMetadataIT extends SplitSystemCatalogIT { private static RegionCoprocessorEnvironment TaskRegionEnvironment; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLIT.java index 34cb0a29529..f6508e2818b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLIT.java @@ -87,7 +87,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class ViewTTLIT extends BaseViewTTLIT { public ViewTTLIT(boolean useCondExpression) { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLNotEnabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLNotEnabledIT.java index c4e5e677aba..9ace0d51cfb 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLNotEnabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLNotEnabledIT.java @@ -51,7 +51,7 @@ import static org.apache.phoenix.util.PhoenixRuntime.TENANT_ID_ATTRIB; import static org.junit.Assert.fail; -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class ViewTTLNotEnabledIT extends ParallelStatsDisabledIT { @BeforeClass diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewUtilIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewUtilIT.java index 60150ed2021..68c63f2d8de 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewUtilIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewUtilIT.java @@ -53,7 +53,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -@Category(ParallelStatsDisabledTest.class) +@Category({ParallelStatsDisabledTest.class}) public class ViewUtilIT extends ParallelStatsDisabledIT { @Test diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/WALAnnotationIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/WALAnnotationIT.java index 0c6999ff165..67e68b3a318 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/WALAnnotationIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/WALAnnotationIT.java @@ -70,7 +70,7 @@ import static org.junit.Assert.fail; @RunWith(Parameterized.class) -@Category(NeedsOwnMiniClusterTest.class) +@Category({NeedsOwnMiniClusterTest.class}) public class WALAnnotationIT extends BaseTest { private final boolean isImmutable; private final boolean isMultiTenant; diff --git a/phoenix-core/src/test/java/org/apache/phoenix/PhoenixTestTableName.java b/phoenix-core/src/test/java/org/apache/phoenix/PhoenixTestTableName.java new file mode 100644 index 00000000000..5d14e687ed7 --- /dev/null +++ b/phoenix-core/src/test/java/org/apache/phoenix/PhoenixTestTableName.java @@ -0,0 +1,57 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.phoenix; + +import org.apache.hadoop.hbase.TableName; +import org.junit.rules.TestWatcher; +import org.junit.runner.Description; + +public class PhoenixTestTableName extends TestWatcher { + + private String tableName; + + @Override + protected void starting(Description description) { + tableName = TableName.valueOf(cleanUpTestName(description.getClassName())).getNameAsString(); + } + + /** + * Helper to handle parameterized method names. Unlike regular test methods, parameterized method + * names look like 'foo[x]'. This is problematic for tests that use this name for HBase tables. + * This helper strips out the parameter suffixes. + * @return current test method name with out parameterized suffixes. + */ + public static String cleanUpTestName(String className) { + int lastIndex = className.lastIndexOf('.'); + if (lastIndex == -1) { + return className; + } + String testName = className.substring(lastIndex+1).toUpperCase(); + if(testName.contains("$")){ + return testName.replace("$", "_"); + } + return className.substring(lastIndex+1).toUpperCase(); + } + + public String getTableName() { + return tableName; + } + public void setTableName(String tableName) { + this.tableName = tableName; + } +} + 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 a7fcfd2cb34..2fbbac8e33d 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 @@ -18,13 +18,12 @@ package org.apache.phoenix.query; import static org.apache.hadoop.hbase.coprocessor.CoprocessorHost.REGIONSERVER_COPROCESSOR_CONF_KEY; +import static org.apache.hadoop.hbase.HConstants.ZOOKEEPER_CLIENT_PORT; import static org.apache.phoenix.hbase.index.write.ParallelWriterIndexCommitter.NUM_CONCURRENT_INDEX_WRITER_THREADS_CONF_KEY; import static org.apache.phoenix.query.QueryConstants.MILLIS_IN_DAY; import static org.apache.phoenix.query.QueryServices.DROP_METADATA_ATTRIB; import static org.apache.phoenix.query.QueryServices.GLOBAL_INDEX_ROW_AGE_THRESHOLD_TO_DELETE_MS_ATTRIB; import static org.apache.phoenix.util.PhoenixRuntime.CURRENT_SCN_ATTRIB; -import static org.apache.phoenix.util.PhoenixRuntime.JDBC_PROTOCOL; -import static org.apache.phoenix.util.PhoenixRuntime.JDBC_PROTOCOL_TERMINATOR; import static org.apache.phoenix.util.PhoenixRuntime.PHOENIX_TEST_DRIVER_URL_PARAM; import static org.apache.phoenix.util.TestUtil.ATABLE_NAME; import static org.apache.phoenix.util.TestUtil.A_VALUE; @@ -135,6 +134,7 @@ import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.regionserver.RSRpcServices; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.phoenix.PhoenixTestTableName; import org.apache.phoenix.SystemExitRule; import org.apache.phoenix.compat.hbase.CompatUtil; import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest; @@ -167,6 +167,7 @@ import org.apache.phoenix.util.ServerUtil.ConnectionFactory; import org.apache.phoenix.util.TestUtil; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.rules.TemporaryFolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -460,8 +461,10 @@ protected static String checkClusterInitialized(ReadOnlyProps serverProps) throw protected static String setUpTestCluster(@Nonnull Configuration conf, ReadOnlyProps overrideProps) throws Exception { boolean isDistributedCluster = isDistributedClusterModeEnabled(conf); if (!isDistributedCluster) { + TEARDOWN_THRESHOLD.set(30); return initMiniCluster(conf, overrideProps); } else { + TEARDOWN_THRESHOLD.set(1); return initClusterDistributedMode(conf, overrideProps); } } @@ -587,6 +590,7 @@ protected static String getLocalClusterUrl(HBaseTestingUtility util, String prin */ private static String initClusterDistributedMode(Configuration conf, ReadOnlyProps overrideProps) throws Exception { setTestConfigForDistribuedCluster(conf, overrideProps); + conf.set(ZOOKEEPER_CLIENT_PORT, System.getProperty(ZOOKEEPER_CLIENT_PORT)); try { IntegrationTestingUtility util = new IntegrationTestingUtility(conf); utility = util; @@ -594,7 +598,7 @@ private static String initClusterDistributedMode(Configuration conf, ReadOnlyPro } catch (Exception e) { throw new RuntimeException(e); } - return JDBC_PROTOCOL + JDBC_PROTOCOL_TERMINATOR + PHOENIX_TEST_DRIVER_URL_PARAM; + return getLocalClusterUrl(utility); } private static void setTestConfigForDistribuedCluster(Configuration conf, ReadOnlyProps overrideProps) throws Exception { @@ -805,7 +809,10 @@ protected ResultSet executeQuery(Connection conn, QueryBuilder queryBuilder) thr * Note, we can't have this value too high since we don't want the shutdown to take too * long a time either. */ - private static final int TEARDOWN_THRESHOLD = 30; + private static final AtomicInteger TEARDOWN_THRESHOLD = new AtomicInteger(0); + + @ClassRule + public static PhoenixTestTableName phoenixTestTableName = new PhoenixTestTableName(); public static String generateUniqueName() { int nextName = NAME_SUFFIX.incrementAndGet(); @@ -813,7 +820,11 @@ public static String generateUniqueName() { throw new IllegalStateException("Used up all unique names"); } TABLE_COUNTER.incrementAndGet(); - return "N" + Integer.toString(MAX_SUFFIX_VALUE + nextName).substring(1); + if (!isDistributedClusterModeEnabled(config)) { + phoenixTestTableName.setTableName("N" + Integer.toString(MAX_SUFFIX_VALUE + nextName).substring(1)); + return phoenixTestTableName.getTableName(); + } + return phoenixTestTableName.getTableName() + "_" + Integer.toString(MAX_SUFFIX_VALUE + nextName).substring(1); } private static AtomicInteger SEQ_NAME_SUFFIX = new AtomicInteger(0); @@ -840,18 +851,18 @@ public static void assertMetadata(Connection conn, PTable.ImmutableStorageScheme } public static synchronized void freeResourcesIfBeyondThreshold() throws Exception { - if (TABLE_COUNTER.get() > TEARDOWN_THRESHOLD) { + if (TABLE_COUNTER.get() > TEARDOWN_THRESHOLD.get()) { int numTables = TABLE_COUNTER.get(); TABLE_COUNTER.set(0); if (isDistributedClusterModeEnabled(config)) { LOGGER.info("Deleting old tables on distributed cluster because " + "number of tables is likely greater than {}", - TEARDOWN_THRESHOLD); + TEARDOWN_THRESHOLD.get()); deletePriorMetaData(HConstants.LATEST_TIMESTAMP, url); } else { LOGGER.info("Shutting down mini cluster because number of tables" + " on this mini cluster is likely greater than {}", - TEARDOWN_THRESHOLD); + TEARDOWN_THRESHOLD.get()); resetHbase(); } } @@ -924,14 +935,17 @@ private static void deletePriorSchemas(long ts, String url) throws Exception { } try (Connection conn = DriverManager.getConnection(url, props)) { DatabaseMetaData dbmd = conn.getMetaData(); - ResultSet rs = dbmd.getSchemas(); + ResultSet rs = dbmd.getSchemas(null, "%" + phoenixTestTableName.getTableName() + "%"); while (rs.next()) { String schemaName = rs.getString(PhoenixDatabaseMetaData.TABLE_SCHEM); + if ((schemaName == null) || (schemaName != null && schemaName.isEmpty())) { + continue; + } if (schemaName.equals(PhoenixDatabaseMetaData.SYSTEM_SCHEMA_NAME)) { continue; } schemaName = SchemaUtil.getEscapedArgument(schemaName); - + LOGGER.info("Dropping schema " + schemaName + " for cleanup."); String ddl = "DROP SCHEMA " + schemaName; conn.createStatement().executeUpdate(ddl); } @@ -941,10 +955,17 @@ private static void deletePriorSchemas(long ts, String url) throws Exception { props.remove(CURRENT_SCN_ATTRIB); try (Connection seeLatestConn = DriverManager.getConnection(url, props)) { DatabaseMetaData dbmd = seeLatestConn.getMetaData(); - ResultSet rs = dbmd.getSchemas(); - boolean hasSchemas = rs.next(); - if (hasSchemas) { + ResultSet rs = dbmd.getSchemas(null, "%" + phoenixTestTableName.getTableName() + "%"); + boolean hasSchemas = false; + while (rs.next()) { String schemaName = rs.getString(PhoenixDatabaseMetaData.TABLE_SCHEM); + if ((schemaName == null) || (schemaName != null && schemaName.isEmpty())) { + continue; + } + if (schemaName.equals(PhoenixDatabaseMetaData.SYSTEM_SCHEMA_NAME)) { + continue; + } + schemaName = SchemaUtil.getEscapedArgument(schemaName); if (schemaName.equals(PhoenixDatabaseMetaData.SYSTEM_SCHEMA_NAME)) { hasSchemas = rs.next(); } @@ -975,7 +996,11 @@ private static void deletePriorTables(long ts, String tenantId, String url) thro } Connection conn = DriverManager.getConnection(url, props); try { - deletePriorTables(ts, conn, url); + if(isDistributedClusterModeEnabled(config)){ + deleteCurrentTestTables(ts, conn, url); + }else{ + deletePriorTables(ts, conn, url); + } deletePriorSequences(ts, conn); // Make sure all tables and views have been dropped @@ -999,7 +1024,6 @@ private static void deletePriorTables(long ts, String tenantId, String url) thro conn.close(); } } - private static void deletePriorTables(long ts, Connection globalConn, String url) throws Exception { DatabaseMetaData dbmd = globalConn.getMetaData(); // Drop VIEWs first, as we don't allow a TABLE with views to be dropped @@ -1013,6 +1037,47 @@ private static void deletePriorTables(long ts, Connection globalConn, String url String fullTableName = SchemaUtil.getEscapedTableName( rs.getString(PhoenixDatabaseMetaData.TABLE_SCHEM), rs.getString(PhoenixDatabaseMetaData.TABLE_NAME)); + + String ddl = "DROP " + rs.getString(PhoenixDatabaseMetaData.TABLE_TYPE) + " " + fullTableName + " CASCADE"; + String tenantId = rs.getString(1); + if (tenantId != null && !tenantId.equals(lastTenantId)) { + if (lastTenantId != null) { + conn.close(); + } + // Open tenant-specific connection when we find a new one + Properties props = PropertiesUtil.deepCopy(globalConn.getClientInfo()); + props.setProperty(PhoenixRuntime.TENANT_ID_ATTRIB, tenantId); + conn = DriverManager.getConnection(url, props); + lastTenantId = tenantId; + } + try { + conn.createStatement().executeUpdate(ddl); + } catch (NewerTableAlreadyExistsException ex) { + LOGGER.info("Newer table " + fullTableName + " or its delete marker exists. Ignore current deletion"); + } catch (TableNotFoundException ex) { + LOGGER.info("Table " + fullTableName + " is already deleted."); + } + } + rs.close(); + if (lastTenantId != null) { + conn.close(); + } + } + } + private static void deleteCurrentTestTables(long ts, Connection globalConn, String url) throws Exception { + DatabaseMetaData dbmd = globalConn.getMetaData(); + // Drop VIEWs first, as we don't allow a TABLE with views to be dropped + // Tables are sorted by TENANT_ID + List tableTypesList = Arrays.asList(new String[] {PTableType.VIEW.toString()}, new String[] {PTableType.TABLE.toString()}); + for (String[] tableTypes: tableTypesList) { + ResultSet rs = dbmd.getTables(null, null, "%" + phoenixTestTableName.getTableName() + "%", tableTypes); + String lastTenantId = null; + Connection conn = globalConn; + while (rs.next()) { + String fullTableName = SchemaUtil.getEscapedTableName( + rs.getString(PhoenixDatabaseMetaData.TABLE_SCHEM), + rs.getString(PhoenixDatabaseMetaData.TABLE_NAME)); + LOGGER.info("Dropping Table " + fullTableName + " for cleanup."); String ddl = "DROP " + rs.getString(PhoenixDatabaseMetaData.TABLE_TYPE) + " " + fullTableName + " CASCADE"; String tenantId = rs.getString(1); if (tenantId != null && !tenantId.equals(lastTenantId)) { diff --git a/pom.xml b/pom.xml index 82edabb5be3..c9d61c91f10 100644 --- a/pom.xml +++ b/pom.xml @@ -171,7 +171,7 @@ false 8 7 - false + false false @@ -418,6 +418,17 @@ verify + + SignOffTests + + false + org.apache.phoenix.end2end.SupportsDistributedClusterTest + + + integration-test + verify + +