You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2021/09/23 03:55:25 UTC
[phoenix] branch 5.1 updated: PHOENIX-6537 Fix CI pipeline and
upgrade Yetus
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new 90bc184 PHOENIX-6537 Fix CI pipeline and upgrade Yetus
90bc184 is described below
commit 90bc18467a4c0ec37c425e9de1bd045b2d52c342
Author: Istvan Toth <st...@apache.org>
AuthorDate: Thu Sep 9 08:16:57 2021 +0200
PHOENIX-6537 Fix CI pipeline and upgrade Yetus
update Yetus to 0.13
update Yetus personality to patch in mvn verify in the yetus module
update Yetus personality to not rebuild hbase twice
skip shaded and assembly modules during CI
update Jacoco maven plugin to 0.8.7
disable Jacoco for CI runs
increase test kill timeout for Failsafe
update Surefire/Failsafe maven plugin to 3.0.0-M5
refactor Junit @Category annotations for new Surefire/failsafe version
update OWASP maven plugin to 6.3.1
create /var/run in Yetus docker images for gpg
fix hbase table cleanup code in BaseTest
---
Jenkinsfile | 2 +-
Jenkinsfile.github | 4 +-
dev/cache-apache-project-artifact.sh | 4 +-
dev/create-release/phoenix-rm/Dockerfile | 2 +-
dev/docker/Dockerfile.multibranch | 14 +-
dev/docker/Dockerfile.yetus | 12 +-
dev/jenkins_precommit_github_yetus.sh | 2 -
dev/phoenix-personality.sh | 27 +-
.../StatisticsCollectionRunTrackerIT.java | 3 +
.../phoenix/end2end/AbsFunctionEnd2EndIT.java | 2 +
.../org/apache/phoenix/end2end/AggregateIT.java | 2 +
.../apache/phoenix/end2end/AggregateQueryIT.java | 2 +
.../phoenix/end2end/AlterAddCascadeIndexIT.java | 2 +
.../end2end/AlterMultiTenantTableWithViewsIT.java | 3 +-
.../org/apache/phoenix/end2end/AlterSessionIT.java | 2 +
.../org/apache/phoenix/end2end/AlterTableIT.java | 2 +
.../phoenix/end2end/AlterTableWithViewsIT.java | 2 +
.../apache/phoenix/end2end/AppendOnlySchemaIT.java | 2 +
.../apache/phoenix/end2end/ArithmeticQueryIT.java | 3 +-
.../java/org/apache/phoenix/end2end/Array1IT.java | 3 +-
.../java/org/apache/phoenix/end2end/Array2IT.java | 2 +
.../java/org/apache/phoenix/end2end/Array3IT.java | 2 +
.../phoenix/end2end/ArrayAppendFunctionIT.java | 2 +
.../phoenix/end2end/ArrayConcatFunctionIT.java | 2 +
.../phoenix/end2end/ArrayFillFunctionIT.java | 2 +
.../phoenix/end2end/ArrayPrependFunctionIT.java | 2 +
.../phoenix/end2end/ArrayRemoveFunctionIT.java | 2 +
.../phoenix/end2end/ArrayToStringFunctionIT.java | 2 +
.../apache/phoenix/end2end/ArraysWithNullsIT.java | 2 +
.../org/apache/phoenix/end2end/AuditLoggingIT.java | 2 +
.../org/apache/phoenix/end2end/AutoCommitIT.java | 2 +
.../phoenix/end2end/AutoPartitionViewsIT.java | 2 +
.../apache/phoenix/end2end/BaseOwnClusterIT.java | 5 +-
.../apache/phoenix/end2end/BasePermissionsIT.java | 1 -
.../end2end/BaseTenantSpecificViewIndexIT.java | 2 +-
.../end2end/BaseUniqueNamesOwnClusterIT.java | 33 --
.../org/apache/phoenix/end2end/BaseViewIT.java | 2 +
.../org/apache/phoenix/end2end/BinaryRowKeyIT.java | 2 +
.../apache/phoenix/end2end/CSVCommonsLoaderIT.java | 2 +
.../apache/phoenix/end2end/CaseStatementIT.java | 2 +
.../apache/phoenix/end2end/CastAndCoerceIT.java | 2 +
.../phoenix/end2end/CbrtFunctionEnd2EndIT.java | 2 +
.../phoenix/end2end/ClientHashAggregateIT.java | 2 +
.../apache/phoenix/end2end/CoalesceFunctionIT.java | 2 +
.../phoenix/end2end/CollationKeyFunctionIT.java | 2 +
.../phoenix/end2end/ColumnEncodedBytesPropIT.java | 2 +
.../end2end/ColumnProjectionOptimizationIT.java | 2 +
.../end2end/ConcurrentMutationsExtendedIT.java | 3 +-
.../phoenix/end2end/ConcurrentMutationsIT.java | 2 +
.../ConcurrentUpsertsWithoutIndexedColsIT.java | 5 +-
.../phoenix/end2end/ConfigurableCacheIT.java | 2 +
.../phoenix/end2end/ConvertTimezoneFunctionIT.java | 2 +
.../phoenix/end2end/CostBasedDecisionIT.java | 5 +-
.../CountDistinctApproximateHyperLogLogIT.java | 2 +
.../end2end/CountDistinctCompressionIT.java | 6 +-
.../org/apache/phoenix/end2end/CreateSchemaIT.java | 2 +
.../org/apache/phoenix/end2end/CreateTableIT.java | 2 +
.../apache/phoenix/end2end/CsvBulkLoadToolIT.java | 2 +
.../end2end/CursorWithRowValueConstructorIT.java | 2 +
.../apache/phoenix/end2end/CustomEntityDataIT.java | 2 +
.../apache/phoenix/end2end/DateArithmeticIT.java | 3 +-
.../org/apache/phoenix/end2end/DateTimeIT.java | 2 +
.../apache/phoenix/end2end/DecodeFunctionIT.java | 2 +
.../phoenix/end2end/DefaultColumnValueIT.java | 2 +
.../java/org/apache/phoenix/end2end/DeleteIT.java | 2 +
.../org/apache/phoenix/end2end/DerivedTableIT.java | 2 +
.../apache/phoenix/end2end/DescOrderKeysIT.java | 2 +
.../phoenix/end2end/DisableLocalIndexIT.java | 2 +
.../apache/phoenix/end2end/DistinctCountIT.java | 2 +
.../phoenix/end2end/DistinctPrefixFilterIT.java | 2 +
.../apache/phoenix/end2end/DropIndexedColsIT.java | 2 +
.../org/apache/phoenix/end2end/DropSchemaIT.java | 5 +-
.../org/apache/phoenix/end2end/DropTableIT.java | 2 +
.../phoenix/end2end/DropTableWithViewsIT.java | 2 +
.../apache/phoenix/end2end/DynamicColumnIT.java | 2 +
.../phoenix/end2end/DynamicColumnWildcardIT.java | 1 +
.../apache/phoenix/end2end/DynamicFamilyIT.java | 2 +
.../apache/phoenix/end2end/DynamicUpsertIT.java | 2 +
.../org/apache/phoenix/end2end/EmptyColumnIT.java | 3 +-
.../apache/phoenix/end2end/EncodeFunctionIT.java | 3 +-
.../apache/phoenix/end2end/EvaluationOfORIT.java | 2 +
.../phoenix/end2end/ExecuteStatementsIT.java | 2 +
.../phoenix/end2end/ExpFunctionEnd2EndIT.java | 2 +
.../end2end/ExplainPlanWithStatsDisabledIT.java | 3 +-
.../end2end/ExplainPlanWithStatsEnabledIT.java | 3 +-
.../phoenix/end2end/ExtendedQueryExecIT.java | 2 +
.../phoenix/end2end/FirstValueFunctionIT.java | 2 +
.../phoenix/end2end/FirstValuesFunctionIT.java | 2 +
.../phoenix/end2end/FlappingAlterTableIT.java | 2 +
.../org/apache/phoenix/end2end/FunkyNamesIT.java | 2 +
.../end2end/GetSetByteBitFunctionEnd2EndIT.java | 2 +
.../end2end/GlobalConnectionTenantTableIT.java | 1 +
.../java/org/apache/phoenix/end2end/GroupByIT.java | 2 +
.../apache/phoenix/end2end/ImmutableTableIT.java | 2 +
.../end2end/ImmutableTablePropertiesIT.java | 2 +
.../java/org/apache/phoenix/end2end/InListIT.java | 2 +
.../java/org/apache/phoenix/end2end/InQueryIT.java | 2 +
.../phoenix/end2end/IndexBuildTimestampIT.java | 5 +-
.../apache/phoenix/end2end/IndexRebuildTaskIT.java | 5 +-
.../phoenix/end2end/IndexScrutinyToolBaseIT.java | 3 +
.../end2end/IndexToolForDeleteBeforeRebuildIT.java | 2 +
.../end2end/IndexToolForNonTxGlobalIndexIT.java | 5 +-
.../end2end/IndexToolForPartialBuildIT.java | 3 +-
...xToolForPartialBuildWithNamespaceEnabledIT.java | 2 +
.../org/apache/phoenix/end2end/IndexToolIT.java | 5 +-
.../phoenix/end2end/IndexToolTimeRangeIT.java | 6 +-
.../apache/phoenix/end2end/IndexUpgradeToolIT.java | 1 +
.../end2end/IndexVerificationOldDesignIT.java | 5 +-
.../apache/phoenix/end2end/InstrFunctionIT.java | 2 +
.../apache/phoenix/end2end/IntArithmeticIT.java | 2 +
.../java/org/apache/phoenix/end2end/IsNullIT.java | 2 +
.../java/org/apache/phoenix/end2end/KeyOnlyIT.java | 2 +
.../phoenix/end2end/LastValueFunctionIT.java | 2 +
.../phoenix/end2end/LastValuesFunctionIT.java | 2 +
.../apache/phoenix/end2end/LikeExpressionIT.java | 2 +
.../phoenix/end2end/LnLogFunctionEnd2EndIT.java | 2 +
.../org/apache/phoenix/end2end/MD5FunctionIT.java | 2 +
.../org/apache/phoenix/end2end/MapReduceIT.java | 2 +
.../phoenix/end2end/MappingTableDataTypeIT.java | 2 +
.../phoenix/end2end/MathPIFunctionEnd2EndIT.java | 2 +
.../phoenix/end2end/MathTrigFunctionEnd2EndIT.java | 2 +
.../org/apache/phoenix/end2end/MaxLookbackIT.java | 6 +-
.../apache/phoenix/end2end/MetaDataEndPointIT.java | 2 +
.../phoenix/end2end/MetaDataEndpointImplIT.java | 3 +-
.../phoenix/end2end/MinMaxAggregateFunctionIT.java | 2 +
.../phoenix/end2end/ModulusExpressionIT.java | 2 +
.../apache/phoenix/end2end/MultiCfQueryExecIT.java | 2 +
.../apache/phoenix/end2end/MutationStateIT.java | 2 +
.../phoenix/end2end/NamespaceSchemaMappingIT.java | 2 +
.../apache/phoenix/end2end/NativeHBaseTypesIT.java | 2 +
.../phoenix/end2end/NeedsOwnMiniClusterTest.java | 11 +-
.../end2end/NoLookbackMutableIndexExtendedIT.java | 3 +-
.../NonParameterizedIndexScrutinyToolIT.java | 1 +
.../NotQueryWithGlobalImmutableIndexesIT.java | 2 +
.../NotQueryWithLocalImmutableIndexesIT.java | 2 +
.../apache/phoenix/end2end/NthValueFunctionIT.java | 2 +
.../it/java/org/apache/phoenix/end2end/NullIT.java | 2 +
.../phoenix/end2end/NumericArithmeticIT.java | 3 +-
.../end2end/OctetLengthFunctionEnd2EndIT.java | 2 +
.../apache/phoenix/end2end/OnDuplicateKeyIT.java | 2 +
.../end2end/OperationTimeoutWithReasonIT.java | 2 +
.../java/org/apache/phoenix/end2end/OrderByIT.java | 636 +--------------------
.../OrderByWithServerClientSpoolingDisabledIT.java | 2 +-
.../phoenix/end2end/OrderByWithSpillingIT.java | 2 +-
.../apache/phoenix/end2end/OrphanViewToolIT.java | 2 +
.../phoenix/end2end/ParallelIteratorsIT.java | 3 +-
.../phoenix/end2end/ParallelStatsDisabledIT.java | 1 -
.../phoenix/end2end/ParallelStatsDisabledTest.java | 15 +-
.../phoenix/end2end/ParallelStatsEnabledIT.java | 1 -
.../phoenix/end2end/ParallelStatsEnabledTest.java | 15 +-
.../end2end/PartialScannerResultsDisabledIT.java | 2 +
.../org/apache/phoenix/end2end/PercentileIT.java | 2 +
.../phoenix/end2end/PermissionNSDisabledIT.java | 2 +
...sionNSDisabledWithCustomAccessControllerIT.java | 2 +
.../phoenix/end2end/PermissionNSEnabledIT.java | 3 +-
...ssionNSEnabledWithCustomAccessControllerIT.java | 2 +
.../apache/phoenix/end2end/PermissionsCacheIT.java | 2 +
.../apache/phoenix/end2end/PhoenixDriverIT.java | 5 +-
.../end2end/PhoenixRowTimestampFunctionIT.java | 2 +
.../apache/phoenix/end2end/PhoenixRuntimeIT.java | 3 +-
.../phoenix/end2end/PowerFunctionEnd2EndIT.java | 2 +
.../apache/phoenix/end2end/PrimitiveTypeIT.java | 2 +
.../apache/phoenix/end2end/ProductMetricsIT.java | 3 +-
.../end2end/ProjectArrayElemAfterHashJoinIT.java | 2 +
.../apache/phoenix/end2end/PropertiesInSyncIT.java | 2 +
.../phoenix/end2end/QueryDatabaseMetaDataIT.java | 2 +
.../phoenix/end2end/QueryExecWithoutSCNIT.java | 2 +
.../java/org/apache/phoenix/end2end/QueryIT.java | 2 +
.../org/apache/phoenix/end2end/QueryLoggerIT.java | 6 +-
.../org/apache/phoenix/end2end/QueryMoreIT.java | 2 +
.../org/apache/phoenix/end2end/QueryTimeoutIT.java | 6 +-
.../apache/phoenix/end2end/QueryWithLimitIT.java | 7 +-
.../apache/phoenix/end2end/QueryWithOffsetIT.java | 2 +
.../phoenix/end2end/QueryWithTableSampleIT.java | 2 +
.../apache/phoenix/end2end/RTrimFunctionIT.java | 2 +
.../org/apache/phoenix/end2end/RangeScanIT.java | 2 +
.../phoenix/end2end/ReadIsolationLevelIT.java | 2 +
.../org/apache/phoenix/end2end/ReadOnlyIT.java | 2 +
.../end2end/RebuildIndexConnectionPropsIT.java | 5 +-
.../phoenix/end2end/RegexBulkLoadToolIT.java | 2 +
.../phoenix/end2end/RegexpReplaceFunctionIT.java | 2 +
.../phoenix/end2end/RegexpSplitFunctionIT.java | 2 +
.../phoenix/end2end/RegexpSubstrFunctionIT.java | 2 +
.../org/apache/phoenix/end2end/RenewLeaseIT.java | 6 +-
.../apache/phoenix/end2end/ReverseFunctionIT.java | 2 +
.../org/apache/phoenix/end2end/ReverseScanIT.java | 2 +
.../phoenix/end2end/RoundFloorCeilFuncIT.java | 3 +-
.../end2end/RowKeyBytesStringFunctionIT.java | 2 +
.../org/apache/phoenix/end2end/RowTimestampIT.java | 2 +
.../phoenix/end2end/RowValueConstructorIT.java | 3 +-
.../end2end/RowValueConstructorOffsetIT.java | 2 +
.../RowValueConstructorOffsetOptionalIT.java | 2 +
.../it/java/org/apache/phoenix/end2end/SCNIT.java | 2 +
.../phoenix/end2end/SequenceBulkAllocationIT.java | 2 +
.../org/apache/phoenix/end2end/SequenceIT.java | 3 +-
.../phoenix/end2end/SequencePointInTimeIT.java | 6 +-
.../apache/phoenix/end2end/SerialIteratorsIT.java | 2 +
.../apache/phoenix/end2end/ServerExceptionIT.java | 2 +
.../end2end/SetPropertyOnEncodedTableIT.java | 2 +
.../end2end/SetPropertyOnNonEncodedTableIT.java | 2 +
.../apache/phoenix/end2end/ShowCreateTableIT.java | 2 +
.../phoenix/end2end/SignFunctionEnd2EndIT.java | 2 +
.../end2end/SkipScanAfterManualSplitIT.java | 2 +
.../apache/phoenix/end2end/SkipScanQueryIT.java | 2 +
.../phoenix/end2end/SortMergeJoinMoreIT.java | 2 +
.../org/apache/phoenix/end2end/SortOrderIT.java | 3 +-
.../apache/phoenix/end2end/SpillableGroupByIT.java | 3 +-
.../phoenix/end2end/SplitSystemCatalogIT.java | 3 +-
.../phoenix/end2end/SpooledTmpFileDeleteIT.java | 3 +-
.../phoenix/end2end/SqrtFunctionEnd2EndIT.java | 2 +
.../apache/phoenix/end2end/StatementHintsIT.java | 2 +
.../end2end/StatsEnabledSplitSystemCatalogIT.java | 5 +-
.../java/org/apache/phoenix/end2end/StddevIT.java | 2 +
.../apache/phoenix/end2end/StoreNullsPropIT.java | 2 +
.../java/org/apache/phoenix/end2end/StringIT.java | 3 +-
.../phoenix/end2end/StringToArrayFunctionIT.java | 2 +
.../org/apache/phoenix/end2end/SumFunctionIT.java | 2 +
.../phoenix/end2end/SyncUpdateCacheFreqIT.java | 2 +-
.../end2end/SystemCatalogRegionObserverIT.java | 5 +-
.../phoenix/end2end/SystemTablesUpgradeIT.java | 1 +
.../end2end/TableSnapshotReadsMapReduceIT.java | 5 +-
.../org/apache/phoenix/end2end/TenantIdTypeIT.java | 2 +
.../phoenix/end2end/TenantSpecificTablesDDLIT.java | 2 +
.../phoenix/end2end/TenantSpecificTablesDMLIT.java | 2 +
.../phoenix/end2end/TenantSpecificViewIndexIT.java | 2 +
.../end2end/TenantSpecificViewIndexSaltedIT.java | 2 +
.../phoenix/end2end/TimezoneOffsetFunctionIT.java | 2 +
.../apache/phoenix/end2end/ToCharFunctionIT.java | 2 +
.../apache/phoenix/end2end/ToDateFunctionIT.java | 2 +
.../apache/phoenix/end2end/ToNumberFunctionIT.java | 2 +
.../it/java/org/apache/phoenix/end2end/TopNIT.java | 2 +
.../phoenix/end2end/TransactionalViewIT.java | 2 +
.../apache/phoenix/end2end/TruncateFunctionIT.java | 2 +
.../org/apache/phoenix/end2end/UngroupedIT.java | 2 +
.../org/apache/phoenix/end2end/UnionAllIT.java | 2 +
.../org/apache/phoenix/end2end/UnnestArrayIT.java | 2 +
.../UpdateCacheAcrossDifferentClientsIT.java | 5 +-
.../phoenix/end2end/UpperLowerFunctionIT.java | 2 +
.../apache/phoenix/end2end/UpsertBigValuesIT.java | 3 +-
.../phoenix/end2end/UpsertSelectAutoCommitIT.java | 2 +
.../org/apache/phoenix/end2end/UpsertSelectIT.java | 2 +
.../org/apache/phoenix/end2end/UpsertValuesIT.java | 2 +
.../apache/phoenix/end2end/UpsertWithSCNIT.java | 2 +
.../org/apache/phoenix/end2end/UseSchemaIT.java | 2 +
.../phoenix/end2end/UserDefinedFunctionsIT.java | 3 +-
.../apache/phoenix/end2end/VariableLengthPKIT.java | 2 +
.../end2end/ViewConcurrencyAndFailureIT.java | 2 +
.../it/java/org/apache/phoenix/end2end/ViewIT.java | 2 +
.../phoenix/end2end/ViewIndexIdRetrieveIT.java | 5 +-
.../org/apache/phoenix/end2end/ViewUtilIT.java | 2 +
.../apache/phoenix/end2end/WALAnnotationIT.java | 3 +-
.../apache/phoenix/end2end/index/AlterIndexIT.java | 3 +
.../end2end/index/AsyncIndexDisabledIT.java | 3 +
.../phoenix/end2end/index/BaseLocalIndexIT.java | 3 +-
.../index/ChildViewsUseParentViewIndexIT.java | 3 +
.../apache/phoenix/end2end/index/DropColumnIT.java | 3 +
.../end2end/index/DropIndexDuringUpsertIT.java | 1 +
.../phoenix/end2end/index/DropMetadataIT.java | 3 +
.../end2end/index/GlobalImmutableNonTxIndexIT.java | 3 +
.../end2end/index/GlobalImmutableTxIndexIT.java | 3 +
.../end2end/index/GlobalIndexCheckerIT.java | 7 +-
.../end2end/index/GlobalMutableNonTxIndexIT.java | 3 +
...lMutableNonTxIndexWithLazyPostBatchWriteIT.java | 4 +
.../end2end/index/GlobalMutableTxIndexIT.java | 3 +
.../end2end/index/ImmutableIndexExtendedIT.java | 3 +
.../phoenix/end2end/index/ImmutableIndexIT.java | 6 +-
.../end2end/index/ImmutableIndexWithStatsIT.java | 3 +
.../phoenix/end2end/index/IndexCoprocIT.java | 3 +
.../phoenix/end2end/index/IndexMaintenanceIT.java | 3 +
.../phoenix/end2end/index/IndexMetadataIT.java | 3 +
.../index/IndexRebuildIncrementDisableCountIT.java | 7 +-
.../apache/phoenix/end2end/index/IndexUsageIT.java | 3 +
.../index/IndexVerificationOutputRepositoryIT.java | 3 +
.../index/IndexVerificationResultRepositoryIT.java | 3 +
.../index/IndexWithTableSchemaChangeIT.java | 3 +
.../index/InvalidIndexStateClientSideIT.java | 3 +
.../end2end/index/LocalImmutableNonTxIndexIT.java | 3 +
.../end2end/index/LocalImmutableTxIndexIT.java | 3 +
.../end2end/index/LocalMutableNonTxIndexIT.java | 3 +
.../end2end/index/LocalMutableTxIndexIT.java | 3 +
.../index/MutableIndexFailureWithNamespaceIT.java | 3 +
.../phoenix/end2end/index/MutableIndexIT.java | 3 +
.../end2end/index/MutableIndexRebuilderIT.java | 7 +-
.../index/MutableIndexSplitForwardScanIT.java | 3 +
.../index/MutableIndexSplitReverseScanIT.java | 3 +
.../end2end/index/PartialIndexRebuilderIT.java | 7 +-
.../end2end/index/PhoenixMRJobSubmitterIT.java | 4 +-
.../phoenix/end2end/index/SaltedIndexIT.java | 3 +
.../phoenix/end2end/index/ShortViewIndexIdIT.java | 8 +-
.../phoenix/end2end/index/SingleCellIndexIT.java | 3 +
.../apache/phoenix/end2end/index/ViewIndexIT.java | 3 +
.../end2end/index/txn/MutableRollbackIT.java | 3 +
.../phoenix/end2end/index/txn/RollbackIT.java | 3 +
.../end2end/index/txn/TxWriteFailureIT.java | 7 +-
.../end2end/join/HashJoinGlobalIndexIT.java | 4 +-
.../phoenix/end2end/join/HashJoinLocalIndexIT.java | 4 +-
.../phoenix/end2end/join/HashJoinMoreIT.java | 3 +
.../phoenix/end2end/join/HashJoinNoIndexIT.java | 4 +-
.../end2end/join/HashJoinPersistentCacheIT.java | 3 +
.../end2end/join/SortMergeJoinGlobalIndexIT.java | 4 +-
.../end2end/join/SortMergeJoinLocalIndexIT.java | 4 +-
.../end2end/join/SortMergeJoinNoIndexIT.java | 4 +-
.../apache/phoenix/end2end/join/SubqueryIT.java | 4 +-
.../end2end/join/SubqueryUsingSortMergeJoinIT.java | 3 +
.../join/WhereOptimizerForJoinFiltersIT.java | 3 +
.../phoenix/end2end/salted/SaltedTableIT.java | 3 +
.../end2end/salted/SaltedTableUpsertSelectIT.java | 3 +
.../salted/SaltedTableVarLengthRowKeyIT.java | 3 +
.../apache/phoenix/execute/PartialCommitIT.java | 7 +-
.../execute/UpsertSelectOverlappingBatchesIT.java | 7 +-
.../phoenix/iterate/ChunkedResultIteratorIT.java | 7 +-
.../phoenix/iterate/PhoenixQueryTimeoutIT.java | 3 +
.../iterate/RoundRobinResultIteratorIT.java | 4 +-
.../RoundRobinResultIteratorWithStatsIT.java | 8 +-
.../PhoenixServerBuildIndexInputFormatIT.java | 3 +
.../phoenix/monitoring/BasePhoenixMetricsIT.java | 4 +-
.../apache/phoenix/monitoring/IndexMetricsIT.java | 3 +
.../monitoring/PhoenixLoggingMetricsIT.java | 3 +
.../monitoring/PhoenixMetricsDisabledIT.java | 7 +-
.../phoenix/monitoring/PhoenixMetricsIT.java | 3 +
.../apache/phoenix/query/ConnectionCachingIT.java | 3 +
.../phoenix/query/MaxConcurrentConnectionsIT.java | 6 +-
.../replication/SystemCatalogWALEntryFilterIT.java | 3 +
.../org/apache/phoenix/rpc/PhoenixClientRpcIT.java | 7 +-
.../org/apache/phoenix/rpc/PhoenixServerRpcIT.java | 7 +-
.../rpc/UpdateCacheConnectionLevelPropIT.java | 4 +
.../java/org/apache/phoenix/rpc/UpdateCacheIT.java | 3 +
.../phoenix/schema/stats/BaseStatsCollectorIT.java | 5 +-
.../stats/NamespaceDisabledStatsCollectorIT.java | 3 +
.../stats/NamespaceEnabledStatsCollectorIT.java | 3 +
.../schema/stats/NonTxStatsCollectorIT.java | 3 +
.../phoenix/schema/stats/TxStatsCollectorIT.java | 3 +
.../schema/tool/SchemaToolExtractionIT.java | 3 +
.../apache/phoenix/trace/BaseTracingTestIT.java | 2 +-
.../phoenix/trace/PhoenixTableMetricsWriterIT.java | 3 +
.../phoenix/trace/PhoenixTracingEndToEndIT.java | 3 +
.../apache/phoenix/tx/FlappingTransactionIT.java | 3 +
.../phoenix/tx/ParameterizedTransactionIT.java | 3 +
.../java/org/apache/phoenix/tx/TransactionIT.java | 3 +
.../java/org/apache/phoenix/tx/TxCheckpointIT.java | 3 +
.../util/CoprocessorHConnectionTableFactoryIT.java | 7 +-
.../org/apache/phoenix/util/IndexScrutinyIT.java | 3 +
.../java/org/apache/phoenix/query/BaseTest.java | 75 ++-
.../org/apache/phoenix/pherf/DataIngestIT.java | 3 +
.../java/org/apache/phoenix/pherf/PherfMainIT.java | 3 +
.../org/apache/phoenix/pherf/ResultBaseTestIT.java | 3 +-
pom.xml | 42 +-
347 files changed, 957 insertions(+), 873 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index c268209..c7369cf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -70,7 +70,7 @@ pipeline {
checkout scm
sh """#!/bin/bash
ulimit -a
- mvn clean verify -Dskip.embedded -Dhbase.profile=${HBASE_PROFILE} -B
+ mvn clean verify -DPhoenixPatchProcess -Dskip.code-coverage -Dhbase.profile=${HBASE_PROFILE} -B
"""
}
}
diff --git a/Jenkinsfile.github b/Jenkinsfile.github
index a74aebd..cf7bd9f 100644
--- a/Jenkinsfile.github
+++ b/Jenkinsfile.github
@@ -38,7 +38,7 @@ pipeline {
DOCKERFILE_REL = "${SRC_REL}/dev/docker/Dockerfile.yetus"
YETUS_DRIVER_REL = "${SRC_REL}/dev/jenkins_precommit_github_yetus.sh"
// Branch or tag name. Yetus release tags are 'rel/X.Y.Z'
- YETUS_VERSION = 'rel/0.12.0'
+ YETUS_VERSION = 'rel/0.13.0'
PLUGINS= 'all,-findbugs,-gitlab'
//GENERAL_CHECK_PLUGINS = 'all,-compile,-javac,-javadoc,-jira,-shadedjars,-unit'
//JDK_SPECIFIC_PLUGINS = 'compile,github,htmlout,javac,javadoc,maven,mvninstall,shadedjars,unit'
@@ -77,7 +77,7 @@ pipeline {
environment {
// customized per parallel stage
//PLUGINS = "${GENERAL_CHECK_PLUGINS}"
- SET_JAVA_HOME = '/usr/lib/jvm/java-8'
+ SET_JAVA_HOME = '/usr/lib/jvm/java-8-openjdk-amd64'
WORKDIR_REL = "${WORKDIR_REL_GENERAL_CHECK}"
// identical for all parallel stages
WORKDIR = "${WORKSPACE}/${WORKDIR_REL}"
diff --git a/dev/cache-apache-project-artifact.sh b/dev/cache-apache-project-artifact.sh
index 1dbd374..2b1e922 100755
--- a/dev/cache-apache-project-artifact.sh
+++ b/dev/cache-apache-project-artifact.sh
@@ -102,7 +102,9 @@ if [ -n "${keys}" ]; then
mkdir -p "${working_dir}/.gpg"
chmod -R 700 "${working_dir}/.gpg"
fi
-
+ gpgconf --homedir "${working_dir}/.gpg" --create-socketdir || true
+ #shellcheck disable=SC2086
+ echo "socketdir is $(gpgconf --homedir ${working_dir}/.gpg --list-dirs socketdir)"
echo "installing project KEYS"
curl -L --fail -o "${working_dir}/KEYS" "${keys}"
if ! gpg --homedir "${working_dir}/.gpg" --import "${working_dir}/KEYS" ; then
diff --git a/dev/create-release/phoenix-rm/Dockerfile b/dev/create-release/phoenix-rm/Dockerfile
index 3522760..be91e9a 100644
--- a/dev/create-release/phoenix-rm/Dockerfile
+++ b/dev/create-release/phoenix-rm/Dockerfile
@@ -46,7 +46,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y update \
&& pip install \
python-dateutil==2.8.1
# Install Apache Yetus
-ENV YETUS_VERSION 0.12.0
+ENV YETUS_VERSION 0.13.0
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN wget -qO- "https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=/yetus/${YETUS_VERSION}/apache-yetus-${YETUS_VERSION}-bin.tar.gz" | \
tar xvz -C /opt
diff --git a/dev/docker/Dockerfile.multibranch b/dev/docker/Dockerfile.multibranch
index 4d8e33f..d739c71 100644
--- a/dev/docker/Dockerfile.multibranch
+++ b/dev/docker/Dockerfile.multibranch
@@ -14,7 +14,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM apache/yetus:0.12.0
+FROM apache/yetus:0.13.0
RUN groupadd --non-unique -g 910 jenkins || true
-RUN useradd -g 910 -u 910 -m jenkins || true
\ No newline at end of file
+RUN useradd -g 910 -u 910 -m jenkins || true
+#####
+# /run/user directory for gpg
+#####
+RUN mkdir -p /run/user/910/gnupg/ \
+ && chmod -R 700 /run/user/910 \
+ && chown -R 910:910 /run/user/910 \
+ && mkdir -p /var/run/user/910/gnupg \
+ && chown -R 910:910 /var/run/user/910 \
+ && chmod -R 700 /var/run/user/910
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
\ No newline at end of file
diff --git a/dev/docker/Dockerfile.yetus b/dev/docker/Dockerfile.yetus
index a34676a..9721339 100644
--- a/dev/docker/Dockerfile.yetus
+++ b/dev/docker/Dockerfile.yetus
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM apache/yetus:0.12.0
+FROM apache/yetus:0.13.0
#####
# Update SpotBugs
@@ -34,3 +34,13 @@ ENV SPOTBUGS_HOME /opt/spotbugs
# Enable spotbugs prefix for maven
#####
RUN sed -i -e 's/<\/pluginGroups>/<pluginGroup>com.github.spotbugs<\/pluginGroup><\/pluginGroups>/' /etc/maven/settings.xml
+#####
+# /run/user directory for gpg
+#####
+RUN mkdir -p /run/user/910/gnupg/ \
+ && chmod -R 700 /run/user/910 \
+ && chown -R 910:910 /run/user/910 \
+ && mkdir -p /var/run/user/910/gnupg \
+ && chown -R 910:910 /var/run/user/910 \
+ && chmod -R 700 /var/run/user/910
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
diff --git a/dev/jenkins_precommit_github_yetus.sh b/dev/jenkins_precommit_github_yetus.sh
index f607748..611e17b 100755
--- a/dev/jenkins_precommit_github_yetus.sh
+++ b/dev/jenkins_precommit_github_yetus.sh
@@ -142,8 +142,6 @@ if [[ -n "${EXCLUDE_TESTS_URL}" ]]; then
fi
# help keep the ASF boxes clean
YETUS_ARGS+=("--sentinel")
-# use emoji vote so it is easier to find the broken line
-YETUS_ARGS+=("--github-use-emoji-vote")
echo "Launching yetus with command line:"
echo "${TESTPATCHBIN} ${YETUS_ARGS[*]}"
diff --git a/dev/phoenix-personality.sh b/dev/phoenix-personality.sh
index 09eb696..7c3b360 100755
--- a/dev/phoenix-personality.sh
+++ b/dev/phoenix-personality.sh
@@ -90,6 +90,14 @@ function personality_globals
# TODO Doesn't seem to have effect in Yetus 0.12, set in cli instead
#shellcheck disable=SC2034
DOCKERMEMLIMIT=20g
+
+ # Extremely evil in-memory patching of the maven module to use mvn verify instead of mvn test
+ # This is likely to break on Yetus upgrade
+ maven_modules_worker_definition=$(declare -f maven_modules_worker)
+ maven_modules_worker_definition=${maven_modules_worker_definition//unit clean test/unit clean verify}
+ eval "$maven_modules_worker_definition"
+
+ yetus_debug "patched maven_modules_worker_definition. New function:\n${maven_modules_worker_definition}"
}
## @description Parse extra arguments required by personalities, if any.
@@ -140,7 +148,13 @@ function personality_modules
# Running with threads>1 seems to trigger some problem in the build, but since we
# spend 80+% of the time in phoenix-core, it wouldn't help much anyway
- extra="--threads=1 -DPhoenixPatchProcess"
+
+ # The PhoenixPatchProcess property disables creating the shaded artifacts and assembly
+ # We have no tests for those, but they add 45+ minutes to the Yetus runtime.
+
+ # I have been unable to get Jacoco running reliably on ASF Jenkins, thus it is disabled.
+
+ extra="--threads=1 -DPhoenixPatchProcess -Dskip.code-coverage "
if [[ "${PATCH_BRANCH}" = 4* ]]; then
extra="${extra} -Dhttps.protocols=TLSv1.2"
fi
@@ -204,9 +218,8 @@ function personality_modules
if [[ ${testtype} == unit ]]; then
local tests_arg=""
get_include_exclude_tests_arg tests_arg
- #Phoenix traditially runs the full IT suite from Precommit
- #keep it that way to ease transition
- extra="verify ${extra} ${tests_arg}"
+ # We have patched the maven module above to run mvn verify instead of mvn test
+ extra="${extra} ${tests_arg}"
# Inject the jenkins build-id for our surefire invocations
# Used by zombie detection stuff, even though we're not including that yet.
@@ -321,8 +334,14 @@ function hbaserebuild_precompile
{
big_console_header "Reinstalling HBase with Hadoop 3"
+ if [[ -n "${HBASE_REBUILD_DONE}" ]]; then
+ return
+ fi
+
MAVEN_LOCAL_REPO="$MAVEN_LOCAL_REPO" ${BASEDIR}/dev/rebuild_hbase.sh detect
+ HBASE_REBUILD_DONE=1
+
add_vote_table +0 hbaserecompile "" "HBase recompiled."
return 0
}
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java b/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
index 0ca38e4..cdc78c3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
@@ -35,6 +35,7 @@ import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.end2end.ParallelStatsEnabledIT;
+import org.apache.phoenix.end2end.ParallelStatsEnabledTest;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.schema.stats.StatisticsCollectionRunTracker;
import org.apache.phoenix.util.SchemaUtil;
@@ -42,7 +43,9 @@ import org.apache.phoenix.util.TestUtil;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsEnabledTest.class)
public class StatisticsCollectionRunTrackerIT extends ParallelStatsEnabledIT {
private static final StatisticsCollectionRunTracker tracker = StatisticsCollectionRunTracker
.getInstance(new Configuration());
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 3137cdf..0728a4a 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
@@ -30,10 +30,12 @@ import java.sql.ResultSet;
import org.apache.phoenix.expression.function.AbsFunction;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* End to end tests for {@link AbsFunction}
*/
+@Category(ParallelStatsDisabledTest.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 d52025e..a1b5426 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
@@ -37,7 +37,9 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryBuilder;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 c844b73..03df8b2 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
@@ -46,8 +46,10 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.util.ByteUtil;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.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/AlterAddCascadeIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterAddCascadeIndexIT.java
index d81dae5..6976919 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
@@ -36,6 +36,7 @@ import org.apache.phoenix.util.SchemaUtil;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
@@ -56,6 +57,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+@Category(ParallelStatsDisabledTest.class)
@RunWith(Parameterized.class)
public class AlterAddCascadeIndexIT extends ParallelStatsDisabledIT {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
index f212505..a29bfda 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
@@ -52,9 +52,10 @@ import org.apache.phoenix.util.IndexUtil;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.base.Objects;
+@Category(NeedsOwnMiniClusterTest.class)
public class AlterMultiTenantTableWithViewsIT extends SplitSystemCatalogIT {
private Connection getTenantConnection(String tenantId) throws Exception {
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 bf666e4..a39db13 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
@@ -34,12 +34,14 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
*
* Basic tests for Alter Session Statements
*
*/
+@Category(ParallelStatsDisabledTest.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 0d5bf6c..dc62472 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
@@ -74,6 +74,7 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -89,6 +90,7 @@ import org.junit.runners.Parameterized.Parameters;
* or at the end of test 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/AlterTableWithViewsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
index 94aa75e..31b3e0f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
@@ -68,6 +68,7 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Assume;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -75,6 +76,7 @@ import org.junit.runners.Parameterized.Parameters;
import org.apache.phoenix.thirdparty.com.google.common.base.Function;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+@Category(NeedsOwnMiniClusterTest.class)
@RunWith(Parameterized.class)
public class AlterTableWithViewsIT extends SplitSystemCatalogIT {
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 2cf32c8..a865121 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
@@ -59,8 +59,10 @@ import org.apache.phoenix.schema.PTableType;
import org.apache.phoenix.schema.TableAlreadyExistsException;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
+@Category(ParallelStatsDisabledTest.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 9791b65..d6acd09 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
@@ -35,11 +35,12 @@ import java.util.Properties;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.primitives.Doubles;
import org.apache.phoenix.thirdparty.com.google.common.primitives.Floats;
+@Category(ParallelStatsDisabledTest.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 7bea0ac..85958f8 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
@@ -38,9 +38,10 @@ import org.apache.phoenix.schema.types.PhoenixArray;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.primitives.Floats;
+@Category(ParallelStatsDisabledTest.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 9386cde..6a533d4 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
@@ -39,7 +39,9 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.StringUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 73c7e63..7dde87b 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
@@ -32,7 +32,9 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 7962a7a..b86bac9 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
@@ -30,7 +30,9 @@ import java.sql.SQLException;
import org.apache.phoenix.schema.TypeMismatchException;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 c4307af..1775030 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
@@ -30,7 +30,9 @@ import java.sql.SQLException;
import org.apache.phoenix.schema.TypeMismatchException;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 5133e5d..8a7da7e 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
@@ -34,7 +34,9 @@ import java.sql.Timestamp;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 182e664..a04afe0 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
@@ -26,7 +26,9 @@ import java.sql.*;
import org.apache.phoenix.schema.TypeMismatchException;
import org.apache.phoenix.schema.types.PhoenixArray;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 b5a468c..f8015c5 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
@@ -30,7 +30,9 @@ import java.sql.ResultSet;
import org.apache.phoenix.schema.TypeMismatchException;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 8a3461c..f5524ac 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
@@ -28,7 +28,9 @@ import java.sql.ResultSet;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 4f78b3e..22743b4 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
@@ -25,7 +25,9 @@ import java.sql.*;
import org.apache.phoenix.schema.types.PTimestamp;
import org.apache.phoenix.schema.types.PhoenixArray;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 56a6f98..14e24f0 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
@@ -21,6 +21,7 @@ import org.apache.phoenix.log.LogLevel;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.*;
import java.util.Properties;
@@ -30,6 +31,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
+@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 5cc6691..a9228b7 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
@@ -30,8 +30,10 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 ea7e4dc..590ec76 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
@@ -42,10 +42,12 @@ import org.apache.phoenix.schema.TableAlreadyExistsException;
import org.apache.phoenix.schema.types.PInteger;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.class)
@RunWith(Parameterized.class)
public class AutoPartitionViewsIT extends ParallelStatsDisabledIT {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterIT.java
index 3b3d611..f339ca5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterIT.java
@@ -18,14 +18,15 @@
package org.apache.phoenix.end2end;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.phoenix.query.BaseTest;
import org.junit.After;
/**
* Base class for tests that need their own mini cluster. Classes that extend this base class don't necessarily have to
* use unique names for tables and sequences. Any new integration tests that need their own mini cluster should be
- * extending {@link BaseUniqueNamesOwnClusterIT} class directly.
+ * extending {@link BaseTest} class directly.
*/
-public class BaseOwnClusterIT extends BaseUniqueNamesOwnClusterIT {
+public abstract class BaseOwnClusterIT extends BaseTest {
@After
public void cleanUpAfterTest() throws Exception {
deletePriorMetaData(HConstants.LATEST_TIMESTAMP, getUrl());
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
index 9a87544..88b6f47 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
@@ -86,7 +86,6 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeFalse;
-@Category(NeedsOwnMiniClusterTest.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public abstract class BasePermissionsIT extends BaseTest {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
index cefa2c4..fdce1c4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
@@ -38,7 +38,7 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
-public class BaseTenantSpecificViewIndexIT extends SplitSystemCatalogIT {
+public abstract class BaseTenantSpecificViewIndexIT extends SplitSystemCatalogIT {
public static final String NON_STRING_TENANT_ID = "1234";
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseUniqueNamesOwnClusterIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseUniqueNamesOwnClusterIT.java
deleted file mode 100644
index 7ccbaaf..0000000
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseUniqueNamesOwnClusterIT.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.end2end;
-
-import org.apache.phoenix.query.BaseTest;
-import org.junit.experimental.categories.Category;
-
-/**
- * Base class for tests that need to be executed on their mini cluster. You must create unique names using
- * {@link #generateUniqueName()} for each table and sequence used to prevent collisions.
- * <p>
- * TODO: Convert all tests extending {@link BaseOwnClusterIT} to use unique names for tables and sequences. Once that is
- * done either rename this class or get rid of the {@link BaseOwnClusterIT} base class.
- * </p>
- */
-@Category(NeedsOwnMiniClusterTest.class)
-public class BaseUniqueNamesOwnClusterIT extends BaseTest {
-}
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 eb6f844..363a82d 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
@@ -49,10 +49,12 @@ import org.apache.phoenix.util.MetaDataUtil;
import org.apache.phoenix.util.ScanUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+@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 cc43df5..76ec188 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
@@ -32,8 +32,10 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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/CSVCommonsLoaderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java
index 16b3c99..0e5e7f5 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
@@ -48,8 +48,10 @@ import org.apache.phoenix.util.DateUtil;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
+@Category(ParallelStatsDisabledTest.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 8cf0ad8..5fbb1c9 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
@@ -45,6 +45,7 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.FixMethodOrder;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
import org.junit.runners.Parameterized;
@@ -52,6 +53,7 @@ import org.junit.runners.Parameterized.Parameters;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+@Category(ParallelStatsDisabledTest.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 de10ee9..d5183c3 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
@@ -35,10 +35,12 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.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 d34b6ae..2675df8 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
@@ -29,10 +29,12 @@ import java.sql.ResultSet;
import org.apache.phoenix.expression.function.CbrtFunction;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* End to end tests for {@link CbrtFunction}
*/
+@Category(ParallelStatsDisabledTest.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 bdc638b..b4b8ec7 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
@@ -32,7 +32,9 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 310e243..9c42c79 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
@@ -43,8 +43,10 @@ import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 e954874..d0acb6b 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
@@ -29,11 +29,13 @@ import java.text.Collator;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* End2End test that tests the COLLATION_KEY in an ORDER BY clause
*
*/
+@Category(ParallelStatsDisabledTest.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 c85ff6e..b16cd4a 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
@@ -43,7 +43,9 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 c399caf..cafee82 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
@@ -57,8 +57,10 @@ import org.apache.phoenix.schema.types.PVarchar;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 add3e1b..b123c79 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
@@ -63,7 +63,8 @@ import static org.apache.phoenix.mapreduce.index.PhoenixIndexToolJobCounters.BEF
import static org.apache.phoenix.mapreduce.index.PhoenixIndexToolJobCounters.REBUILT_INDEX_ROW_COUNT;
import static org.junit.Assert.*;
-@RunWith(RunUntilFailure.class) @Category(NeedsOwnMiniClusterTest.class)
+@Category(NeedsOwnMiniClusterTest.class)
+@RunWith(RunUntilFailure.class)
public class ConcurrentMutationsExtendedIT extends ParallelStatsDisabledIT {
private static final Random RAND = new Random(5);
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 e882463..8a3dc5e 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
@@ -52,8 +52,10 @@ import org.apache.phoenix.util.RunUntilFailure;
import org.apache.phoenix.util.TestUtil;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
+@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 d728b29..2e05ccf 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
@@ -20,6 +20,7 @@ package org.apache.phoenix.end2end;
import org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.phoenix.compat.hbase.coprocessor.CompatBaseScannerRegionObserver;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.thirdparty.com.google.common.collect.ImmutableMap;
import org.apache.phoenix.util.ReadOnlyProps;
@@ -27,6 +28,7 @@ import org.apache.phoenix.util.RunUntilFailure;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,9 +48,10 @@ import static org.apache.phoenix.end2end.ConcurrentMutationsExtendedIT
import static org.junit.Assert.assertTrue;
+@Category(NeedsOwnMiniClusterTest.class)
@RunWith(RunUntilFailure.class)
public class ConcurrentUpsertsWithoutIndexedColsIT
- extends BaseUniqueNamesOwnClusterIT {
+ extends BaseTest {
private static final Random RANDOM = new Random(5);
private static final Logger LOGGER =
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 b1758f1..96fae49 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
@@ -24,12 +24,14 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* This tests that the configured client statistics cache is used during execution. These tests
* use a class ITGuidePostsCacheFactory which is for testing only that keeps track of the number
* of cache instances generated.
*/
+@Category(ParallelStatsEnabledTest.class)
public class ConfigurableCacheIT extends ParallelStatsEnabledIT {
static String table;
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 a51b6c9..183c1a3 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
@@ -30,12 +30,14 @@ import java.sql.Statement;
import org.apache.phoenix.exception.SQLExceptionCode;
import static org.junit.Assert.assertFalse;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* CONVERT_TZ(date, 'from_timezone', 'to_timezone') tests
*
*/
+@Category(ParallelStatsDisabledTest.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 f95215a..f815eac 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
@@ -39,10 +39,11 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
-public class CostBasedDecisionIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class CostBasedDecisionIT extends BaseTest {
private final String testTable500;
private final String testTable990;
private final String testTable1000;
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 440470d..03a3d57 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
@@ -24,6 +24,7 @@ import org.apache.phoenix.schema.ColumnNotFoundException;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.*;
import java.util.Properties;
@@ -31,6 +32,7 @@ import java.util.Properties;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.*;
+@Category(ParallelStatsDisabledTest.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 66d6134..e530d75 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
@@ -30,16 +30,18 @@ import java.sql.ResultSet;
import java.util.Map;
import java.util.Properties;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
-public class CountDistinctCompressionIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class CountDistinctCompressionIT extends BaseTest {
@BeforeClass
public static synchronized void doSetup() throws Exception {
Map<String, String> props = Maps.newHashMapWithExpectedSize(3);
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 ffb82dd..3bf6315 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
@@ -36,7 +36,9 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 57714a2..3f62343 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
@@ -70,8 +70,10 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class CreateTableIT extends ParallelStatsDisabledIT {
@Test
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 0b8672b..f348d2f 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
@@ -61,7 +61,9 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 6e91d1f..12aa43b 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
@@ -52,8 +52,10 @@ import org.apache.phoenix.util.CursorUtil;
import org.apache.phoenix.util.DateUtil;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 4af2c5c..1825707 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
@@ -34,9 +34,11 @@ import java.sql.ResultSet;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 b6052a0..312c3ec 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
@@ -44,9 +44,10 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+@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 a0d017f..61378fb 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
@@ -80,8 +80,10 @@ import org.apache.phoenix.util.TestUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 a2fc59b..c3cbe0d 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
@@ -33,8 +33,10 @@ import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.schema.types.PInteger;
import org.apache.phoenix.schema.types.PUnsignedLong;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 815e894..9231eed 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
@@ -39,8 +39,10 @@ import org.apache.phoenix.util.ByteUtil;
import org.apache.phoenix.util.DateUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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/DeleteIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java
index 737106f..104269e 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
@@ -64,10 +64,12 @@ import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+@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 6784ea2..2b47e01 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
@@ -51,6 +51,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -59,6 +60,7 @@ import org.junit.runners.Parameterized.Parameters;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+@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 a6ecfd7..b72a239 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
@@ -28,7 +28,9 @@ import org.apache.phoenix.compile.QueryPlan;
import org.apache.phoenix.jdbc.PhoenixStatement;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 e28c3a7..486f69f 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
@@ -38,7 +38,9 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 ae86c36..9463d04 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
@@ -48,8 +48,10 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 d66857d..76a39a0 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
@@ -34,7 +34,9 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 f1b23f9..be020b2 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
@@ -34,11 +34,13 @@ import org.apache.phoenix.schema.PTableKey;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import static org.apache.phoenix.util.PhoenixRuntime.TENANT_ID_ATTRIB;
+@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 2e8e004..498542d 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
@@ -34,20 +34,23 @@ import org.apache.hadoop.hbase.NamespaceNotFoundException;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.schema.SchemaNotFoundException;
import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+@Category(NeedsOwnMiniClusterTest.class)
@RunWith(Parameterized.class)
-public class DropSchemaIT extends BaseUniqueNamesOwnClusterIT {
+public class DropSchemaIT extends BaseTest {
private String schema;
public DropSchemaIT(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 823605d..3c8c45b 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
@@ -24,7 +24,9 @@ import java.sql.DriverManager;
import java.sql.Statement;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class DropTableIT extends ParallelStatsDisabledIT {
@Test
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DropTableWithViewsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DropTableWithViewsIT.java
index 79d1b52..da674be 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DropTableWithViewsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DropTableWithViewsIT.java
@@ -47,12 +47,14 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Category(NeedsOwnMiniClusterTest.class)
@RunWith(Parameterized.class)
public class DropTableWithViewsIT extends SplitSystemCatalogIT {
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 a93a3bb..ba758da 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
@@ -48,6 +48,7 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Basic tests for Phoenix dynamic upserting
@@ -57,6 +58,7 @@ import org.junit.Test;
*/
+@Category(ParallelStatsDisabledTest.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/DynamicColumnWildcardIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnWildcardIT.java
index f75436a..446cc7e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnWildcardIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnWildcardIT.java
@@ -51,6 +51,7 @@ import static org.apache.phoenix.query.QueryServices.WILDCARD_QUERY_DYNAMIC_COLS
* {@link org.apache.phoenix.query.QueryServices#WILDCARD_QUERY_DYNAMIC_COLS_ATTRIB} config is
* turned on
*/
+//FIXME this class has no @Category and is never run by maven
@RunWith(Parameterized.class)
public class DynamicColumnWildcardIT extends BaseTest {
private final boolean mutableTable;
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 84c00ba..7ebde4a 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
@@ -50,6 +50,7 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Basic tests for Phoenix dynamic family querying "cf.*"
@@ -62,6 +63,7 @@ import org.junit.Test;
value="RV_RETURN_VALUE_IGNORED",
justification="Designed to ignore.")
+@Category(ParallelStatsDisabledTest.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 66ff35a..16ccb6a 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
@@ -37,6 +37,7 @@ import org.apache.phoenix.schema.ColumnFamilyNotFoundException;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Basic tests for Phoenix dynamic upserting
@@ -46,6 +47,7 @@ import org.junit.Test;
*/
+@Category(ParallelStatsDisabledTest.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 4dcf549..515e315 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
@@ -59,7 +59,7 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Ignore;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,6 +74,7 @@ import org.slf4j.LoggerFactory;
* 2. Behavior under different CF's combinations.
* 3. Behavior under different COLUMN ENCODINGS
*/
+@Category(ParallelStatsDisabledTest.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 f35c092..6d6095a 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
@@ -33,9 +33,10 @@ import java.util.List;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+@Category(ParallelStatsDisabledTest.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 8edbaa6..e859b4e 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
@@ -31,8 +31,10 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 9c11144..db44fbc 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
@@ -44,8 +44,10 @@ import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 4b61bdb..4c59ad4 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
@@ -30,10 +30,12 @@ import java.sql.ResultSet;
import org.apache.phoenix.expression.function.ExpFunction;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* End to end tests for {@link ExpFunction}
*/
+@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 871a32c..4edd395 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
@@ -28,13 +28,14 @@ import java.util.List;
import org.apache.phoenix.end2end.ExplainPlanWithStatsEnabledIT.Estimate;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
/**
* This class has tests for asserting the bytes and rows information exposed in the explain plan
* when statistics are disabled.
*/
+@Category(ParallelStatsDisabledTest.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 6828547..4ec0b9c 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
@@ -49,13 +49,14 @@ import org.apache.phoenix.util.EnvironmentEdgeManager;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.BeforeClass;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
/**
* This class has tests for asserting the bytes and rows information exposed in the explain plan
* when statistics are enabled.
*/
+@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 f894725..9add3a3 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
@@ -33,6 +33,7 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
*
@@ -40,6 +41,7 @@ import org.junit.Test;
*
*/
+@Category(ParallelStatsDisabledTest.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 9992341..78a616f 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
@@ -26,7 +26,9 @@ import java.sql.DriverManager;
import java.sql.ResultSet;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 1f0ea69..2ebd46e 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
@@ -28,8 +28,10 @@ import java.util.ArrayList;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 27285e3..447326b 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
@@ -34,7 +34,9 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 20b0ae0..86bd6cf 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
@@ -33,8 +33,10 @@ import java.util.Properties;
import org.apache.phoenix.schema.ColumnNotFoundException;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 31afb49..3590be3 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
@@ -33,11 +33,13 @@ import org.apache.phoenix.expression.function.SetBitFunction;
import org.apache.phoenix.expression.function.SetByteFunction;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* End to end tests for {@link GetByteFunction} {@link SetByteFunction} {@link GetBitFunction}
* {@link SetBitFunction}
*/
+@Category(ParallelStatsDisabledTest.class)
public class GetSetByteBitFunctionEnd2EndIT extends ParallelStatsDisabledIT {
private static final String KEY = "key";
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GlobalConnectionTenantTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GlobalConnectionTenantTableIT.java
index c78d806..17e8981 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GlobalConnectionTenantTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GlobalConnectionTenantTableIT.java
@@ -40,6 +40,7 @@ import org.junit.Test;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+//FIXME this class has no @Category, and is never run by maven
public class GlobalConnectionTenantTableIT extends BaseTest {
private static final String SCHEMA_NAME = "SCHEMA1";
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 11611d0..cde1e0f 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
@@ -43,6 +43,7 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.FixMethodOrder;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
import org.junit.runners.Parameterized;
@@ -51,6 +52,7 @@ import org.junit.runners.Parameterized.Parameters;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+@Category(ParallelStatsDisabledTest.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 9ae505d..24d01ab 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
@@ -18,6 +18,7 @@
package org.apache.phoenix.end2end;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -26,6 +27,7 @@ import java.sql.Statement;
import static org.junit.Assert.assertEquals;
+@Category(ParallelStatsDisabledTest.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 52cfe9c..d9532d9 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
@@ -36,7 +36,9 @@ import org.apache.phoenix.schema.PTableKey;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 4f19da2..d71400c 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
@@ -53,7 +53,9 @@ import org.apache.phoenix.util.SchemaUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class InListIT extends ParallelStatsDisabledIT {
private static final String TENANT_SPECIFIC_URL1 = getUrl() + ';' + TENANT_ID_ATTRIB + "=tenant1";
private static boolean isInitialized = false;
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 b046226..4d24ff6 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
@@ -47,8 +47,10 @@ import java.util.Set;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.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 45b54a0..6c36838 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
@@ -35,6 +35,7 @@ import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.Table;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixResultSet;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.schema.PTable;
import org.apache.phoenix.util.EnvironmentEdge;
@@ -43,13 +44,15 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.QueryUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+@Category(NeedsOwnMiniClusterTest.class)
@RunWith(Parameterized.class)
-public class IndexBuildTimestampIT extends BaseUniqueNamesOwnClusterIT {
+public class IndexBuildTimestampIT extends BaseTest {
private final boolean localIndex;
private final boolean async;
private final boolean view;
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 502b687..0e4c67d 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
@@ -25,6 +25,7 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.coprocessor.TaskRegionObserver;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.ConnectionQueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.schema.PIndexState;
@@ -38,6 +39,7 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -52,7 +54,8 @@ import static org.apache.phoenix.util.TestUtil.waitForIndexRebuild;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-public class IndexRebuildTaskIT extends BaseUniqueNamesOwnClusterIT {
+@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/IndexScrutinyToolBaseIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolBaseIT.java
index e85bdce..3ba163b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolBaseIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolBaseIT.java
@@ -38,6 +38,9 @@ import static org.junit.Assert.assertTrue;
/**
* Tests for the {@link IndexScrutinyTool}
+ *
+ * Note that this class is never run directly by Junit/Maven, as it has no @Tests, but
+ * cannot be made abstract
*/
public class IndexScrutinyToolBaseIT extends BaseTest {
protected String outputDir;
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 3bc8ffb..009f427 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
@@ -35,6 +35,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -51,6 +52,7 @@ import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+@Category(ParallelStatsDisabledTest.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 89fcfff..c48bc6e 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
@@ -51,6 +51,7 @@ import org.apache.phoenix.mapreduce.index.IndexTool;
import org.apache.phoenix.mapreduce.index.IndexVerificationOutputRepository;
import org.apache.phoenix.mapreduce.index.IndexVerificationOutputRow;
import org.apache.phoenix.mapreduce.index.IndexVerificationResultRepository;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.ConnectionQueryServices;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
@@ -69,6 +70,7 @@ import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -119,8 +121,9 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+@Category(NeedsOwnMiniClusterTest.class)
@RunWith(Parameterized.class)
-public class IndexToolForNonTxGlobalIndexIT extends BaseUniqueNamesOwnClusterIT {
+public class IndexToolForNonTxGlobalIndexIT extends BaseTest {
public static final int MAX_LOOKBACK_AGE = 3600;
private final String tableDDLOptions;
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 6fbb354..98627c0 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
@@ -59,13 +59,14 @@ import org.apache.phoenix.util.StringUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
/**
* Tests for the {@link IndexToolForPartialBuildIT}
*/
+@Category(NeedsOwnMiniClusterTest.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 a323f73..389aad4 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
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -33,6 +34,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
/**
* Tests for the {@link IndexToolForPartialBuildWithNamespaceEnabled}
*/
+@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 7d716da..c2de883 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
@@ -51,6 +51,7 @@ import org.apache.phoenix.mapreduce.index.IndexTool;
import org.apache.phoenix.mapreduce.index.PhoenixIndexImportDirectMapper;
import org.apache.phoenix.mapreduce.index.PhoenixIndexToolJobCounters;
import org.apache.phoenix.mapreduce.index.PhoenixServerBuildIndexMapper;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.ConnectionQueryServices;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
@@ -66,6 +67,7 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -105,8 +107,9 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+@Category(NeedsOwnMiniClusterTest.class)
@RunWith(Parameterized.class)
-public class IndexToolIT extends BaseUniqueNamesOwnClusterIT {
+public class IndexToolIT extends BaseTest {
private static final Logger LOGGER = LoggerFactory.getLogger(IndexToolIT.class);
private final boolean localIndex;
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 d70b32b..c3125d0 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
@@ -26,6 +26,7 @@ import java.util.Map;
import org.apache.phoenix.compat.hbase.HbaseCompatCapabilities;
import org.apache.phoenix.mapreduce.index.IndexTool;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.util.EnvironmentEdge;
@@ -37,12 +38,13 @@ import org.junit.Assert;
import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
import static org.junit.Assert.assertFalse;
-public class IndexToolTimeRangeIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class IndexToolTimeRangeIT extends BaseTest {
private static final String
CREATE_TABLE_DDL = "CREATE TABLE %s (ID INTEGER NOT NULL PRIMARY KEY, "
+ "VAL1 INTEGER, VAL2 INTEGER) COLUMN_ENCODED_BYTES=0";
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 66f87fd..dcfd8d5 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
@@ -47,6 +47,7 @@ import java.util.Properties;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
@RunWith(Parameterized.class)
+//FIXME this test is never run by maven, as it has no @Category
public class IndexUpgradeToolIT extends BaseTest {
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 68a52f0..eba60bc 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
@@ -20,6 +20,7 @@ package org.apache.phoenix.end2end;
import org.apache.phoenix.compat.hbase.coprocessor.CompatBaseScannerRegionObserver;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
import org.apache.phoenix.mapreduce.index.IndexTool;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.util.EnvironmentEdgeManager;
@@ -30,6 +31,7 @@ import org.apache.phoenix.util.SchemaUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -45,7 +47,8 @@ import static org.apache.phoenix.mapreduce.index.PhoenixIndexToolJobCounters.BEF
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertEquals;
-public class IndexVerificationOldDesignIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class IndexVerificationOldDesignIT extends BaseTest {
ManualEnvironmentEdge injectEdge;
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 bc86980..b2bad7a 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
@@ -27,7 +27,9 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 85c1b32..978e7bf 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
@@ -39,11 +39,13 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.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 10a5baa..22b1f37 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
@@ -28,8 +28,10 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 a811197..7054266 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
@@ -40,8 +40,10 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 658c178..448c2bc 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
@@ -26,8 +26,10 @@ import java.sql.DriverManager;
import java.sql.ResultSet;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 f48e4df..3f50468 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
@@ -28,8 +28,10 @@ import java.util.ArrayList;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 65d55cc..2645889 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
@@ -31,7 +31,9 @@ import java.sql.Statement;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 d3d1b51..4e68c94 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
@@ -29,10 +29,12 @@ import org.apache.phoenix.expression.function.LnFunction;
import org.apache.phoenix.expression.function.LogFunction;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* End to end tests for {@link LnFunction} and {@link LogFunction}
*/
+@Category(ParallelStatsDisabledTest.class)
public class LnLogFunctionEnd2EndIT extends ParallelStatsDisabledIT {
private static final String KEY = "key";
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 1768b10..15d9cac 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
@@ -28,8 +28,10 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 aeb00e5..6208262 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
@@ -36,6 +36,7 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.io.IOException;
import java.sql.Array;
@@ -53,6 +54,7 @@ import static org.junit.Assert.assertTrue;
/**
* Test that our MapReduce basic tools work as expected
*/
+@Category(ParallelStatsDisabledTest.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 ad91126..b849987 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
@@ -47,8 +47,10 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 9594aec..759f8c8 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
@@ -25,10 +25,12 @@ import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.expression.function.MathPIFunction;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* End to end tests for {@link MathPIFunction}
*/
+@Category(ParallelStatsDisabledTest.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 b4f2b4f..a5daee1 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
@@ -30,6 +30,7 @@ import org.apache.phoenix.expression.function.SinFunction;
import org.apache.phoenix.expression.function.TanFunction;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* End to end tests for
@@ -38,6 +39,7 @@ import org.junit.Test;
* {@link org.apache.phoenix.expression.function.TanFunction}
*/
+@Category(ParallelStatsDisabledTest.class)
public class MathTrigFunctionEnd2EndIT extends ParallelStatsDisabledIT {
private static final String KEY = "key";
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 a15282f..56af50d 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
@@ -25,6 +25,7 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.compat.hbase.HbaseCompatCapabilities;
import org.apache.phoenix.compat.hbase.coprocessor.CompatBaseScannerRegionObserver;
import org.apache.phoenix.exception.SQLExceptionCode;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
import org.apache.phoenix.util.EnvironmentEdgeManager;
@@ -39,6 +40,7 @@ import org.junit.Assume;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.io.IOException;
import java.sql.Connection;
@@ -57,8 +59,8 @@ import static org.apache.phoenix.util.TestUtil.assertTableHasTtl;
import static org.apache.phoenix.util.TestUtil.assertTableHasVersions;
import static org.junit.Assert.assertFalse;
-@NeedsOwnMiniClusterTest
-public class MaxLookbackIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class MaxLookbackIT extends BaseTest {
private static final int MAX_LOOKBACK_AGE = 15;
private static final int ROWS_POPULATED = 2;
public static final int WAIT_AFTER_TABLE_CREATION_MILLIS = 1;
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 2f39ec8..fa19e38 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
@@ -31,7 +31,9 @@ import org.apache.phoenix.util.EnvironmentEdgeManager;
import org.apache.phoenix.util.IndexUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 69677db..e30a6e0 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
@@ -25,7 +25,7 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.TableViewFinderResult;
import org.apache.phoenix.util.ViewUtil;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.base.Joiner;
import org.apache.phoenix.thirdparty.com.google.common.collect.ImmutableMap;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
@@ -46,6 +46,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+@Category(ParallelStatsDisabledTest.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/MinMaxAggregateFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MinMaxAggregateFunctionIT.java
index c2429ab..6030255 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
@@ -22,7 +22,9 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 54cdba6..2d51f92 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
@@ -30,8 +30,10 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 a02012b..837835a 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
@@ -42,8 +42,10 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsEnabledTest.class)
public class MultiCfQueryExecIT extends ParallelStatsEnabledIT {
private String fullTableName;
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 a06b397..f10463e 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
@@ -59,9 +59,11 @@ import org.apache.phoenix.util.StringUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
+@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 ff2d30a..7100134 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
@@ -41,9 +41,11 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/*
* since 4.8
*/
+@Category(ParallelStatsDisabledTest.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 ebe5425..1ce9197 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
@@ -54,6 +54,7 @@ import org.apache.phoenix.util.EnvironmentEdgeManager;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
@@ -66,6 +67,7 @@ import org.junit.Test;
* @since 0.1
*/
+@Category(ParallelStatsDisabledTest.class)
public class NativeHBaseTypesIT extends ParallelStatsDisabledIT {
private String initTableValues() throws Exception {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NeedsOwnMiniClusterTest.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NeedsOwnMiniClusterTest.java
index 63dd399..f0118ba 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NeedsOwnMiniClusterTest.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NeedsOwnMiniClusterTest.java
@@ -17,14 +17,9 @@
*/
package org.apache.phoenix.end2end;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
/**
*
- * Annotation to denote that the test needs to run its own
+ * 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}.
@@ -37,8 +32,6 @@ import java.lang.annotation.Target;
*
* @since 4.1
*/
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface NeedsOwnMiniClusterTest {
+public class NeedsOwnMiniClusterTest {
}
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 376a7b9..ca48179 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
@@ -35,6 +35,7 @@ import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.schema.PIndexState;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
@@ -52,7 +53,7 @@ import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
@Category(NeedsOwnMiniClusterTest.class)
-public class NoLookbackMutableIndexExtendedIT extends BaseUniqueNamesOwnClusterIT {
+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/NonParameterizedIndexScrutinyToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NonParameterizedIndexScrutinyToolIT.java
index a90e042..1bf7825 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NonParameterizedIndexScrutinyToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NonParameterizedIndexScrutinyToolIT.java
@@ -40,6 +40,7 @@ import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+//FIXME this test is never run by maven, as it has no @Category
public class NonParameterizedIndexScrutinyToolIT extends IndexScrutinyToolBaseIT {
@Test
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 b435145..f98eaad 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
@@ -20,10 +20,12 @@ package org.apache.phoenix.end2end;
import java.util.Collection;
import java.util.List;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+@Category(ParallelStatsDisabledTest.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 2d2679d..cdd2027 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
@@ -20,10 +20,12 @@ package org.apache.phoenix.end2end;
import java.util.Collection;
import java.util.List;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+@Category(ParallelStatsDisabledTest.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 0f6bf25..c65b6fc 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
@@ -27,8 +27,10 @@ import java.sql.ResultSet;
import java.util.ArrayList;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 c856173..da9a133 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
@@ -43,10 +43,12 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+@Category(ParallelStatsDisabledTest.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 6282fb9..280ef4b 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
@@ -41,10 +41,11 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Before;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.primitives.Doubles;
import org.apache.phoenix.thirdparty.com.google.common.primitives.Floats;
+@Category(ParallelStatsDisabledTest.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 48451c6..c77c5b2 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
@@ -29,10 +29,12 @@ import java.sql.ResultSet;
import org.apache.phoenix.expression.function.OctetLengthFunction;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* End to end tests for {@link OctetLengthFunction}
*/
+@Category(ParallelStatsDisabledTest.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 dce5659..f7e61b2 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
@@ -38,12 +38,14 @@ import java.util.concurrent.Future;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+@Category(ParallelStatsDisabledTest.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 a78d5ac..dc0867b 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
@@ -21,6 +21,7 @@ package org.apache.phoenix.end2end;
import org.apache.phoenix.util.EnvironmentEdge;
import org.apache.phoenix.util.EnvironmentEdgeManager;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -34,6 +35,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+@Category(ParallelStatsDisabledTest.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 d4d5677..6539565 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
@@ -17,641 +17,9 @@
*/
package org.apache.phoenix.end2end;
-import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
-import static org.apache.phoenix.util.TestUtil.assertResultSet;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.hamcrest.CoreMatchers.containsString;
-
-import java.sql.Connection;
-import java.sql.Date;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Properties;
-
-import org.apache.phoenix.exception.PhoenixIOException;
-import org.apache.phoenix.query.QueryServices;
-import org.apache.phoenix.util.PropertiesUtil;
-import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class OrderByIT extends BaseOrderByIT {
- @Test
- public void testOrderByWithPosition() throws Exception {
- Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- Connection conn = DriverManager.getConnection(getUrl(), props);
- conn.setAutoCommit(false);
-
- try {
- String tableName = generateUniqueName();
- String ddl = "CREATE TABLE " + tableName +
- " (a_string varchar not null, col1 integer" +
- " CONSTRAINT pk PRIMARY KEY (a_string))\n";
- createTestTable(getUrl(), ddl);
-
- String dml = "UPSERT INTO " + tableName + " VALUES(?, ?)";
- PreparedStatement stmt = conn.prepareStatement(dml);
- stmt.setString(1, "a");
- stmt.setInt(2, 40);
- stmt.execute();
- stmt.setString(1, "b");
- stmt.setInt(2, 20);
- stmt.execute();
- stmt.setString(1, "c");
- stmt.setInt(2, 30);
- stmt.execute();
- conn.commit();
-
- String query = "select count(*), col1 from " + tableName + " group by col1 order by 2";
- ResultSet rs = conn.createStatement().executeQuery(query);
- assertTrue(rs.next());
- assertEquals(1,rs.getInt(1));
- assertTrue(rs.next());
- assertEquals(1,rs.getInt(1));
- assertTrue(rs.next());
- assertEquals(1,rs.getInt(1));
- assertFalse(rs.next());
-
- query = "select a_string x, col1 y from " + tableName + " order by x";
- rs = conn.createStatement().executeQuery(query);
- assertTrue(rs.next());
- assertEquals("a",rs.getString(1));
- assertEquals(40,rs.getInt(2));
- assertTrue(rs.next());
- assertEquals("b",rs.getString(1));
- assertEquals(20,rs.getInt(2));
- assertTrue(rs.next());
- assertEquals("c",rs.getString(1));
- assertEquals(30,rs.getInt(2));
- assertFalse(rs.next());
-
- query = "select * from " + tableName + " order by 2";
- rs = conn.createStatement().executeQuery(query);
- assertTrue(rs.next());
- assertEquals("b",rs.getString(1));
- assertEquals(20,rs.getInt(2));
- assertTrue(rs.next());
- assertEquals("c",rs.getString(1));
- assertEquals(30,rs.getInt(2));
- assertTrue(rs.next());
- assertEquals("a",rs.getString(1));
- assertEquals(40,rs.getInt(2));
- assertFalse(rs.next());
- } finally {
- conn.close();
- }
- }
-
- @Test
- public void testOrderByWithJoin() throws Exception {
- Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- Connection conn = DriverManager.getConnection(getUrl(), props);
- conn.setAutoCommit(false);
- try {
- String tableName1 = generateUniqueName();
- String ddl = "CREATE TABLE " + tableName1 +
- " (a_string varchar not null, cf1.a integer, cf1.b varchar, col1 integer, cf2.c varchar, cf2.d integer " +
- " CONSTRAINT pk PRIMARY KEY (a_string))\n";
- createTestTable(getUrl(), ddl);
- String dml = "UPSERT INTO " + tableName1 + " VALUES(?,?,?,?,?,?)";
- PreparedStatement stmt = conn.prepareStatement(dml);
- stmt.setString(1, "a");
- stmt.setInt(2, 40);
- stmt.setString(3, "aa");
- stmt.setInt(4, 10);
- stmt.setString(5, "bb");
- stmt.setInt(6, 20);
- stmt.execute();
- stmt.setString(1, "c");
- stmt.setInt(2, 30);
- stmt.setString(3, "cc");
- stmt.setInt(4, 50);
- stmt.setString(5, "dd");
- stmt.setInt(6, 60);
- stmt.execute();
- stmt.setString(1, "b");
- stmt.setInt(2, 40);
- stmt.setString(3, "bb");
- stmt.setInt(4, 5);
- stmt.setString(5, "aa");
- stmt.setInt(6, 80);
- stmt.execute();
- conn.commit();
-
- String tableName2 = generateUniqueName();
- ddl = "CREATE TABLE " + tableName2 +
- " (a_string varchar not null, col1 integer" +
- " CONSTRAINT pk PRIMARY KEY (a_string))\n";
- createTestTable(getUrl(), ddl);
-
- dml = "UPSERT INTO " + tableName2 + " VALUES(?, ?)";
- stmt = conn.prepareStatement(dml);
- stmt.setString(1, "a");
- stmt.setInt(2, 40);
- stmt.execute();
- stmt.setString(1, "b");
- stmt.setInt(2, 20);
- stmt.execute();
- stmt.setString(1, "c");
- stmt.setInt(2, 30);
- stmt.execute();
- conn.commit();
-
- String query = "select t1.* from " + tableName1 + " t1 join " + tableName2 + " t2 on t1.a_string = t2.a_string order by 3";
- ResultSet rs = conn.createStatement().executeQuery(query);
- assertTrue(rs.next());
- assertEquals("a",rs.getString(1));
- assertEquals(40,rs.getInt(2));
- assertEquals("aa",rs.getString(3));
- assertEquals(10,rs.getInt(4));
- assertEquals("bb",rs.getString(5));
- assertEquals(20,rs.getInt(6));
- assertTrue(rs.next());
- assertEquals("b",rs.getString(1));
- assertEquals(40,rs.getInt(2));
- assertEquals("bb",rs.getString(3));
- assertEquals(5,rs.getInt(4));
- assertEquals("aa",rs.getString(5));
- assertEquals(80,rs.getInt(6));
- assertTrue(rs.next());
- assertEquals("c",rs.getString(1));
- assertEquals(30,rs.getInt(2));
- assertEquals("cc",rs.getString(3));
- assertEquals(50,rs.getInt(4));
- assertEquals("dd",rs.getString(5));
- assertEquals(60,rs.getInt(6));
- assertFalse(rs.next());
-
- query = "select t1.a_string, t2.col1 from " + tableName1 + " t1 join " + tableName2 + " t2 on t1.a_string = t2.a_string order by 2";
- rs = conn.createStatement().executeQuery(query);
- assertTrue(rs.next());
- assertEquals("b",rs.getString(1));
- assertEquals(20,rs.getInt(2));
- assertTrue(rs.next());
- assertEquals("c",rs.getString(1));
- assertEquals(30,rs.getInt(2));
- assertTrue(rs.next());
- assertEquals("a",rs.getString(1));
- assertEquals(40,rs.getInt(2));
- assertFalse(rs.next());
- } finally {
- conn.close();
- }
- }
-
- @Test
- public void testOrderByWithUnionAll() throws Exception {
- Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- Connection conn = DriverManager.getConnection(getUrl(), props);
- conn.setAutoCommit(false);
-
- try {
- String tableName1 = generateUniqueName();
- String ddl = "CREATE TABLE " + tableName1 +
- " (a_string varchar not null, cf1.a integer, cf1.b varchar, col1 integer, cf2.c varchar, cf2.d integer " +
- " CONSTRAINT pk PRIMARY KEY (a_string))\n";
- createTestTable(getUrl(), ddl);
- String dml = "UPSERT INTO " + tableName1 + " VALUES(?,?,?,?,?,?)";
- PreparedStatement stmt = conn.prepareStatement(dml);
- stmt.setString(1, "a");
- stmt.setInt(2, 40);
- stmt.setString(3, "aa");
- stmt.setInt(4, 10);
- stmt.setString(5, "bb");
- stmt.setInt(6, 20);
- stmt.execute();
- stmt.setString(1, "c");
- stmt.setInt(2, 30);
- stmt.setString(3, "cc");
- stmt.setInt(4, 50);
- stmt.setString(5, "dd");
- stmt.setInt(6, 60);
- stmt.execute();
- stmt.setString(1, "b");
- stmt.setInt(2, 40);
- stmt.setString(3, "bb");
- stmt.setInt(4, 5);
- stmt.setString(5, "aa");
- stmt.setInt(6, 80);
- stmt.execute();
- conn.commit();
-
- String tableName2 = generateUniqueName();
- ddl = "CREATE TABLE " + tableName2 +
- " (a_string varchar not null, col1 integer" +
- " CONSTRAINT pk PRIMARY KEY (a_string))\n";
- createTestTable(getUrl(), ddl);
-
- dml = "UPSERT INTO " + tableName2 + " VALUES(?, ?)";
- stmt = conn.prepareStatement(dml);
- stmt.setString(1, "aa");
- stmt.setInt(2, 40);
- stmt.execute();
- stmt.setString(1, "bb");
- stmt.setInt(2, 10);
- stmt.execute();
- stmt.setString(1, "cc");
- stmt.setInt(2, 30);
- stmt.execute();
- conn.commit();
-
- String query = "select a_string, cf2.d from " + tableName1 + " union all select * from " + tableName2 + " order by 2";
- ResultSet rs = conn.createStatement().executeQuery(query);
- assertTrue(rs.next());
- assertEquals("bb",rs.getString(1));
- assertEquals(10,rs.getInt(2));
- assertTrue(rs.next());
- assertEquals("a",rs.getString(1));
- assertEquals(20,rs.getInt(2));
- assertTrue(rs.next());
- assertEquals("cc",rs.getString(1));
- assertEquals(30,rs.getInt(2));
- assertTrue(rs.next());
- assertEquals("aa",rs.getString(1));
- assertEquals(40,rs.getInt(2));
- assertTrue(rs.next());
- assertEquals("c",rs.getString(1));
- assertEquals(60,rs.getInt(2));
- assertTrue(rs.next());
- assertEquals("b",rs.getString(1));
- assertEquals(80,rs.getInt(2));
- assertFalse(rs.next());
- } finally {
- conn.close();
- }
- }
-
- @Test
- public void testOrderByWithExpression() throws Exception {
- Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- Connection conn = DriverManager.getConnection(getUrl(), props);
- conn.setAutoCommit(false);
-
- try {
- String tableName = generateUniqueName();
- String ddl = "CREATE TABLE " + tableName +
- " (a_string varchar not null, col1 integer, col2 integer, col3 timestamp, col4 varchar" +
- " CONSTRAINT pk PRIMARY KEY (a_string))\n";
- createTestTable(getUrl(), ddl);
-
- Date date = new Date(System.currentTimeMillis());
- String dml = "UPSERT INTO " + tableName + " VALUES(?, ?, ?, ?, ?)";
- PreparedStatement stmt = conn.prepareStatement(dml);
- stmt.setString(1, "a");
- stmt.setInt(2, 40);
- stmt.setInt(3, 20);
- stmt.setDate(4, new Date(date.getTime()));
- stmt.setString(5, "xxyy");
- stmt.execute();
- stmt.setString(1, "b");
- stmt.setInt(2, 50);
- stmt.setInt(3, 30);
- stmt.setDate(4, new Date(date.getTime()-500));
- stmt.setString(5, "yyzz");
- stmt.execute();
- stmt.setString(1, "c");
- stmt.setInt(2, 60);
- stmt.setInt(3, 20);
- stmt.setDate(4, new Date(date.getTime()-300));
- stmt.setString(5, "ddee");
- stmt.execute();
- conn.commit();
-
- String query = "SELECT col1+col2, col4, a_string FROM " + tableName + " ORDER BY 1, 2";
- ResultSet rs = conn.createStatement().executeQuery(query);
- assertTrue(rs.next());
- assertEquals("a", rs.getString(3));
- assertTrue(rs.next());
- assertEquals("c", rs.getString(3));
- assertTrue(rs.next());
- assertEquals("b", rs.getString(3));
- assertFalse(rs.next());
- } catch (SQLException e) {
- } finally {
- conn.close();
- }
- }
-
-
- @Test
- public void testOrderByRVC() throws Exception {
- Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateUniqueName();
- String ddl = "create table " + tableName + " (testpk varchar not null primary key, l_quantity decimal(15,2), l_discount decimal(15,2))";
- conn.createStatement().execute(ddl);
-
- PreparedStatement stmt = conn.prepareStatement("upsert into " + tableName + " values ('a',0.1,0.9)");
- stmt.execute();
- stmt = conn.prepareStatement(" upsert into " + tableName + " values ('b',0.5,0.5)");
- stmt.execute();
- stmt = conn.prepareStatement(" upsert into " + tableName + " values ('c',0.9,0.1)");
- stmt.execute();
- conn.commit();
-
- ResultSet rs;
- stmt = conn.prepareStatement("select l_discount,testpk from " + tableName + " order by (l_discount,l_quantity)");
- rs = stmt.executeQuery();
- assertTrue(rs.next());
- assertEquals(0.1, rs.getDouble(1), 0.01);
- assertEquals("c", rs.getString(2));
- assertTrue(rs.next());
- assertEquals(0.5, rs.getDouble(1), 0.01);
- assertEquals("b", rs.getString(2));
- assertTrue(rs.next());
- assertEquals(0.9, rs.getDouble(1), 0.01);
- assertEquals("a", rs.getString(2));
- }
-
- @Test
- public void testColumnFamily() throws Exception {
- Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- Connection conn = DriverManager.getConnection(getUrl(), props);
- conn.setAutoCommit(false);
-
- try {
- String tableName = generateUniqueName();
- String ddl = "CREATE TABLE " + tableName +
- " (a_string varchar not null, cf1.a integer, cf1.b varchar, col1 integer, cf2.c varchar, cf2.d integer, col2 integer" +
- " CONSTRAINT pk PRIMARY KEY (a_string))\n";
- createTestTable(getUrl(), ddl);
- String dml = "UPSERT INTO " + tableName + " VALUES(?,?,?,?,?,?,?)";
- PreparedStatement stmt = conn.prepareStatement(dml);
- stmt.setString(1, "a");
- stmt.setInt(2, 40);
- stmt.setString(3, "aa");
- stmt.setInt(4, 10);
- stmt.setString(5, "bb");
- stmt.setInt(6, 20);
- stmt.setInt(7, 1);
- stmt.execute();
- stmt.setString(1, "c");
- stmt.setInt(2, 30);
- stmt.setString(3, "cc");
- stmt.setInt(4, 50);
- stmt.setString(5, "dd");
- stmt.setInt(6, 60);
- stmt.setInt(7, 3);
- stmt.execute();
- stmt.setString(1, "b");
- stmt.setInt(2, 40);
- stmt.setString(3, "bb");
- stmt.setInt(4, 5);
- stmt.setString(5, "aa");
- stmt.setInt(6, 80);
- stmt.setInt(7, 2);
- stmt.execute();
- conn.commit();
-
- String query = "select * from " + tableName + " order by 2, 5";
- ResultSet rs = conn.createStatement().executeQuery(query);
- assertTrue(rs.next());
- assertEquals("c",rs.getString(1));
- assertEquals(30,rs.getInt(2));
- assertEquals("cc",rs.getString(3));
- assertEquals(50,rs.getInt(4));
- assertEquals("dd",rs.getString(5));
- assertEquals(60,rs.getInt(6));
- assertEquals(3,rs.getInt(7));
- assertTrue(rs.next());
- assertEquals("b",rs.getString(1));
- assertEquals(40,rs.getInt(2));
- assertEquals("bb",rs.getString(3));
- assertEquals(5,rs.getInt(4));
- assertEquals("aa",rs.getString(5));
- assertEquals(80,rs.getInt(6));
- assertEquals(2,rs.getInt(7));
- assertTrue(rs.next());
- assertEquals("a",rs.getString(1));
- assertEquals(40,rs.getInt(2));
- assertEquals("aa",rs.getString(3));
- assertEquals(10,rs.getInt(4));
- assertEquals("bb",rs.getString(5));
- assertEquals(20,rs.getInt(6));
- assertEquals(1,rs.getInt(7));
- assertFalse(rs.next());
-
- query = "select * from " + tableName + " order by 7";
- rs = conn.createStatement().executeQuery(query);
- assertTrue(rs.next());
- assertEquals("a",rs.getString(1));
- assertEquals(40,rs.getInt(2));
- assertEquals("aa",rs.getString(3));
- assertEquals(10,rs.getInt(4));
- assertEquals("bb",rs.getString(5));
- assertEquals(20,rs.getInt(6));
- assertEquals(1,rs.getInt(7));
- assertTrue(rs.next());
- assertEquals("b",rs.getString(1));
- assertEquals(40,rs.getInt(2));
- assertEquals("bb",rs.getString(3));
- assertEquals(5,rs.getInt(4));
- assertEquals("aa",rs.getString(5));
- assertEquals(80,rs.getInt(6));
- assertEquals(2,rs.getInt(7));
- assertTrue(rs.next());
- assertEquals("c",rs.getString(1));
- assertEquals(30,rs.getInt(2));
- assertEquals("cc",rs.getString(3));
- assertEquals(50,rs.getInt(4));
- assertEquals("dd",rs.getString(5));
- assertEquals(60,rs.getInt(6));
- assertEquals(3,rs.getInt(7));
- assertFalse(rs.next());
- } finally {
- conn.close();
- }
- }
-
- @Test
- public void testOrderByWithClientMemoryLimit() throws Exception {
- Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- props.put(QueryServices.CLIENT_SPOOL_THRESHOLD_BYTES_ATTRIB, Integer.toString(1));
- props.put(QueryServices.CLIENT_ORDERBY_SPOOLING_ENABLED_ATTRIB,
- Boolean.toString(Boolean.FALSE));
-
- try(Connection conn = DriverManager.getConnection(getUrl(), props)) {
- conn.setAutoCommit(false);
- String tableName = generateUniqueName();
- String ddl =
- "CREATE TABLE " + tableName + " (a_string varchar not null, col1 integer"
- + " CONSTRAINT pk PRIMARY KEY (a_string))\n";
- createTestTable(getUrl(), ddl);
-
- String dml = "UPSERT INTO " + tableName + " VALUES(?, ?)";
- PreparedStatement stmt = conn.prepareStatement(dml);
- stmt.setString(1, "a");
- stmt.setInt(2, 40);
- stmt.execute();
- stmt.setString(1, "b");
- stmt.setInt(2, 20);
- stmt.execute();
- stmt.setString(1, "c");
- stmt.setInt(2, 30);
- stmt.execute();
- conn.commit();
-
- String query = "select count(*), col1 from " + tableName + " group by col1 order by 2";
- ResultSet rs = conn.createStatement().executeQuery(query);
- try {
- rs.next();
- fail("Expected PhoenixIOException due to IllegalStateException");
- } catch (PhoenixIOException e) {
- assertThat(e.getMessage(), containsString("java.lang.IllegalStateException: "
- + "Queue full. Consider increasing memory threshold or spooling to disk"));
- }
- }
- }
-
- @Test
- public void testOrderPreservingOptimizeBug5148() throws Exception {
- doTestOrderPreservingOptimizeBug5148(false,false);
- doTestOrderPreservingOptimizeBug5148(false,true);
- doTestOrderPreservingOptimizeBug5148(true,false);
- doTestOrderPreservingOptimizeBug5148(true,true);
- }
-
- private void doTestOrderPreservingOptimizeBug5148(boolean desc ,boolean salted) throws Exception {
- Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- Connection conn = null;
- try {
- conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateUniqueName();
- String sql = "create table " + tableName + "( "+
- " pk1 varchar not null , " +
- " pk2 varchar not null, " +
- " pk3 varchar not null," +
- " v1 varchar, " +
- " v2 varchar, " +
- " CONSTRAINT TEST_PK PRIMARY KEY ( "+
- "pk1 "+(desc ? "desc" : "")+", "+
- "pk2 "+(desc ? "desc" : "")+", "+
- "pk3 "+(desc ? "desc" : "")+
- " )) "+(salted ? "SALT_BUCKETS =4" : "split on('b')");
- conn.createStatement().execute(sql);
-
- conn.createStatement().execute("UPSERT INTO "+tableName+" VALUES ('a11','a12','a13','a14','a15')");
- conn.createStatement().execute("UPSERT INTO "+tableName+" VALUES ('a21','a22','a23','a24','a25')");
- conn.createStatement().execute("UPSERT INTO "+tableName+" VALUES ('a31','a32','a33','a34','a35')");
- conn.createStatement().execute("UPSERT INTO "+tableName+" VALUES ('b11','b12','b13','b14','b15')");
- conn.createStatement().execute("UPSERT INTO "+tableName+" VALUES ('b21','b22','b23','b24','b25')");
- conn.createStatement().execute("UPSERT INTO "+tableName+" VALUES ('b31','b32','b33','b34','b35')");
- conn.commit();
- //TestOrderByOrderPreserving
- sql = "select pk3 from (select v1,v2,pk3 from " + tableName + " t where pk1 > 'a10' order by t.v2,t.pk3,t.v1 limit 10) a order by v2,pk3";
- ResultSet rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"a13"},{"a23"},{"a33"},{"b13"},{"b23"},{"b33"}});
-
- sql = "select pk3 from (select v1,v2,pk3 from "+tableName+" t where pk1 > 'a10' order by t.v2 desc,t.pk3 desc,t.v1 desc limit 10) a order by v2 desc ,pk3 desc";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"b33"},{"b23"},{"b13"},{"a33"},{"a23"},{"a13"}});
-
- sql = "select sub from (select substr(pk2,0,3) sub,cast (count(pk3) as bigint) cnt from "+tableName+" t where pk1 > 'a10' group by v1 ,pk2 order by count(pk3),t.pk2 limit 10) a order by cnt,sub";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"a12"},{"a22"},{"a32"},{"b12"},{"b22"},{"b32"}});
-
- sql = "select sub from (select substr(pk2,0,3) sub,count(pk3) cnt from "+tableName+" t where pk1 > 'a10' group by v1 ,pk2 order by count(pk3),t.pk2 limit 10) a "+
- "order by cast(cnt as bigint),substr(sub,0,3)";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"a12"},{"a22"},{"a32"},{"b12"},{"b22"},{"b32"}});
-
- sql = "select sub from (select substr(pk2,0,3) sub,cast (count(pk3) as bigint) cnt from "+tableName+" t where pk1 > 'a10' group by v1 ,pk2 order by count(pk3) desc,t.pk2 desc limit 10) a "+
- "order by cnt desc,sub desc";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"b32"},{"b22"},{"b12"},{"a32"},{"a22"},{"a12"}});
-
- sql = "select sub from (select substr(pk2,0,3) sub,count(pk3) cnt from "+tableName+" t where pk1 > 'a10' group by v1 ,pk2 order by count(pk3) desc,t.pk2 desc limit 10) a "+
- "order by cast(cnt as bigint) desc,substr(sub,0,3) desc";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"b32"},{"b22"},{"b12"},{"a32"},{"a22"},{"a12"}});
-
- sql = "select sub,pk2 from (select substr(v2,0,3) sub,pk2 from "+tableName+" t where pk1 > 'a10' group by pk2,v2 limit 10) a order by pk2,sub";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"a15","a12"},{"a25","a22"},{"a35","a32"},{"b15","b12"},{"b25","b22"},{"b35","b32"}});
-
- sql = "select sub,pk2 from (select substr(v2,0,3) sub,pk2 from "+tableName+" t where pk1 > 'a10' group by pk2,v2 limit 10) a order by pk2 desc,sub";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"b35","b32"},{"b25","b22"},{"b15","b12"},{"a35","a32"},{"a25","a22"},{"a15","a12"}});
-
- //test innerQueryPlan is ordered by rowKey
- sql = "select pk3 from (select pk3,pk2,pk1 from "+tableName+" t where v1 > 'a10' order by t.pk1,t.pk2 limit 10) a where pk3 > 'a10' order by pk1,pk2,pk3";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"a13"},{"a23"},{"a33"},{"b13"},{"b23"},{"b33"}});
-
- sql = "select sub from (select substr(pk3,0,3) sub,pk2,pk1 from "+tableName+" t where v1 > 'a10' order by t.pk1,t.pk2 limit 10) a where sub > 'a10' order by pk1,pk2,sub";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"a13"},{"a23"},{"a33"},{"b13"},{"b23"},{"b33"}});
-
- sql = "select pk3 from (select pk3,pk2,pk1 from "+tableName+" t where v1 > 'a10' order by t.pk1 desc,t.pk2 desc limit 10) a where pk3 > 'a10' order by pk1 desc ,pk2 desc ,pk3 desc";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"b33"},{"b23"},{"b13"},{"a33"},{"a23"},{"a13"}});
-
- sql = "select sub from (select substr(pk3,0,3) sub,pk2,pk1 from "+tableName+" t where v1 > 'a10' order by t.pk1 desc,t.pk2 desc limit 10) a where sub > 'a10' order by pk1 desc,pk2 desc,sub desc";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"b33"},{"b23"},{"b13"},{"a33"},{"a23"},{"a13"}});
-
- //TestGroupByOrderPreserving
- sql = "select pk2 from (select v1,pk2,pk1 from "+tableName+" t where pk1 > 'a10' order by t.pk2,t.v1,t.pk1 limit 10) a group by pk2, v1 order by pk2,v1";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"a12"},{"a22"},{"a32"},{"b12"},{"b22"},{"b32"}});
-
- sql = "select pk2 from (select v1,pk2,pk1 from "+tableName+" t where pk1 > 'a10' order by t.pk2 desc,t.v1 desc,t.pk1 limit 10) a group by pk2, v1 order by pk2 desc,v1 desc";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"b32"},{"b22"},{"b12"},{"a32"},{"a22"},{"a12"}});
-
- sql = "select sub from (select substr(pk2,0,3) sub,cast (count(pk3) as bigint) cnt from "+tableName+" t where pk1 > 'a10' group by v1 ,pk2 order by count(pk3),t.pk2 limit 10) a "+
- "group by cnt,sub order by cnt,sub";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"a12"},{"a22"},{"a32"},{"b12"},{"b22"},{"b32"}});
-
- sql = "select substr(sub,0,3) from (select substr(pk2,0,3) sub,count(pk3) cnt from "+tableName+" t where pk1 > 'a10' group by v1 ,pk2 order by count(pk3),t.pk2 limit 10) a "+
- "group by cast(cnt as bigint),substr(sub,0,3) order by cast(cnt as bigint),substr(sub,0,3)";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"a12"},{"a22"},{"a32"},{"b12"},{"b22"},{"b32"}});
-
- sql = "select sub from (select substr(pk2,0,3) sub,cast (count(pk3) as bigint) cnt from "+tableName+" t where pk1 > 'a10' group by v1 ,pk2 order by count(pk3) desc,t.pk2 desc limit 10) a "+
- "group by cnt,sub order by cnt desc,sub desc";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"b32"},{"b22"},{"b12"},{"a32"},{"a22"},{"a12"}});
-
- sql = "select substr(sub,0,3) from (select substr(pk2,0,3) sub,count(pk3) cnt from "+tableName+" t where pk1 > 'a10' group by v1 ,pk2 order by count(pk3) desc,t.pk2 desc limit 10) a "+
- "group by cast(cnt as bigint),substr(sub,0,3) order by cast(cnt as bigint) desc,substr(sub,0,3) desc";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"b32"},{"b22"},{"b12"},{"a32"},{"a22"},{"a12"}});
-
- sql = "select pk2 from (select substr(v2,0,3) sub,pk2 from "+tableName+" t where pk1 > 'a10' group by pk2,v2 limit 10) a group by pk2,sub order by pk2,sub";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"a12"},{"a22"},{"a32"},{"b12"},{"b22"},{"b32"}});
-
- sql = "select pk2 from (select substr(v2,0,3) sub,pk2 from "+tableName+" t where pk1 > 'a10' group by pk2,v2 limit 10) a group by pk2,sub order by pk2 desc,sub";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"b32"},{"b22"},{"b12"},{"a32"},{"a22"},{"a12"}});
-
- //test innerQueryPlan is ordered by rowKey
- sql = "select pk3 from (select pk3,pk2,pk1 from "+tableName+" t where v1 > 'a10' order by t.pk1,t.pk2 limit 10) a where pk3 > 'a10' group by pk1,pk2,pk3 order by pk1,pk2,pk3";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"a13"},{"a23"},{"a33"},{"b13"},{"b23"},{"b33"}});
-
- sql = "select sub from (select substr(pk3,0,3) sub,pk2,pk1 from "+tableName+" t where v1 > 'a10' order by t.pk1,t.pk2 limit 10) a where sub > 'a10' group by pk1,pk2,sub order by pk1,pk2";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"a13"},{"a23"},{"a33"},{"b13"},{"b23"},{"b33"}});
-
- sql = "select pk3 from (select pk3,pk2,pk1 from "+tableName+" t where v1 > 'a10' order by t.pk1 desc,t.pk2 desc limit 10) a where pk3 > 'a10' group by pk1, pk2, pk3 order by pk1 desc ,pk2 desc ,pk3 desc";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"b33"},{"b23"},{"b13"},{"a33"},{"a23"},{"a13"}});
-
- sql = "select sub from (select substr(pk3,0,3) sub,pk2,pk1 from "+tableName+" t where v1 > 'a10' order by t.pk1 desc,t.pk2 desc limit 10) a where sub > 'a10' group by pk1,pk2,sub order by pk1 desc,pk2 desc";
- rs = conn.prepareStatement(sql).executeQuery();
- assertResultSet(rs, new Object[][]{{"b33"},{"b23"},{"b13"},{"a33"},{"a23"},{"a13"}});
- } finally {
- if(conn != null) {
- conn.close();
- }
- }
- }
}
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 5d91298..91f2a69 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
@@ -32,7 +32,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
* {@link SizeBoundQueue} for all its operations
*/
@Category(NeedsOwnMiniClusterTest.class)
-public class OrderByWithServerClientSpoolingDisabledIT extends OrderByIT {
+public class OrderByWithServerClientSpoolingDisabledIT extends BaseOrderByIT {
@BeforeClass
public static synchronized void doSetup() throws Exception {
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 3c1b804..3c83089 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
@@ -27,7 +27,7 @@ import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
@Category(NeedsOwnMiniClusterTest.class)
-public class OrderByWithSpillingIT extends OrderByIT {
+public class OrderByWithSpillingIT extends BaseOrderByIT {
@BeforeClass
public static synchronized void doSetup() throws Exception {
Map<String, String> props = Maps.newHashMapWithExpectedSize(1);
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 3ca0d3d..f467442 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
@@ -49,12 +49,14 @@ import org.apache.phoenix.util.SchemaUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@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 4444460..8ba9332 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
@@ -45,10 +45,11 @@ import org.apache.phoenix.schema.types.PChar;
import org.apache.phoenix.util.TestUtil;
import org.junit.Before;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.base.Joiner;
+@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 f7e28d4..cb7aad8 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
@@ -52,7 +52,6 @@ import static org.junit.Assert.fail;
* You must create unique names using {@link #generateUniqueName()} for each
* table and sequence used to prevent collisions.
*/
-@Category(ParallelStatsDisabledTest.class)
public abstract class ParallelStatsDisabledIT extends BaseTest {
@BeforeClass
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsDisabledTest.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsDisabledTest.java
index d807b8d..17175b0 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsDisabledTest.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsDisabledTest.java
@@ -17,17 +17,10 @@
*/
package org.apache.phoenix.end2end;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.apache.phoenix.query.BaseTest;
-
/**
*
- * Annotation to denote that the test lets HBase manage timestamp
- * itself. Tests in these category do not drop HBase tables at
+ * Maker class to denote that the test lets HBase manage timestamp
+ * itself. Tests in these category do not drop HBase tables at
* the end of every test class. To prevent table name collisions that could happen otherwise,
* these tests use random table names generated by {@link BaseTest#generateRandomString}.
*
@@ -38,8 +31,6 @@ import org.apache.phoenix.query.BaseTest;
*
* @since 4.1
*/
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface ParallelStatsDisabledTest {
+public class ParallelStatsDisabledTest {
}
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledIT.java
index 8628d49..50c0ad2 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledIT.java
@@ -37,7 +37,6 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
* You must create unique names using {@link #generateUniqueName()} for each
* table and sequence used to prevent collisions.
*/
-@Category(ParallelStatsEnabledTest.class)
public abstract class ParallelStatsEnabledIT extends BaseTest {
protected static RegionCoprocessorEnvironment TaskRegionEnvironment;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledTest.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledTest.java
index 9fcffbc..68a9d2c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledTest.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledTest.java
@@ -17,17 +17,11 @@
*/
package org.apache.phoenix.end2end;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.apache.phoenix.query.BaseTest;
/**
*
- * Annotation to denote that the test lets HBase manage timestamp
- * itself. Tests in these category do not drop HBase tables at
+ * Marker class to denote that the test lets HBase manage timestamp
+ * itself. Tests in these category do not drop HBase tables at
* the end of every test class. To prevent table name collisions that could happen otherwise,
* these tests use random table names generated by {@link BaseTest#generateRandomString}.
*
@@ -38,8 +32,7 @@ import org.apache.phoenix.query.BaseTest;
*
* @since 4.1
*/
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface ParallelStatsEnabledTest {
+
+public abstract class ParallelStatsEnabledTest {
}
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 f4b8108..a412125 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
@@ -31,9 +31,11 @@ import org.apache.phoenix.util.IndexScrutiny;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Category(ParallelStatsDisabledTest.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 965fc2c..98e92a7 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
@@ -56,8 +56,10 @@ import org.apache.phoenix.util.DateUtil;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 a30b0b0..95c7995 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
@@ -18,7 +18,9 @@
package org.apache.phoenix.end2end;
import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+@Category(NeedsOwnMiniClusterTest.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 434a2b1..fb5841f 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
@@ -18,7 +18,9 @@
package org.apache.phoenix.end2end;
import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+@Category(NeedsOwnMiniClusterTest.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 964d87e..c9dd49b 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
@@ -25,19 +25,20 @@ import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.security.PrivilegedExceptionAction;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Collections;
-import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.PK_NAME;
import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SYSTEM_CATALOG_TABLE;
import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SYSTEM_CHILD_LINK_TABLE;
import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SYSTEM_SCHEMA_NAME;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+@Category(NeedsOwnMiniClusterTest.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 77ce073..5f36c09 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
@@ -18,7 +18,9 @@
package org.apache.phoenix.end2end;
import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+@Category(NeedsOwnMiniClusterTest.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 fb3e550..7a76864 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
@@ -37,7 +37,9 @@ import org.apache.phoenix.compat.hbase.CompatUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(NeedsOwnMiniClusterTest.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 39daf05..1362d11 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
@@ -42,6 +42,7 @@ import org.apache.hadoop.hbase.snapshot.SnapshotCreationException;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDriver;
import org.apache.phoenix.jdbc.PhoenixStatement;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
@@ -52,8 +53,10 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.UpgradeUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-public class PhoenixDriverIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class PhoenixDriverIT extends BaseTest {
private static HBaseTestingUtility hbaseTestUtil;
private static String zkQuorum;
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 11b3871..0ef3dce 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
@@ -33,6 +33,7 @@ import org.apache.phoenix.util.EncodedColumnsUtil;
import org.apache.phoenix.util.EnvironmentEdgeManager;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -50,6 +51,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+@Category(ParallelStatsDisabledTest.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 a02d9ac..acc41f7 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
@@ -51,9 +51,10 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Sets;
+@Category(ParallelStatsDisabledTest.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/PowerFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PowerFunctionEnd2EndIT.java
index cbc6355..13a2438 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
@@ -28,10 +28,12 @@ import java.sql.ResultSet;
import org.apache.phoenix.expression.function.PowerFunction;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* End to end tests for {@link PowerFunction}
*/
+@Category(ParallelStatsDisabledTest.class)
public class PowerFunctionEnd2EndIT extends ParallelStatsDisabledIT {
private static final String KEY = "key";
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 6fbedcf..49616b1 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
@@ -30,8 +30,10 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 7d6a35a..6a99671 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
@@ -47,11 +47,12 @@ import org.apache.phoenix.util.DateUtil;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Ordering;
+@Category(ParallelStatsDisabledTest.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 170eb69..ae18506 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
@@ -32,7 +32,9 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 00f76b4..68aed02 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
@@ -35,6 +35,7 @@ import org.apache.phoenix.util.MetaDataUtil;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -59,6 +60,7 @@ import static org.apache.phoenix.end2end.index.IndexMetadataIT.assertUpdateCache
/**
* Test properties that need to be kept in sync amongst all column families and indexes of a table
*/
+@Category(ParallelStatsDisabledTest.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 5ec4e09..de50b35 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
@@ -82,8 +82,10 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.StringUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 a18caf8..0e2b922 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
@@ -30,8 +30,10 @@ import java.sql.ResultSet;
import java.util.Properties;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 e40576b..f83a9e0 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
@@ -38,6 +38,7 @@ import java.util.Properties;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
@@ -46,6 +47,7 @@ import org.junit.runners.Parameterized.Parameters;
* Basic tests for Phoenix JDBC implementation
*
*/
+@Category(ParallelStatsDisabledTest.class)
public class QueryIT extends BaseQueryIT {
@Parameters(name="QueryIT_{index}") // name is used by failsafe as file name in reports
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 a22d3cc..ad8e969 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
@@ -54,6 +54,7 @@ import org.apache.phoenix.jdbc.PhoenixResultSet;
import org.apache.phoenix.log.LogLevel;
import org.apache.phoenix.log.QueryLogger;
import org.apache.phoenix.log.QueryStatus;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.EnvironmentEdge;
import org.apache.phoenix.util.EnvironmentEdgeManager;
@@ -61,11 +62,12 @@ import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
-public class QueryLoggerIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class QueryLoggerIT extends BaseTest {
@BeforeClass
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 69e9fcd..3f601e0 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
@@ -25,6 +25,7 @@ import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.Connection;
import java.sql.Date;
@@ -48,6 +49,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+@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 03ed472..27bc211 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
@@ -35,6 +35,7 @@ import java.util.Properties;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixStatement;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.ConnectionQueryServices;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
@@ -45,11 +46,12 @@ import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
-public class QueryTimeoutIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class QueryTimeoutIT extends BaseTest {
private String tableName;
@Before
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 3e64fcd..2f778c0 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
@@ -34,6 +34,7 @@ import java.util.concurrent.RejectedExecutionException;
import org.apache.phoenix.compile.ExplainPlan;
import org.apache.phoenix.compile.ExplainPlanAttributes;
import org.apache.phoenix.jdbc.PhoenixPreparedStatement;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
@@ -41,11 +42,11 @@ import org.apache.phoenix.util.TestUtil;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
-
-public class QueryWithLimitIT extends BaseUniqueNamesOwnClusterIT {
+@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 902ee54..14045fa 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
@@ -41,10 +41,12 @@ import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.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 e5e0784..673c3aa 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
@@ -36,8 +36,10 @@ import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 4a1610a..dc075e7 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
@@ -31,8 +31,10 @@ import org.apache.phoenix.schema.SortOrder;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 63f7377..e56b41b 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
@@ -43,11 +43,13 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.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 c5d8798..84c8880 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
@@ -33,8 +33,10 @@ import org.apache.phoenix.util.EnvironmentEdgeManager;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 2b38b07..ffadb17 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
@@ -30,8 +30,10 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class ReadOnlyIT extends ParallelStatsDisabledIT {
@Test
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 2d314d6..75ebfa8 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
@@ -36,6 +36,7 @@ import org.apache.phoenix.coprocessor.MetaDataRegionObserver;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDriver;
import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.ConnectionQueryServices;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
@@ -44,9 +45,11 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.mockito.internal.util.reflection.Whitebox;
-public class RebuildIndexConnectionPropsIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class RebuildIndexConnectionPropsIT extends BaseTest {
private static HBaseTestingUtility hbaseTestUtil;
private static String zkQuorum;
private static String url;
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 a0efbfd..5c66e12 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
@@ -42,7 +42,9 @@ import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 c7f52ff..d226a4a 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
@@ -31,8 +31,10 @@ import java.sql.Statement;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 289c545..b586395 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
@@ -32,8 +32,10 @@ import java.sql.SQLException;
import java.sql.Types;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 f2808bd..ba1d1ec 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
@@ -31,8 +31,10 @@ import java.sql.Statement;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 8c005f2..938af05 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
@@ -39,11 +39,13 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
-public class RenewLeaseIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class RenewLeaseIT extends BaseTest {
private static final long SCANNER_LEASE_TIMEOUT = 12000;
private static volatile boolean SLEEP_NOW = false;
private final static String TABLE_NAME = generateUniqueName();
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 2fedb78..29dc581 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
@@ -28,8 +28,10 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 e0a91dd..0f673c5 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
@@ -43,8 +43,10 @@ import org.apache.phoenix.compile.ExplainPlanAttributes;
import org.apache.phoenix.jdbc.PhoenixPreparedStatement;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 d326b98..2eba6e0 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
@@ -42,7 +42,7 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Before;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.primitives.Doubles;
import org.apache.phoenix.thirdparty.com.google.common.primitives.Floats;
@@ -51,6 +51,7 @@ import org.apache.phoenix.thirdparty.com.google.common.primitives.Floats;
* End to end tests for {@link RoundFunction}, {@link FloorFunction}, {@link CeilFunction}
*
*/
+@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 cde7aa2..3f2167b 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
@@ -33,7 +33,9 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.schema.types.PInteger;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 4bd823e..b9b0eb4 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
@@ -46,10 +46,12 @@ import org.apache.phoenix.util.EncodedColumnsUtil;
import org.apache.phoenix.util.EnvironmentEdgeManager;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.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 7b61b7066..f03e436 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
@@ -59,11 +59,12 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.base.Joiner;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+@Category(ParallelStatsDisabledTest.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 debf1ec..8e42d76 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
@@ -45,7 +45,9 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 5fce94e..f46bdea 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
@@ -23,6 +23,7 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.math.BigDecimal;
import java.sql.Connection;
@@ -46,6 +47,7 @@ import static org.junit.Assert.assertTrue;
* A set of lightweight ITs should run every build, and another fully covered ITs build for daily or
* weekly.
*/
+@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 4dcaea7..77d2284 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
@@ -34,7 +34,9 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class SCNIT extends ParallelStatsDisabledIT {
@Test
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 5c56c4f..489513a 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
@@ -41,6 +41,7 @@ import org.apache.phoenix.util.SchemaUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -55,6 +56,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
* All tests are run with both a generic connection and a multi-tenant connection.
*
*/
+@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 7c54d68..c5d6d1a 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
@@ -57,10 +57,11 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+@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 9643a3a..7159d19 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
@@ -29,6 +29,7 @@ import java.sql.ResultSet;
import java.util.Map;
import java.util.Properties;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.schema.SequenceNotFoundException;
import org.apache.phoenix.util.EnvironmentEdgeManager;
@@ -38,11 +39,12 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.BeforeClass;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
-public class SequencePointInTimeIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class SequencePointInTimeIT extends BaseTest {
private static final String SCHEMA_NAME = "S";
private static String generateSequenceNameWithSchema() {
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 1360a08..5bdef0a 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
@@ -31,7 +31,9 @@ import org.apache.phoenix.jdbc.PhoenixStatement;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 0bf5f18..3f57522 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
@@ -30,8 +30,10 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class ServerExceptionIT extends ParallelStatsDisabledIT {
@Test
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 84b323d..2580597 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
@@ -20,8 +20,10 @@ package org.apache.phoenix.end2end;
import java.util.Arrays;
import java.util.Collection;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.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 b7f3d4b..b4ac484 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
@@ -20,8 +20,10 @@ package org.apache.phoenix.end2end;
import java.util.Arrays;
import java.util.Collection;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.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 4895a84..fe75f85 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
@@ -20,6 +20,7 @@ package org.apache.phoenix.end2end;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -28,6 +29,7 @@ import java.util.Properties;
import static org.junit.Assert.assertTrue;
+@Category(ParallelStatsDisabledTest.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 94b9f42..b0942f2 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
@@ -30,11 +30,13 @@ import java.sql.ResultSet;
import org.apache.phoenix.expression.function.SignFunction;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* End to end tests for {@link SignFunction}
* @since 4.0.0
*/
+@Category(ParallelStatsDisabledTest.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 26b4f5c..8dc558f 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
@@ -40,8 +40,10 @@ import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 6e269da..3c835a5 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
@@ -51,8 +51,10 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class SkipScanQueryIT extends ParallelStatsDisabledIT {
private String initIntInTable(Connection conn, List<Integer> 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 e95a5fa..f1e6547 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
@@ -33,7 +33,9 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 30a396b..86a0666 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
@@ -47,7 +47,7 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
/**
@@ -55,6 +55,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
*/
+@Category(ParallelStatsDisabledTest.class)
public class SortOrderIT extends ParallelStatsDisabledIT {
private String baseTableName;
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 f415d61..091a29e 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
@@ -43,7 +43,7 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
/*
@@ -52,6 +52,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
* cluster.
*/
+@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/SplitSystemCatalogIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SplitSystemCatalogIT.java
index cbe0292..33bb50b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SplitSystemCatalogIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SplitSystemCatalogIT.java
@@ -37,8 +37,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
* Base class for tests that run with split SYSTEM.CATALOG.
*
*/
-@Category(NeedsOwnMiniClusterTest.class)
-public class SplitSystemCatalogIT extends BaseTest {
+public abstract class SplitSystemCatalogIT extends BaseTest {
protected static String SCHEMA1 = "SCHEMA1";
protected static String SCHEMA2 = "SCHEMA2";
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 4921e87..0313b0c 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
@@ -33,9 +33,10 @@ import org.apache.phoenix.util.TestUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.io.Files;
+@Category(ParallelStatsDisabledTest.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 b9108d3..f4fb4ff 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
@@ -29,10 +29,12 @@ import java.sql.ResultSet;
import org.apache.phoenix.expression.function.SqrtFunction;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* End to end tests for {@link SqrtFunction}
*/
+@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 d740ae4..4d7bb83 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
@@ -30,6 +30,7 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
@@ -37,6 +38,7 @@ import org.junit.Test;
*/
+@Category(ParallelStatsDisabledTest.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 c77e6bc..9687d10 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
@@ -42,6 +42,7 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Pair;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.KeyRange;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.schema.ReadOnlyTableException;
@@ -53,14 +54,16 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+@Category(NeedsOwnMiniClusterTest.class)
@RunWith(Parameterized.class)
-public class StatsEnabledSplitSystemCatalogIT extends BaseUniqueNamesOwnClusterIT {
+public class StatsEnabledSplitSystemCatalogIT extends BaseTest {
private String tableDDLOptions;
private String transactionProvider;
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 79c2be2..c6298d2 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
@@ -29,7 +29,9 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class StddevIT extends ParallelStatsDisabledIT {
@Test
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 8c2c944..b6d547b 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
@@ -28,7 +28,9 @@ import java.util.Properties;
import org.apache.phoenix.query.QueryServices;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 ced6bc7..692bde2 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
@@ -37,13 +37,14 @@ import org.apache.phoenix.util.ByteUtil;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
/**
* Tests for the LPAD built-in function.
*/
+@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 1afe6ef..5742928 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
@@ -30,7 +30,9 @@ import org.apache.phoenix.schema.types.PVarchar;
import org.apache.phoenix.schema.types.PhoenixArray;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 b7de30e..fc54c83 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
@@ -18,6 +18,7 @@
package org.apache.phoenix.end2end;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -27,6 +28,7 @@ import java.sql.Statement;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+@Category(ParallelStatsDisabledTest.class)
public class SumFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testSumFunctionWithCaseWhenStatement() throws Exception {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SyncUpdateCacheFreqIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SyncUpdateCacheFreqIT.java
index a4d4ff2..69ce487 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SyncUpdateCacheFreqIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SyncUpdateCacheFreqIT.java
@@ -45,7 +45,7 @@ import java.util.Set;
import static org.apache.phoenix.util.UpgradeUtil.UPSERT_UPDATE_CACHE_FREQUENCY;
import static org.junit.Assert.assertEquals;
-
+//FIXME this class no @Category, and will not be run by maven
public class SyncUpdateCacheFreqIT extends BaseTest {
private static final String SCHEMA_NAME = "SCHEMA2";
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 a7a549b..017cf26 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
@@ -29,6 +29,7 @@ import org.apache.hadoop.hbase.client.Table;
import org.apache.phoenix.coprocessor.SystemCatalogRegionObserver;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
import org.apache.phoenix.util.PropertiesUtil;
@@ -37,8 +38,10 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-public class SystemCatalogRegionObserverIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class SystemCatalogRegionObserverIT extends BaseTest {
public SystemCatalogRegionObserverIT() {
}
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemTablesUpgradeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemTablesUpgradeIT.java
index 4f918d0..9c4d03b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemTablesUpgradeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemTablesUpgradeIT.java
@@ -49,6 +49,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
/**
* Tests for upgrades of System tables.
*/
+//FIXME this class has no @Category, and will not be run by Maven
public class SystemTablesUpgradeIT extends BaseTest {
private static boolean reinitialize;
private static int countUpgradeAttempts;
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 2138dc5..5712947 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
@@ -64,6 +64,7 @@ import org.apache.phoenix.mapreduce.PhoenixTestingInputFormat;
import org.apache.phoenix.mapreduce.index.PhoenixIndexDBWritable;
import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
import org.apache.phoenix.mapreduce.util.PhoenixMapReduceUtil;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.schema.types.PDouble;
import org.apache.phoenix.schema.types.PhoenixArray;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
@@ -72,13 +73,15 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Category(NeedsOwnMiniClusterTest.class)
@RunWith(Parameterized.class)
-public class TableSnapshotReadsMapReduceIT extends BaseUniqueNamesOwnClusterIT {
+public class TableSnapshotReadsMapReduceIT extends BaseTest {
private static final Logger LOGGER = LoggerFactory.getLogger(TableSnapshotReadsMapReduceIT.class);
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 25a1c7a..8fe3a10 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
@@ -35,12 +35,14 @@ import org.apache.phoenix.schema.SequenceNotFoundException;
import org.apache.phoenix.schema.TableAlreadyExistsException;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+@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 b6979ab..e4fe53e 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
@@ -62,8 +62,10 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.StringUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 55d38fd..55fed3a 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
@@ -35,8 +35,10 @@ import org.apache.phoenix.query.KeyRange;
import org.apache.phoenix.schema.TableNotFoundException;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 0d41ca8..c5ba954 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
@@ -45,7 +45,9 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 76d7fa2..7780adb 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
@@ -18,8 +18,10 @@
package org.apache.phoenix.end2end;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(NeedsOwnMiniClusterTest.class)
public class TenantSpecificViewIndexSaltedIT extends BaseTenantSpecificViewIndexIT {
private static final Integer SALT_BUCKETS = 3;
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 65d47be..9ab7208 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
@@ -32,8 +32,10 @@ import java.util.TimeZone;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 6632886..ba26fd1 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
@@ -39,6 +39,7 @@ import java.util.TimeZone;
import org.apache.phoenix.expression.function.ToCharFunction;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Tests for the TO_CHAR built-in function.
@@ -48,6 +49,7 @@ import org.junit.Test;
* @since 0.1
*/
+@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 fe86a22..48f7f1b 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
@@ -23,6 +23,7 @@ import org.apache.phoenix.schema.TypeMismatchException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.*;
import java.util.Properties;
@@ -30,6 +31,7 @@ import java.util.Properties;
import static org.junit.Assert.*;
+@Category(ParallelStatsDisabledTest.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 a1e5b36..477f69f 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
@@ -36,6 +36,7 @@ import org.apache.phoenix.schema.types.PDecimal;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Tests for the TO_NUMBER built-in function.
@@ -45,6 +46,7 @@ import org.junit.Test;
* @since 0.1
*/
+@Category(ParallelStatsDisabledTest.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 8c213d2..429713d 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
@@ -36,8 +36,10 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 942ed9a..13f38ac 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
@@ -33,10 +33,12 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+@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 ba8b7ab..55636d8 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
@@ -36,8 +36,10 @@ import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.util.DateUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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/UngroupedIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedIT.java
index f861c76..411b2f2 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
@@ -41,11 +41,13 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.FixMethodOrder;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.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 ec717b0..9b76b31 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
@@ -40,7 +40,9 @@ import org.apache.phoenix.jdbc.PhoenixPreparedStatement;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 414022e..b788f10 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
@@ -31,7 +31,9 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 33db94d..23606d8 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
@@ -19,6 +19,7 @@ import org.apache.phoenix.exception.PhoenixIOException;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
import org.apache.phoenix.jdbc.PhoenixDriver;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.schema.PIndexState;
@@ -31,6 +32,7 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -43,7 +45,8 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class UpdateCacheAcrossDifferentClientsIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class UpdateCacheAcrossDifferentClientsIT extends BaseTest {
@BeforeClass
public static synchronized void doSetup() throws Exception {
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 0cbdd42..beaeb87 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
@@ -29,7 +29,9 @@ import java.sql.SQLException;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.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 48e417a..1dd9679 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
@@ -33,9 +33,10 @@ import org.apache.phoenix.schema.types.PDataType;
import org.apache.phoenix.schema.types.PLong;
import org.apache.phoenix.schema.types.PSmallint;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+@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 e7e5e50..d3f8fbd 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
@@ -24,6 +24,7 @@ import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.io.IOException;
import java.sql.*;
@@ -36,6 +37,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+@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 1be51c7..2f07e81 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
@@ -69,10 +69,12 @@ import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+@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/UpsertValuesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
index 1d53b16..0fb46b1 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
@@ -54,8 +54,10 @@ import org.apache.phoenix.util.TestUtil;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 c3bba40..16c9cfd 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
@@ -20,6 +20,7 @@ package org.apache.phoenix.end2end;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import java.sql.Connection;
@@ -35,6 +36,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+@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 8f17281..6c4abf0 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
@@ -41,7 +41,9 @@ import org.apache.phoenix.schema.types.PVarchar;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 3ee8201..9b3d131 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
@@ -73,10 +73,11 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
import org.junit.rules.TestName;
+@Category(NeedsOwnMiniClusterTest.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 e45d01e..8497fe0 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
@@ -45,8 +45,10 @@ import org.apache.phoenix.schema.ConstraintViolationException;
import org.apache.phoenix.util.DateUtil;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@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 9a66ce0..49f0b65 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
@@ -71,6 +71,7 @@ import org.apache.phoenix.util.TestUtil;
import org.junit.After;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -79,6 +80,7 @@ import org.junit.runners.Parameterized.Parameters;
* Tests for views dealing with other ongoing concurrent operations and
* failure scenarios
*/
+@Category(NeedsOwnMiniClusterTest.class)
@RunWith(Parameterized.class)
public class ViewConcurrencyAndFailureIT extends SplitSystemCatalogIT {
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 370629d..8fc9626 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
@@ -67,6 +67,7 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -76,6 +77,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
/**
* Basic test suite for views
*/
+@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 c08d7d3..82f64f7 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
@@ -36,11 +36,13 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/*
After 4.15 release, Phoenix introduced VIEW_INDEX_ID_COLUMN_TYPE and changed VIEW_INDEX_ID data
@@ -49,7 +51,8 @@ import org.junit.Test;
a coproc that checks the client request version and send it back to the client.
For more information, please see PHOENIX-3547, PHOENIX-5712
*/
-public class ViewIndexIdRetrieveIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.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))" +
" MULTI_TENANT = true, COLUMN_ENCODED_BYTES=0 ";
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 1332a3d..1591f10 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
@@ -31,6 +31,7 @@ import org.apache.phoenix.schema.PTable;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ViewUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.nio.charset.StandardCharsets;
import java.sql.Connection;
@@ -53,6 +54,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+@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 8fcf83f..f7fa2e2 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
@@ -36,6 +36,7 @@ import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.execute.MutationState;
import org.apache.phoenix.hbase.index.IndexRegionObserver;
import org.apache.phoenix.jdbc.PhoenixConnection;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.PhoenixTestBuilder;
import org.apache.phoenix.query.PhoenixTestBuilder.SchemaBuilder;
import org.apache.phoenix.query.QueryServices;
@@ -77,7 +78,7 @@ import static org.junit.Assert.fail;
@RunWith(Parameterized.class)
@Category(NeedsOwnMiniClusterTest.class)
-public class WALAnnotationIT extends BaseUniqueNamesOwnClusterIT {
+public class WALAnnotationIT extends BaseTest {
private final boolean isImmutable;
private final boolean isMultiTenant;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AlterIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AlterIndexIT.java
index a01de4d..601d787 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AlterIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AlterIndexIT.java
@@ -18,14 +18,17 @@
package org.apache.phoenix.end2end.index;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.util.TestUtil;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
+@Category(ParallelStatsDisabledTest.class)
public class AlterIndexIT extends ParallelStatsDisabledIT {
@Test
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncIndexDisabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncIndexDisabledIT.java
index 06edbcf..6b1e375 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncIndexDisabledIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncIndexDisabledIT.java
@@ -27,11 +27,14 @@ import java.sql.ResultSet;
import java.sql.Statement;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.schema.PTable;
import org.apache.phoenix.schema.PTableKey;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class AsyncIndexDisabledIT extends ParallelStatsDisabledIT {
@Test
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseLocalIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseLocalIndexIT.java
index d4b08e5..4c8863f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseLocalIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseLocalIndexIT.java
@@ -25,7 +25,6 @@ import java.util.Collection;
import java.util.Map;
import java.util.Properties;
-import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT;
import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PropertiesUtil;
@@ -40,7 +39,7 @@ import org.junit.runners.Parameterized.Parameters;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
@RunWith(Parameterized.class)
-public abstract class BaseLocalIndexIT extends BaseUniqueNamesOwnClusterIT {
+public abstract class BaseLocalIndexIT extends BaseTest {
protected boolean isNamespaceMapped;
protected String schemaName;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java
index ccc849e..ad836c0 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java
@@ -32,11 +32,14 @@ import java.util.Properties;
import org.apache.phoenix.compile.ExplainPlan;
import org.apache.phoenix.compile.ExplainPlanAttributes;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.jdbc.PhoenixPreparedStatement;
import org.apache.phoenix.schema.PTable;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class ChildViewsUseParentViewIndexIT extends ParallelStatsDisabledIT {
@Test
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropColumnIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropColumnIT.java
index 8c520cd..dd828a1 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropColumnIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropColumnIT.java
@@ -42,6 +42,7 @@ import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.expression.KeyValueColumnExpression;
import org.apache.phoenix.expression.SingleCellColumnExpression;
import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
@@ -62,11 +63,13 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.StringUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.internal.ArrayComparisonFailure;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.class)
@RunWith(Parameterized.class)
public class DropColumnIT extends ParallelStatsDisabledIT {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropIndexDuringUpsertIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropIndexDuringUpsertIT.java
index 442600d..c1527dd 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropIndexDuringUpsertIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropIndexDuringUpsertIT.java
@@ -60,6 +60,7 @@ import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+//FIXME this test is marked abstract, but has no children, so it never run.
@Category(NeedsOwnMiniClusterTest.class)
public abstract class DropIndexDuringUpsertIT extends BaseTest {
private static final int NUM_SLAVES = 4;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java
index d945e43..316ced3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java
@@ -35,6 +35,7 @@ import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryServices;
@@ -44,7 +45,9 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.StringUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class DropMetadataIT extends ParallelStatsDisabledIT {
private static final String PRINCIPAL = "dropMetaData";
private static final byte[] FAMILY_NAME = Bytes.toBytes(SchemaUtil.normalizeIdentifier("1"));
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalImmutableNonTxIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalImmutableNonTxIndexIT.java
index 03c5af3..1776544 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalImmutableNonTxIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalImmutableNonTxIndexIT.java
@@ -20,8 +20,11 @@ package org.apache.phoenix.end2end.index;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.class)
public class GlobalImmutableNonTxIndexIT extends BaseIndexIT {
public GlobalImmutableNonTxIndexIT(boolean localIndex, boolean mutable, String transactionProvider, boolean columnEncoded) {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalImmutableTxIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalImmutableTxIndexIT.java
index 7d4cfbd..968cf27 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalImmutableTxIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalImmutableTxIndexIT.java
@@ -20,9 +20,12 @@ package org.apache.phoenix.end2end.index;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.util.TestUtil;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.class)
public class GlobalImmutableTxIndexIT extends BaseIndexIT {
public GlobalImmutableTxIndexIT(boolean localIndex, boolean mutable, String transactionProvider, boolean columnEncoded) {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexCheckerIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexCheckerIT.java
index b759e41..1ffa126 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexCheckerIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexCheckerIT.java
@@ -47,10 +47,11 @@ import java.util.Properties;
import org.apache.phoenix.thirdparty.com.google.common.base.Strings;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
-import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT;
import org.apache.phoenix.end2end.IndexToolIT;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.hbase.index.IndexRegionObserver;
import org.apache.phoenix.mapreduce.index.IndexTool;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.schema.PTableImpl;
import org.apache.phoenix.util.EnvironmentEdgeManager;
@@ -62,13 +63,15 @@ import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+@Category(NeedsOwnMiniClusterTest.class)
@RunWith(Parameterized.class)
-public class GlobalIndexCheckerIT extends BaseUniqueNamesOwnClusterIT {
+public class GlobalIndexCheckerIT extends BaseTest {
private final boolean async;
private String indexDDLOptions;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalMutableNonTxIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalMutableNonTxIndexIT.java
index 7056338..2986b76 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalMutableNonTxIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalMutableNonTxIndexIT.java
@@ -20,9 +20,12 @@ package org.apache.phoenix.end2end.index;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.hbase.index.IndexRegionObserver;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.class)
public class GlobalMutableNonTxIndexIT extends BaseIndexIT {
public GlobalMutableNonTxIndexIT(boolean localIndex, boolean mutable, String transactionProvider, boolean columnEncoded, boolean skipPostIndexUpdates) {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalMutableNonTxIndexWithLazyPostBatchWriteIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalMutableNonTxIndexWithLazyPostBatchWriteIT.java
index d8796e8..e9e87f6 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalMutableNonTxIndexWithLazyPostBatchWriteIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalMutableNonTxIndexWithLazyPostBatchWriteIT.java
@@ -20,10 +20,14 @@ package org.apache.phoenix.end2end.index;
import java.util.Map;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.hbase.index.IndexRegionObserver;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+//FIXME shouldn't this be @NeedsOwnMiniClusterTest ?
+@Category(ParallelStatsDisabledTest.class)
public class GlobalMutableNonTxIndexWithLazyPostBatchWriteIT extends GlobalMutableNonTxIndexIT {
public GlobalMutableNonTxIndexWithLazyPostBatchWriteIT(boolean localIndex, boolean mutable, String transactionProvider, boolean columnEncoded, boolean skipPostIndexUpdates) {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalMutableTxIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalMutableTxIndexIT.java
index d428ce5..9ce1375 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalMutableTxIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalMutableTxIndexIT.java
@@ -20,9 +20,12 @@ package org.apache.phoenix.end2end.index;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.util.TestUtil;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.class)
public class GlobalMutableTxIndexIT extends BaseIndexIT {
public GlobalMutableTxIndexIT(boolean localIndex, boolean mutable, String transactionProvider, boolean columnEncoded) {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexExtendedIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexExtendedIT.java
index 5c34ff2..e80056a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexExtendedIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexExtendedIT.java
@@ -31,6 +31,7 @@ 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.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.hbase.index.IndexRegionObserver;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.ConnectionQueryServices;
@@ -43,6 +44,7 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -60,6 +62,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+@Category(ParallelStatsDisabledTest.class)
@RunWith(Parameterized.class)
public class ImmutableIndexExtendedIT extends ParallelStatsDisabledIT {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
index 031eb3f..d3cb529 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
@@ -67,7 +67,7 @@ import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver;
import org.apache.hadoop.hbase.regionserver.MiniBatchOperationInProgress;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Pair;
-import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.hbase.index.IndexRegionObserver;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.BaseTest;
@@ -89,6 +89,7 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -97,8 +98,9 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+@Category(NeedsOwnMiniClusterTest.class)
@RunWith(Parameterized.class)
-public class ImmutableIndexIT extends BaseUniqueNamesOwnClusterIT {
+public class ImmutableIndexIT extends BaseTest {
private final boolean localIndex;
private final PhoenixTransactionProvider transactionProvider;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexWithStatsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexWithStatsIT.java
index 2d6a923..6181c37 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexWithStatsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexWithStatsIT.java
@@ -31,11 +31,14 @@ import java.util.Properties;
import org.apache.phoenix.compile.ExplainPlan;
import org.apache.phoenix.compile.ExplainPlanAttributes;
import org.apache.phoenix.end2end.ParallelStatsEnabledIT;
+import org.apache.phoenix.end2end.ParallelStatsEnabledTest;
import org.apache.phoenix.jdbc.PhoenixPreparedStatement;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsEnabledTest.class)
public class ImmutableIndexWithStatsIT extends ParallelStatsEnabledIT {
@Test
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexCoprocIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexCoprocIT.java
index c71129b..9818a9c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexCoprocIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexCoprocIT.java
@@ -25,6 +25,7 @@ import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.hbase.index.IndexRegionObserver;
import org.apache.phoenix.hbase.index.Indexer;
import org.apache.phoenix.index.GlobalIndexChecker;
@@ -32,6 +33,7 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -47,6 +49,7 @@ import static org.apache.phoenix.end2end.index.IndexTestUtil.assertCoprocsContai
import static org.apache.phoenix.end2end.index.IndexTestUtil.assertCoprocsNotContains;
import static org.apache.phoenix.end2end.index.IndexTestUtil.assertUsingOldCoprocs;
+@Category(ParallelStatsDisabledTest.class)
@RunWith(Parameterized.class)
public class IndexCoprocIT extends ParallelStatsDisabledIT {
private boolean isNamespaceMapped = false;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMaintenanceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMaintenanceIT.java
index 0970a23..4354fe0 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMaintenanceIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMaintenanceIT.java
@@ -35,13 +35,16 @@ import java.util.Properties;
import org.apache.commons.lang3.StringUtils;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.util.DateUtil;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class IndexMaintenanceIT extends ParallelStatsDisabledIT {
@Test
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
index 35523cf..9a96a17 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
@@ -43,6 +43,7 @@ import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
@@ -61,7 +62,9 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.StringUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class IndexMetadataIT extends ParallelStatsDisabledIT {
private enum Order {ASC, DESC};
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexRebuildIncrementDisableCountIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexRebuildIncrementDisableCountIT.java
index a54406f..5c2088c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexRebuildIncrementDisableCountIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexRebuildIncrementDisableCountIT.java
@@ -38,9 +38,10 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.coprocessor.MetaDataProtocol.MutationCode;
import org.apache.phoenix.coprocessor.MetaDataRegionObserver;
import org.apache.phoenix.coprocessor.MetaDataRegionObserver.BuildIndexScheduleTask;
-import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.schema.PIndexState;
import org.apache.phoenix.util.EnvironmentEdgeManager;
@@ -50,12 +51,14 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
-public class IndexRebuildIncrementDisableCountIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class IndexRebuildIncrementDisableCountIT extends BaseTest {
private static final Logger LOGGER =
LoggerFactory.getLogger(IndexRebuildIncrementDisableCountIT.class);
private static long pendingDisableCount = 0;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexUsageIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexUsageIT.java
index 064e66e..aa22f7d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexUsageIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexUsageIT.java
@@ -38,6 +38,7 @@ import java.util.Properties;
import org.apache.phoenix.compile.ExplainPlan;
import org.apache.phoenix.compile.ExplainPlanAttributes;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.execute.CommitException;
import org.apache.phoenix.jdbc.PhoenixPreparedStatement;
@@ -47,7 +48,9 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class IndexUsageIT extends ParallelStatsDisabledIT {
/**
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexVerificationOutputRepositoryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexVerificationOutputRepositoryIT.java
index 4ba358d..c4a8ec4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexVerificationOutputRepositoryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexVerificationOutputRepositoryIT.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.mapreduce.index.IndexTool;
import org.apache.phoenix.mapreduce.index.IndexVerificationOutputRepository;
@@ -41,6 +42,7 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
import java.io.IOException;
@@ -62,6 +64,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.when;
+@Category(ParallelStatsDisabledTest.class)
public class IndexVerificationOutputRepositoryIT extends ParallelStatsDisabledIT {
@BeforeClass
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexVerificationResultRepositoryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexVerificationResultRepositoryIT.java
index 368ef28..1fb4b4d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexVerificationResultRepositoryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexVerificationResultRepositoryIT.java
@@ -25,6 +25,7 @@ import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.coprocessor.IndexToolVerificationResult;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.mapreduce.index.IndexTool;
import org.apache.phoenix.mapreduce.index.IndexVerificationResultRepository;
@@ -37,6 +38,7 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.io.IOException;
import java.sql.Connection;
@@ -50,6 +52,7 @@ import static org.apache.phoenix.mapreduce.index.IndexVerificationResultReposito
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
+@Category(ParallelStatsDisabledTest.class)
public class IndexVerificationResultRepositoryIT extends ParallelStatsDisabledIT {
@BeforeClass
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexWithTableSchemaChangeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexWithTableSchemaChangeIT.java
index 7fc1a3a..a9bcb7d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexWithTableSchemaChangeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexWithTableSchemaChangeIT.java
@@ -37,6 +37,7 @@ import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.schema.PTable;
@@ -44,7 +45,9 @@ import org.apache.phoenix.util.IndexUtil;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class IndexWithTableSchemaChangeIT extends ParallelStatsDisabledIT {
private void assertIndexExists(Connection conn, boolean exists, String schemaName, String dataTableName) throws SQLException {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/InvalidIndexStateClientSideIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/InvalidIndexStateClientSideIT.java
index 329267a..0a9f8fd 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/InvalidIndexStateClientSideIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/InvalidIndexStateClientSideIT.java
@@ -37,6 +37,7 @@ import org.apache.phoenix.coprocessor.generated.MetaDataProtos.GetTableRequest;
import org.apache.phoenix.coprocessor.generated.MetaDataProtos.MetaDataResponse;
import org.apache.phoenix.coprocessor.generated.MetaDataProtos.MetaDataService;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.hbase.index.util.VersionUtil;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
@@ -50,9 +51,11 @@ import org.apache.phoenix.util.EnvironmentEdgeManager;
import org.apache.phoenix.util.IndexUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Category(ParallelStatsDisabledTest.class)
public class InvalidIndexStateClientSideIT extends ParallelStatsDisabledIT {
private static final Logger LOGGER =
LoggerFactory.getLogger(InvalidIndexStateClientSideIT.class);
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalImmutableNonTxIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalImmutableNonTxIndexIT.java
index 059f723..a150132 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalImmutableNonTxIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalImmutableNonTxIndexIT.java
@@ -20,8 +20,11 @@ package org.apache.phoenix.end2end.index;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.class)
public class LocalImmutableNonTxIndexIT extends BaseIndexIT {
public LocalImmutableNonTxIndexIT(boolean localIndex, boolean mutable, String transactionProvider, boolean columnEncoded) {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalImmutableTxIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalImmutableTxIndexIT.java
index 92c94e6..36ac642 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalImmutableTxIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalImmutableTxIndexIT.java
@@ -20,9 +20,12 @@ package org.apache.phoenix.end2end.index;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.util.TestUtil;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.class)
public class LocalImmutableTxIndexIT extends BaseIndexIT {
public LocalImmutableTxIndexIT(boolean localIndex, boolean mutable, String transactionProvider, boolean columnEncoded) {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalMutableNonTxIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalMutableNonTxIndexIT.java
index 089d78e..feb50b9 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalMutableNonTxIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalMutableNonTxIndexIT.java
@@ -20,8 +20,11 @@ package org.apache.phoenix.end2end.index;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.class)
public class LocalMutableNonTxIndexIT extends BaseIndexIT {
public LocalMutableNonTxIndexIT(boolean localIndex, boolean mutable, String transactionProvider, boolean columnEncoded) {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalMutableTxIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalMutableTxIndexIT.java
index 2775454..f42a809 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalMutableTxIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalMutableTxIndexIT.java
@@ -20,9 +20,12 @@ package org.apache.phoenix.end2end.index;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.util.TestUtil;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.class)
public class LocalMutableTxIndexIT extends BaseIndexIT {
public LocalMutableTxIndexIT(boolean localIndex, boolean mutable, String transactionProvider, boolean columnEncoded) {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureWithNamespaceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureWithNamespaceIT.java
index 7535b2e..8b05b96 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureWithNamespaceIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureWithNamespaceIT.java
@@ -24,12 +24,14 @@ import java.util.Map;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.phoenix.coprocessor.MetaDataRegionObserver;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
@@ -37,6 +39,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
/*
* This class is to ensure gets its own cluster with Namespace Enabled
*/
+@Category(NeedsOwnMiniClusterTest.class)
public class MutableIndexFailureWithNamespaceIT extends MutableIndexFailureIT {
public MutableIndexFailureWithNamespaceIT(String transactionProvider, boolean localIndex, boolean isNamespaceMapped,
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
index a15456c..e6dd5fc 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
@@ -35,6 +35,7 @@ import java.util.Properties;
import org.apache.hadoop.hbase.TableName;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
import org.apache.phoenix.query.QueryServices;
@@ -46,6 +47,7 @@ import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -54,6 +56,7 @@ import org.slf4j.LoggerFactory;
import org.apache.phoenix.thirdparty.com.google.common.primitives.Doubles;
+@Category(ParallelStatsDisabledTest.class)
@RunWith(Parameterized.class)
public class MutableIndexIT extends ParallelStatsDisabledIT {
private static final Logger LOGGER = LoggerFactory.getLogger(MutableIndexIT.class);
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexRebuilderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexRebuilderIT.java
index 88c0e77..ff613cd 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexRebuilderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexRebuilderIT.java
@@ -46,9 +46,10 @@ import org.apache.hadoop.hbase.exceptions.TimeoutIOException;
import org.apache.hadoop.hbase.regionserver.MiniBatchOperationInProgress;
import org.apache.phoenix.coprocessor.MetaDataRegionObserver;
import org.apache.phoenix.coprocessor.MetaDataRegionObserver.BuildIndexScheduleTask;
-import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.schema.PIndexState;
import org.apache.phoenix.util.EnvironmentEdgeManager;
@@ -58,12 +59,14 @@ import org.apache.phoenix.util.RunUntilFailure;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+@Category(NeedsOwnMiniClusterTest.class)
@RunWith(RunUntilFailure.class)
-public class MutableIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT {
+public class MutableIndexRebuilderIT extends BaseTest {
private static final int WAIT_AFTER_DISABLED = 0;
private static final long REBUILD_PERIOD = 50000;
private static final long REBUILD_INTERVAL = 2000;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexSplitForwardScanIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexSplitForwardScanIT.java
index 75e2ae2..0d248a7 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexSplitForwardScanIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexSplitForwardScanIT.java
@@ -17,8 +17,11 @@
*/
package org.apache.phoenix.end2end.index;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class MutableIndexSplitForwardScanIT extends MutableIndexSplitIT {
public MutableIndexSplitForwardScanIT(boolean localIndex, boolean multiTenant) {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexSplitReverseScanIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexSplitReverseScanIT.java
index d7afb31..01cfa67 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexSplitReverseScanIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexSplitReverseScanIT.java
@@ -17,8 +17,11 @@
*/
package org.apache.phoenix.end2end.index;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class MutableIndexSplitReverseScanIT extends MutableIndexSplitIT {
public MutableIndexSplitReverseScanIT(boolean localIndex, boolean multiTenant) {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java
index 89c6190..e504d04 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java
@@ -49,11 +49,12 @@ import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver;
import org.apache.hadoop.hbase.regionserver.MiniBatchOperationInProgress;
import org.apache.phoenix.coprocessor.MetaDataRegionObserver;
import org.apache.phoenix.coprocessor.MetaDataRegionObserver.BuildIndexScheduleTask;
-import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.execute.CommitException;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
import org.apache.phoenix.jdbc.PhoenixStatement;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.schema.PIndexState;
@@ -74,13 +75,15 @@ import org.apache.phoenix.util.TestUtil;
import org.junit.After;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+@Category(NeedsOwnMiniClusterTest.class)
@SuppressWarnings("deprecation")
-public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT {
+public class PartialIndexRebuilderIT extends BaseTest {
private static final Logger LOGGER = LoggerFactory.getLogger(PartialIndexRebuilderIT.class);
private static final Random RAND = new Random(5);
private static final int WAIT_AFTER_DISABLED = 5000;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PhoenixMRJobSubmitterIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PhoenixMRJobSubmitterIT.java
index 7ccdc81..f480052 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PhoenixMRJobSubmitterIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PhoenixMRJobSubmitterIT.java
@@ -17,10 +17,10 @@
*/
package org.apache.phoenix.end2end.index;
-import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT;
import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.mapreduce.index.automation.PhoenixAsyncIndex;
import org.apache.phoenix.mapreduce.index.automation.PhoenixMRJobSubmitter;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.schema.MetaDataClient;
import org.apache.phoenix.schema.PIndexState;
import org.apache.phoenix.util.ReadOnlyProps;
@@ -38,7 +38,7 @@ import java.sql.PreparedStatement;
import java.util.Map;
@Category(NeedsOwnMiniClusterTest.class)
-public class PhoenixMRJobSubmitterIT extends BaseUniqueNamesOwnClusterIT {
+public class PhoenixMRJobSubmitterIT extends BaseTest {
private static String REQUEST_INDEX_REBUILD_SQL = "ALTER INDEX %s ON %s REBUILD ASYNC";
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
index 5c20381..5ebee5c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
@@ -30,6 +30,7 @@ import java.sql.SQLException;
import java.util.Properties;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.schema.PTableKey;
@@ -38,8 +39,10 @@ import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class SaltedIndexIT extends ParallelStatsDisabledIT {
private static final int TABLE_SPLITS = 3;
private static final int INDEX_SPLITS = 4;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ShortViewIndexIdIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ShortViewIndexIdIT.java
index a9d516b..be84b50 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ShortViewIndexIdIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ShortViewIndexIdIT.java
@@ -26,15 +26,17 @@ import java.sql.DriverManager;
import java.sql.ResultSet;
import java.util.Map;
-import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
-public class ShortViewIndexIdIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class ShortViewIndexIdIT extends BaseTest {
@BeforeClass
public static synchronized void doSetup() throws Exception {
Map<String, String> serverProps = Maps.newHashMapWithExpectedSize(1);
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SingleCellIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SingleCellIndexIT.java
index 86b7433..bfbf3ac 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SingleCellIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SingleCellIndexIT.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.compile.QueryPlan;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixStatement;
import org.apache.phoenix.query.QueryServices;
@@ -37,6 +38,7 @@ import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.slf4j.Logger;
@@ -63,6 +65,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+@Category(ParallelStatsDisabledTest.class)
@RunWith(Parameterized.class)
public class SingleCellIndexIT extends ParallelStatsDisabledIT {
private static final Logger LOGGER = LoggerFactory.getLogger(SingleCellIndexIT.class);
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
index 85ea5eb..60fcffd 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
@@ -55,6 +55,7 @@ import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.compile.QueryPlan;
import org.apache.phoenix.end2end.IndexToolIT;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.end2end.SplitSystemCatalogIT;
import org.apache.phoenix.hbase.index.IndexRegionObserver;
import org.apache.phoenix.hbase.index.Indexer;
@@ -76,10 +77,12 @@ import org.apache.phoenix.util.TestUtil;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+@Category(NeedsOwnMiniClusterTest.class)
@RunWith(Parameterized.class)
public class ViewIndexIT extends SplitSystemCatalogIT {
private boolean isNamespaceMapped;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java
index a1ebefd..1eb0125 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java
@@ -35,15 +35,18 @@ import java.util.Properties;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.class)
@RunWith(Parameterized.class)
public class MutableRollbackIT extends ParallelStatsDisabledIT {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/RollbackIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/RollbackIT.java
index 65166fe..7605265 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/RollbackIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/RollbackIT.java
@@ -32,15 +32,18 @@ import java.util.Collection;
import java.util.Properties;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.class)
@RunWith(Parameterized.class)
public class RollbackIT extends ParallelStatsDisabledIT {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/TxWriteFailureIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/TxWriteFailureIT.java
index 01746bc..a06ac84 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/TxWriteFailureIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/TxWriteFailureIT.java
@@ -39,8 +39,9 @@ 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.util.Bytes;
-import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.hbase.index.Indexer;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
@@ -50,14 +51,16 @@ import org.apache.phoenix.util.TestUtil;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+@Category(NeedsOwnMiniClusterTest.class)
@RunWith(Parameterized.class)
-public class TxWriteFailureIT extends BaseUniqueNamesOwnClusterIT {
+public class TxWriteFailureIT extends BaseTest {
private String schemaName;
private String dataTableName;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinGlobalIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinGlobalIndexIT.java
index c4a2b5a..c99127e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinGlobalIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinGlobalIndexIT.java
@@ -21,11 +21,13 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
-
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+@Category(ParallelStatsDisabledTest.class)
public class HashJoinGlobalIndexIT extends HashJoinIT {
private static final Map<String,String> virtualNameToRealNameMap = Maps.newHashMap();
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinLocalIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinLocalIndexIT.java
index ff28c4b..761bc0e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinLocalIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinLocalIndexIT.java
@@ -34,13 +34,15 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+@Category(ParallelStatsDisabledTest.class)
@RunWith(Parameterized.class)
public class HashJoinLocalIndexIT extends HashJoinIT {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java
index f83be66..ace4025 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java
@@ -34,12 +34,15 @@ import java.util.Properties;
import org.apache.phoenix.compile.QueryPlan;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.execute.HashJoinPlan;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class HashJoinMoreIT extends ParallelStatsDisabledIT {
private final String[] plans = new String[] {
/*
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinNoIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinNoIndexIT.java
index 0acee54..1a4c1c5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinNoIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinNoIndexIT.java
@@ -21,11 +21,13 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
-
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+@Category(ParallelStatsDisabledTest.class)
public class HashJoinNoIndexIT extends HashJoinIT {
private static final Map<String,String> virtualNameToRealNameMap = Maps.newHashMap();
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinPersistentCacheIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinPersistentCacheIT.java
index 2f072b8..fba2efb 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinPersistentCacheIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinPersistentCacheIT.java
@@ -25,12 +25,15 @@ import java.sql.DriverManager;
import java.sql.ResultSet;
import java.util.Properties;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.end2end.join.HashJoinCacheIT.InvalidateHashCache;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class HashJoinPersistentCacheIT extends BaseJoinIT {
@Override
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SortMergeJoinGlobalIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SortMergeJoinGlobalIndexIT.java
index 3d878ef..57f2127 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SortMergeJoinGlobalIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SortMergeJoinGlobalIndexIT.java
@@ -21,11 +21,13 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
-
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+@Category(ParallelStatsDisabledTest.class)
public class SortMergeJoinGlobalIndexIT extends SortMergeJoinIT {
private static final Map<String,String> virtualNameToRealNameMap = Maps.newHashMap();
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SortMergeJoinLocalIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SortMergeJoinLocalIndexIT.java
index 92a944e..b8ecf50 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SortMergeJoinLocalIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SortMergeJoinLocalIndexIT.java
@@ -21,11 +21,13 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
-
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+@Category(ParallelStatsDisabledTest.class)
public class SortMergeJoinLocalIndexIT extends SortMergeJoinIT {
private static final Map<String,String> virtualNameToRealNameMap = Maps.newHashMap();
private static final String schemaName = "S_" + generateUniqueName();
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SortMergeJoinNoIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SortMergeJoinNoIndexIT.java
index 8be80b2..55c83b1 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SortMergeJoinNoIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SortMergeJoinNoIndexIT.java
@@ -21,11 +21,13 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
-
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+@Category(ParallelStatsDisabledTest.class)
public class SortMergeJoinNoIndexIT extends SortMergeJoinIT {
private static final Map<String,String> virtualNameToRealNameMap = Maps.newHashMap();
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SubqueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SubqueryIT.java
index 8c7ea04..85828df 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SubqueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SubqueryIT.java
@@ -37,12 +37,14 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+@Category(ParallelStatsDisabledTest.class)
@RunWith(Parameterized.class)
public class SubqueryIT extends BaseJoinIT {
public SubqueryIT(String[] indexDDL, String[] plans) {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SubqueryUsingSortMergeJoinIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SubqueryUsingSortMergeJoinIT.java
index d3acef1..33bab44 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SubqueryUsingSortMergeJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SubqueryUsingSortMergeJoinIT.java
@@ -33,6 +33,7 @@ import java.util.List;
import java.util.Properties;
import org.apache.phoenix.compile.OrderByCompiler.OrderBy;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.execute.ClientAggregatePlan;
import org.apache.phoenix.execute.ClientScanPlan;
import org.apache.phoenix.execute.SortMergeJoinPlan;
@@ -41,12 +42,14 @@ import org.apache.phoenix.jdbc.PhoenixPreparedStatement;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+@Category(ParallelStatsDisabledTest.class)
@RunWith(Parameterized.class)
public class SubqueryUsingSortMergeJoinIT extends BaseJoinIT {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/WhereOptimizerForJoinFiltersIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/WhereOptimizerForJoinFiltersIT.java
index 989cf16..ef6b56e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/WhereOptimizerForJoinFiltersIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/WhereOptimizerForJoinFiltersIT.java
@@ -26,8 +26,11 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class WhereOptimizerForJoinFiltersIT extends ParallelStatsDisabledIT {
String allValues =
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableIT.java
index 69c9869..9dd1db7 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableIT.java
@@ -32,15 +32,18 @@ import java.sql.SQLException;
import java.util.Properties;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Tests for table with transparent salting.
*/
+@Category(ParallelStatsDisabledTest.class)
public class SaltedTableIT extends BaseSaltedTableIT {
@Test
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java
index 0b805c6..3e2c289 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java
@@ -32,10 +32,13 @@ import java.sql.SQLException;
import java.util.Properties;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class SaltedTableUpsertSelectIT extends ParallelStatsDisabledIT {
@Test
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java
index 20179b4..1591453 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java
@@ -34,10 +34,13 @@ import java.util.Properties;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class SaltedTableVarLengthRowKeyIT extends ParallelStatsDisabledIT {
private static final String TEST_TABLE = generateUniqueName();
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java
index 9a1a764..678c5de 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java
@@ -49,12 +49,13 @@ import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.wal.WALEdit;
-import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.execute.MutationState.MultiRowMutationState;
import org.apache.phoenix.hbase.index.Indexer;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.monitoring.GlobalMetric;
import org.apache.phoenix.monitoring.MetricType;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.schema.TableRef;
import org.apache.phoenix.util.PhoenixRuntime;
@@ -63,6 +64,7 @@ import org.apache.phoenix.util.TestUtil;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -71,9 +73,10 @@ import org.apache.phoenix.thirdparty.com.google.common.base.Preconditions;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+@Category(NeedsOwnMiniClusterTest.class)
@RunWith(Parameterized.class)
// Needs to extend BaseUniqueNamesOwnClusterIT due to installation of FailingRegionObserver coprocessor
-public class PartialCommitIT extends BaseUniqueNamesOwnClusterIT {
+public class PartialCommitIT extends BaseTest {
private final String aSuccessTable;
private final String bFailureTable;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/execute/UpsertSelectOverlappingBatchesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/execute/UpsertSelectOverlappingBatchesIT.java
index ef947c6..4994a4b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/execute/UpsertSelectOverlappingBatchesIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/execute/UpsertSelectOverlappingBatchesIT.java
@@ -52,7 +52,8 @@ import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.regionserver.MiniBatchOperationInProgress;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
@@ -60,13 +61,15 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
-public class UpsertSelectOverlappingBatchesIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class UpsertSelectOverlappingBatchesIT extends BaseTest {
private static final Logger LOGGER =
LoggerFactory.getLogger(UpsertSelectOverlappingBatchesIT.class);
private Properties props;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/iterate/ChunkedResultIteratorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/iterate/ChunkedResultIteratorIT.java
index 4a59844..7ba7e2b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/iterate/ChunkedResultIteratorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/iterate/ChunkedResultIteratorIT.java
@@ -30,6 +30,7 @@ import java.util.Properties;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.phoenix.compile.QueryPlan;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixStatement;
import org.apache.phoenix.query.QueryServices;
@@ -38,8 +39,12 @@ import org.apache.phoenix.schema.PTableKey;
import org.apache.phoenix.schema.TableRef;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-@SuppressWarnings("deprecated") public class ChunkedResultIteratorIT
+
+@Category(ParallelStatsDisabledTest.class)
+@SuppressWarnings("deprecated")
+public class ChunkedResultIteratorIT
extends ParallelStatsDisabledIT {
@Test
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/iterate/PhoenixQueryTimeoutIT.java b/phoenix-core/src/it/java/org/apache/phoenix/iterate/PhoenixQueryTimeoutIT.java
index 956deba..45adcfb 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/iterate/PhoenixQueryTimeoutIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/iterate/PhoenixQueryTimeoutIT.java
@@ -28,15 +28,18 @@ import java.sql.SQLException;
import java.util.Properties;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.jdbc.PhoenixStatement;
import org.apache.phoenix.query.QueryServices;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Tests to validate that user specified property phoenix.query.timeoutMs
* works as expected.
*/
+@Category(ParallelStatsDisabledTest.class)
public class PhoenixQueryTimeoutIT extends ParallelStatsDisabledIT {
private String tableName;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
index 2ae443a..caeb45b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
@@ -43,6 +43,7 @@ import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.compile.StatementContext;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixResultSet;
import org.apache.phoenix.jdbc.PhoenixStatement;
@@ -51,9 +52,10 @@ import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.schema.PTable;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Sets;
+@Category(ParallelStatsDisabledTest.class)
public class RoundRobinResultIteratorIT extends ParallelStatsDisabledIT {
private static final int NUM_SALT_BUCKETS = 4;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorWithStatsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorWithStatsIT.java
index 5af2b94..341afed 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorWithStatsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorWithStatsIT.java
@@ -29,20 +29,22 @@ import java.util.List;
import java.util.Map;
import org.apache.phoenix.compile.StatementContext;
-import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixResultSet;
import org.apache.phoenix.jdbc.PhoenixStatement;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.schema.PTable;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
-public class RoundRobinResultIteratorWithStatsIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class RoundRobinResultIteratorWithStatsIT extends BaseTest {
private String tableName;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/mapreduce/PhoenixServerBuildIndexInputFormatIT.java b/phoenix-core/src/it/java/org/apache/phoenix/mapreduce/PhoenixServerBuildIndexInputFormatIT.java
index 0110488..053ca15 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/mapreduce/PhoenixServerBuildIndexInputFormatIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/mapreduce/PhoenixServerBuildIndexInputFormatIT.java
@@ -21,6 +21,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapreduce.Job;
import org.apache.phoenix.compile.QueryPlan;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.mapreduce.index.IndexScrutinyTool.SourceTable;
import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
import org.apache.phoenix.schema.PTable;
@@ -28,6 +29,7 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -36,6 +38,7 @@ import java.util.Properties;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertEquals;
+@Category(ParallelStatsDisabledTest.class)
public class PhoenixServerBuildIndexInputFormatIT extends ParallelStatsDisabledIT {
@Test
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/BasePhoenixMetricsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/BasePhoenixMetricsIT.java
index 41b1094..9c088f2 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/BasePhoenixMetricsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/BasePhoenixMetricsIT.java
@@ -19,8 +19,8 @@ package org.apache.phoenix.monitoring;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
-import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT;
import org.apache.phoenix.jdbc.PhoenixDriver;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
@@ -38,7 +38,7 @@ import static org.apache.phoenix.monitoring.MetricType.TASK_EXECUTED_COUNTER;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class BasePhoenixMetricsIT extends BaseUniqueNamesOwnClusterIT {
+public abstract class BasePhoenixMetricsIT extends BaseTest {
static final int MAX_RETRIES = 5;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/IndexMetricsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/IndexMetricsIT.java
index 95693aa..36c8dd9 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/IndexMetricsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/IndexMetricsIT.java
@@ -22,6 +22,7 @@ import org.apache.hadoop.metrics2.lib.DynamicMetricsRegistry;
import org.apache.hadoop.metrics2.lib.MutableFastCounter;
import org.apache.hadoop.metrics2.lib.MutableHistogram;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.hbase.index.metrics.GlobalIndexCheckerSource;
import org.apache.phoenix.hbase.index.metrics.GlobalIndexCheckerSourceImpl;
import org.apache.phoenix.hbase.index.metrics.MetricsIndexerSource;
@@ -31,11 +32,13 @@ import org.apache.phoenix.util.EnvironmentEdgeManager;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.util.Map;
import static org.junit.Assert.assertEquals;
+@Category(ParallelStatsDisabledTest.class)
public class IndexMetricsIT extends ParallelStatsDisabledIT {
private static final String TABLE_NAME = "MyTable";
private static final String INDEX_NAME = "MyIndex";
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixLoggingMetricsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixLoggingMetricsIT.java
index 2f9b96f..c270937 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixLoggingMetricsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixLoggingMetricsIT.java
@@ -18,11 +18,13 @@
package org.apache.phoenix.monitoring;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.jdbc.LoggingPhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixMetricsLog;
import org.apache.phoenix.jdbc.LoggingPhoenixResultSet;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -34,6 +36,7 @@ import java.util.Map;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+@Category(NeedsOwnMiniClusterTest.class)
public class PhoenixLoggingMetricsIT extends BasePhoenixMetricsIT {
private static final int NUM_ROWS = 10;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsDisabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsDisabledIT.java
index 3fb4113..6c51509 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsDisabledIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsDisabledIT.java
@@ -20,8 +20,9 @@ package org.apache.phoenix.monitoring;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.jdbc.PhoenixDriver;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.ConfigurationFactory;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.InstanceResolver;
@@ -30,6 +31,7 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.hamcrest.CoreMatchers;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.DriverManager;
import java.util.Map;
@@ -39,7 +41,8 @@ import static org.apache.phoenix.monitoring.NoOpGlobalMetricImpl.NO_VALUE;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
-public class PhoenixMetricsDisabledIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class PhoenixMetricsDisabledIT extends BaseTest {
@BeforeClass
public static synchronized void doSetup() throws Exception {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
index aaeeece..b67db8e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
@@ -66,6 +66,7 @@ import java.util.concurrent.Future;
import org.apache.hadoop.metrics2.AbstractMetric;
import org.apache.phoenix.compile.StatementContext;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDriver;
@@ -77,6 +78,7 @@ import org.apache.phoenix.util.EnvironmentEdgeManager;
import org.apache.phoenix.util.PhoenixRuntime;
import org.hamcrest.CoreMatchers;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.mockito.internal.util.reflection.Whitebox;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -92,6 +94,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Sets;
* 2. Phoenix Request level metrics are exposed via
* a. PhoenixRuntime
*/
+@Category(NeedsOwnMiniClusterTest.class)
public class PhoenixMetricsIT extends BasePhoenixMetricsIT {
private static final Logger LOGGER = LoggerFactory.getLogger(PhoenixMetricsIT.class);
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/query/ConnectionCachingIT.java b/phoenix-core/src/it/java/org/apache/phoenix/query/ConnectionCachingIT.java
index 33dba7a..f32b3f4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/query/ConnectionCachingIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/query/ConnectionCachingIT.java
@@ -28,6 +28,7 @@ import java.util.Properties;
import java.util.concurrent.LinkedBlockingQueue;
import org.apache.phoenix.end2end.ParallelStatsEnabledIT;
+import org.apache.phoenix.end2end.ParallelStatsEnabledTest;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.ConnectionQueryServices;
import org.apache.phoenix.query.ConnectionQueryServicesImpl;
@@ -36,12 +37,14 @@ import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Category(ParallelStatsEnabledTest.class)
@RunWith(Parameterized.class)
public class ConnectionCachingIT extends ParallelStatsEnabledIT {
private static final Logger LOGGER = LoggerFactory.getLogger(ConnectionCachingIT.class);
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/query/MaxConcurrentConnectionsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/query/MaxConcurrentConnectionsIT.java
index 611ef89..5adeeb1 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/query/MaxConcurrentConnectionsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/query/MaxConcurrentConnectionsIT.java
@@ -19,7 +19,7 @@
package org.apache.phoenix.query;
import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDriver;
import org.apache.phoenix.util.DelayedRegionServer;
@@ -27,6 +27,7 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -48,7 +49,8 @@ import static org.junit.Assert.fail;
/**
* Note that some tests for concurrentConnections live in PhoenixMetricsIT.java which also test the metric emission
*/
-public class MaxConcurrentConnectionsIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class MaxConcurrentConnectionsIT extends BaseTest {
private static HBaseTestingUtility hbaseTestUtil;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/replication/SystemCatalogWALEntryFilterIT.java b/phoenix-core/src/it/java/org/apache/phoenix/replication/SystemCatalogWALEntryFilterIT.java
index a590d87..94adabf 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/replication/SystemCatalogWALEntryFilterIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/replication/SystemCatalogWALEntryFilterIT.java
@@ -39,6 +39,7 @@ import org.apache.hadoop.hbase.wal.WAL;
import org.apache.hadoop.hbase.wal.WALEdit;
import org.apache.hadoop.hbase.wal.WALKeyImpl;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.hbase.index.wal.IndexedKeyValue;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
import org.apache.phoenix.mapreduce.util.ConnectionUtil;
@@ -51,8 +52,10 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class SystemCatalogWALEntryFilterIT extends ParallelStatsDisabledIT {
private static final byte[] REGION = Bytes.toBytes("REGION");
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixClientRpcIT.java b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixClientRpcIT.java
index f41fcfb..34c9365 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixClientRpcIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixClientRpcIT.java
@@ -24,7 +24,8 @@ import java.util.Properties;
import org.apache.hadoop.hbase.ipc.CallRunner;
import org.apache.hadoop.hbase.regionserver.RSRpcServices;
-import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.ReadOnlyProps;
@@ -33,9 +34,11 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
-public class PhoenixClientRpcIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class PhoenixClientRpcIT extends BaseTest {
private String schemaName;
private String indexName;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java
index 18e155d..2e0ab5a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java
@@ -45,7 +45,8 @@ import org.apache.hadoop.hbase.master.assignment.AssignmentManager;
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.end2end.BaseUniqueNamesOwnClusterIT;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
@@ -55,9 +56,11 @@ import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
-public class PhoenixServerRpcIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class PhoenixServerRpcIT extends BaseTest {
private String schemaName;
private String indexName;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheConnectionLevelPropIT.java b/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheConnectionLevelPropIT.java
index 1bc109e..f0f55b3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheConnectionLevelPropIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheConnectionLevelPropIT.java
@@ -18,6 +18,7 @@
package org.apache.phoenix.rpc;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.query.ConnectionQueryServices;
import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.query.QueryServices;
@@ -28,6 +29,8 @@ import static org.apache.phoenix.util.TestUtil.DEFAULT_SCHEMA_NAME;
import org.junit.AfterClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import static org.junit.Assert.assertTrue;
import java.sql.Connection;
@@ -52,6 +55,7 @@ import static org.mockito.Mockito.verify;
* for SELECTs and UPSERTs:
* Table-level property > Connection-level property > Default value
*/
+@Category(ParallelStatsDisabledTest.class)
public class UpdateCacheConnectionLevelPropIT extends ParallelStatsDisabledIT {
private static Connection conn1;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java b/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java
index 0f63390..4befed5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java
@@ -42,6 +42,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver;
import org.apache.phoenix.query.ConnectionQueryServices;
@@ -56,6 +57,7 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -64,6 +66,7 @@ import org.slf4j.LoggerFactory;
* Verifies the number of RPC calls from {@link MetaDataClient} updateCache()
* for transactional and non-transactional tables.
*/
+@Category(ParallelStatsDisabledTest.class)
public class UpdateCacheIT extends ParallelStatsDisabledIT {
private static final Logger LOGGER =
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/BaseStatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/BaseStatsCollectorIT.java
index 75d3f13..4f38efd 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/BaseStatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/BaseStatsCollectorIT.java
@@ -59,7 +59,7 @@ import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.mapreduce.Job;
import org.apache.phoenix.coprocessor.UngroupedAggregateRegionObserver;
-import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
import org.apache.phoenix.query.BaseTest;
@@ -83,6 +83,7 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.slf4j.Logger;
@@ -99,7 +100,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
* 4. Stats collection via SQL or MR job
*/
@RunWith(Parameterized.class)
-public abstract class BaseStatsCollectorIT extends BaseUniqueNamesOwnClusterIT {
+public abstract class BaseStatsCollectorIT extends BaseTest {
private static final Logger LOGGER = LoggerFactory.getLogger(BaseStatsCollectorIT.class);
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/NamespaceDisabledStatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/NamespaceDisabledStatsCollectorIT.java
index 138c7c0..e48939d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/NamespaceDisabledStatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/NamespaceDisabledStatsCollectorIT.java
@@ -18,11 +18,14 @@
package org.apache.phoenix.schema.stats;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized;
import java.util.Arrays;
import java.util.Collection;
+@Category(NeedsOwnMiniClusterTest.class)
public class NamespaceDisabledStatsCollectorIT extends BaseStatsCollectorIT {
public NamespaceDisabledStatsCollectorIT(boolean userTableNamespaceMapped, boolean collectStatsOnSnapshot) {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/NamespaceEnabledStatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/NamespaceEnabledStatsCollectorIT.java
index 2748e61..888cb73 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/NamespaceEnabledStatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/NamespaceEnabledStatsCollectorIT.java
@@ -18,15 +18,18 @@
package org.apache.phoenix.schema.stats;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized;
import java.util.Arrays;
import java.util.Collection;
import java.util.Map;
+@Category(NeedsOwnMiniClusterTest.class)
public class NamespaceEnabledStatsCollectorIT extends BaseStatsCollectorIT {
public NamespaceEnabledStatsCollectorIT(boolean userTableNamespaceMapped, boolean collectStatsOnSnapshot) {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/NonTxStatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/NonTxStatsCollectorIT.java
index 9e85fd9..193bc63 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/NonTxStatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/NonTxStatsCollectorIT.java
@@ -20,8 +20,11 @@ package org.apache.phoenix.schema.stats;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
+@Category(NeedsOwnMiniClusterTest.class)
public class NonTxStatsCollectorIT extends BaseStatsCollectorIT {
public NonTxStatsCollectorIT(boolean mutable,
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/TxStatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/TxStatsCollectorIT.java
index fc26c3e..91afb8c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/TxStatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/TxStatsCollectorIT.java
@@ -17,12 +17,15 @@
*/
package org.apache.phoenix.schema.stats;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.util.TestUtil;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized;
import java.util.Arrays;
import java.util.Collection;
+@Category(NeedsOwnMiniClusterTest.class)
public class TxStatsCollectorIT extends BaseStatsCollectorIT {
public TxStatsCollectorIT(boolean mutable, String transactionProvider, boolean columnEncoded) {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java
index 0fd1603..6ba411c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java
@@ -18,6 +18,7 @@
package org.apache.phoenix.schema.tool;
import org.apache.phoenix.end2end.ParallelStatsEnabledIT;
+import org.apache.phoenix.end2end.ParallelStatsEnabledTest;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.parse.ParseException;
import org.apache.phoenix.parse.SQLParser;
@@ -29,6 +30,7 @@ import org.apache.phoenix.util.SchemaUtil;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -49,6 +51,7 @@ import static junit.framework.TestCase.assertTrue;
import static junit.framework.TestCase.fail;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+@Category(ParallelStatsEnabledTest.class)
public class SchemaToolExtractionIT extends ParallelStatsEnabledIT {
@BeforeClass
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java b/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java
index 8a9f4e0..447926e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
* any supporting utils.
*/
-public class BaseTracingTestIT extends ParallelStatsDisabledIT {
+public abstract class BaseTracingTestIT extends ParallelStatsDisabledIT {
private static final Logger LOGGER = LoggerFactory.getLogger(BaseTracingTestIT.class);
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTableMetricsWriterIT.java b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTableMetricsWriterIT.java
index c753c7a..2508a31 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTableMetricsWriterIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTableMetricsWriterIT.java
@@ -28,14 +28,17 @@ import java.util.concurrent.TimeUnit;
import org.apache.htrace.Span;
import org.apache.htrace.Tracer;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.trace.TraceReader.SpanInfo;
import org.apache.phoenix.trace.TraceReader.TraceHolder;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Test that the logging sink stores the expected metrics/stats
*/
+@Category(ParallelStatsDisabledTest.class)
public class PhoenixTableMetricsWriterIT extends BaseTracingTestIT {
/**
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
index ddf7f92..69cf26d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
@@ -35,12 +35,14 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.htrace.*;
import org.apache.htrace.impl.ProbabilitySampler;
import org.apache.phoenix.coprocessor.BaseScannerRegionObserver;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.trace.TraceReader.SpanInfo;
import org.apache.phoenix.trace.TraceReader.TraceHolder;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,6 +51,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.ImmutableMap;
/**
* Test that the logging sink stores the expected metrics/stats
*/
+@Category(ParallelStatsDisabledTest.class)
@Ignore("Will need to revisit for new HDFS/HBase/HTrace, broken on 5.x")
public class PhoenixTracingEndToEndIT extends BaseTracingTestIT {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/tx/FlappingTransactionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/tx/FlappingTransactionIT.java
index a44c235..8b1606c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/tx/FlappingTransactionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/FlappingTransactionIT.java
@@ -40,6 +40,7 @@ import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryConstants;
@@ -49,6 +50,7 @@ import org.apache.phoenix.transaction.TransactionFactory;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -59,6 +61,7 @@ import org.junit.runners.Parameterized.Parameters;
* TODO: review with Tephra community
*
*/
+@Category(ParallelStatsDisabledTest.class)
@RunWith(Parameterized.class)
public class FlappingTransactionIT extends ParallelStatsDisabledIT {
private final String txProvider;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/tx/ParameterizedTransactionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/tx/ParameterizedTransactionIT.java
index 7ee32f3..93e55f9 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/tx/ParameterizedTransactionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/ParameterizedTransactionIT.java
@@ -46,6 +46,7 @@ import org.apache.hadoop.hbase.coprocessor.RegionObserver;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.coprocessor.TephraTransactionalProcessor;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
@@ -64,12 +65,14 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+@Category(ParallelStatsDisabledTest.class)
@RunWith(Parameterized.class)
public class ParameterizedTransactionIT extends ParallelStatsDisabledIT {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
index eb26b0a..f3b9431 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
@@ -57,6 +57,7 @@ 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.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
@@ -76,12 +77,14 @@ import org.apache.phoenix.util.StringUtil;
import org.apache.phoenix.util.TestUtil;
import org.apache.tephra.TxConstants;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+@Category(ParallelStatsDisabledTest.class)
@RunWith(Parameterized.class)
public class TransactionIT extends ParallelStatsDisabledIT {
private final String txProvider;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java b/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java
index 55ffb25..41bc091 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java
@@ -33,6 +33,7 @@ import java.util.Collection;
import java.util.Properties;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.apache.phoenix.execute.MutationState;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryServices;
@@ -43,10 +44,12 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+@Category(ParallelStatsDisabledTest.class)
@RunWith(Parameterized.class)
public class TxCheckpointIT extends ParallelStatsDisabledIT {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryIT.java
index dcea9cf..5f18dac 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryIT.java
@@ -27,9 +27,11 @@ import org.apache.hadoop.hbase.MiniHBaseCluster;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
-import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
+import org.apache.phoenix.query.BaseTest;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,7 +39,8 @@ import org.slf4j.LoggerFactory;
* This test is wrt to https://issues.apache.org/jira/browse/PHOENIX-4993.Test checks region
* close should not close the shared connections
*/
-public class CoprocessorHConnectionTableFactoryIT extends BaseUniqueNamesOwnClusterIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class CoprocessorHConnectionTableFactoryIT extends BaseTest {
private static String ORG_PREFIX = "ORG";
private static final Logger LOGGER =
LoggerFactory.getLogger(CoprocessorHConnectionTableFactoryIT.class);
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/util/IndexScrutinyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/util/IndexScrutinyIT.java
index 8af61c4..83810ad 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/util/IndexScrutinyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/util/IndexScrutinyIT.java
@@ -24,8 +24,11 @@ import java.sql.Connection;
import java.sql.DriverManager;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelStatsDisabledTest.class)
public class IndexScrutinyIT extends ParallelStatsDisabledIT {
@Test
public void testRowCountIndexScrutiny() throws Throwable {
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 18401aa..1332f2b 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
@@ -199,7 +199,7 @@ public abstract class BaseTest {
private static final Logger LOGGER = LoggerFactory.getLogger(BaseTest.class);
@ClassRule
public static TemporaryFolder tmpFolder = new TemporaryFolder();
- private static final int dropTableTimeout = 300; // 5 mins should be long enough.
+ private static final int dropTableTimeout = 120; // 2 mins should be long enough.
private static final ThreadFactory factory = new ThreadFactoryBuilder().setDaemon(true)
.setNameFormat("DROP-TABLE-BASETEST" + "-thread-%s").build();
private static final ExecutorService dropHTableService = Executors
@@ -1612,45 +1612,74 @@ public abstract class BaseTest {
private static synchronized void disableAndDropAllTables() throws IOException {
long startTime = System.currentTimeMillis();
- Admin admin = utility.getAdmin();
- ExecutorService dropHTableExecutor = Executors
- .newCachedThreadPool(factory);
+ long deadline = System.currentTimeMillis() + 15 * 60 * 1000;
+ final Admin admin = utility.getAdmin();
List<TableDescriptor> tableDescriptors = admin.listTableDescriptors();
int tableCount = tableDescriptors.size();
- int retryCount=10;
- List<Future<Void>> futures = new ArrayList<>();
- while (!tableDescriptors.isEmpty() && retryCount-->0) {
- for(TableDescriptor tableDescriptor : tableDescriptors) {
+ while (!(tableDescriptors = admin.listTableDescriptors()).isEmpty()) {
+ List<Future<Void>> futures = new ArrayList<>();
+ ExecutorService dropHTableExecutor = Executors.newFixedThreadPool(10, factory);
+
+ for(final TableDescriptor tableDescriptor : tableDescriptors) {
futures.add(dropHTableExecutor.submit(new Callable<Void>() {
@Override
public Void call() throws Exception {
- if (admin.isTableEnabled(tableDescriptor.getTableName())) {
- admin.disableTable(tableDescriptor.getTableName());
+ final TableName tableName = tableDescriptor.getTableName();
+ String table = tableName.toString();
+ Future<Void> disableFuture = null;
+ try {
+ LOGGER.info("Calling disable table on: {} ", table);
+ disableFuture = admin.disableTableAsync(tableName);
+ disableFuture.get(dropTableTimeout, TimeUnit.SECONDS);
+ LOGGER.info("Table disabled: {}", table);
+ } catch (Exception e) {
+ LOGGER.warn("Could not disable table {}", table, e);
+ try {
+ disableFuture.cancel(true);
+ } catch (Exception f) {
+ //fall through
+ }
+ //fall through
+ }
+ Future<Void> deleteFuture = null;
+ try {
+ LOGGER.info("Calling delete table on: {}", table);
+ deleteFuture = admin.deleteTableAsync(tableName);
+ deleteFuture.get(dropTableTimeout, TimeUnit.SECONDS);
+ LOGGER.info("Table deleted: {}", table);
+ } catch (Exception e) {
+ LOGGER.warn("Could not delete table {}", table, e);
+ try {
+ deleteFuture.cancel(true);
+ } catch (Exception f) {
+ //fall through
+ }
+ //fall through
}
- admin.deleteTable(tableDescriptor.getTableName());
return null;
}
}));
}
- for (Future<Void> future : futures) {
- try {
- future.get(dropTableTimeout, TimeUnit.SECONDS);
- } catch (Exception e) {
- LOGGER.warn("Error while dropping table, will try again", e);
- }
+
+ try {
+ dropHTableExecutor.shutdown();
+ dropHTableExecutor.awaitTermination(600, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ LOGGER.error("dropHTableExecutor didn't shut down in 10 minutes, calling shutdownNow()");
+ dropHTableExecutor.shutdownNow();
}
- tableDescriptors = admin.listTableDescriptors();
- }
- if(!tableDescriptors.isEmpty()) {
- LOGGER.error("Could not clean up tables!");
+
+ if (System.currentTimeMillis() > deadline) {
+ LOGGER.error("Could not clean up HBase tables in 15 minutes, killing JVM");
+ System.exit(-1);
+ }
}
- dropHTableExecutor.shutdownNow();
+
long endTime = System.currentTimeMillis();
LOGGER.info("Disabled and dropped {} tables in {} ms", tableCount, endTime-startTime);
-
}
public static void assertOneOfValuesEqualsResultSet(ResultSet rs, List<List<Object>>... expectedResultsArray) throws SQLException {
diff --git a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index bc768e2..1eb2d9b 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -31,6 +31,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
import org.apache.phoenix.pherf.configuration.Column;
import org.apache.phoenix.pherf.configuration.DataModel;
@@ -45,10 +46,12 @@ import org.apache.phoenix.pherf.workload.WorkloadExecutor;
import org.apache.phoenix.pherf.workload.WriteWorkload;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.jcabi.jdbc.JdbcSession;
import com.jcabi.jdbc.Outcome;
+@Category(NeedsOwnMiniClusterTest.class)
public class DataIngestIT extends ResultBaseTestIT {
@Before
diff --git a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java
index b9cfbcf..b6b7c56 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java
@@ -19,6 +19,7 @@
package org.apache.phoenix.pherf;
import org.apache.commons.lang3.StringUtils;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.pherf.result.Result;
import org.apache.phoenix.pherf.result.ResultValue;
import org.apache.phoenix.pherf.result.file.ResultFileDetails;
@@ -27,6 +28,7 @@ import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.ExpectedSystemExit;
+import org.junit.experimental.categories.Category;
import java.io.IOException;
import java.util.HashMap;
@@ -35,6 +37,7 @@ import java.util.concurrent.Future;
import static org.junit.Assert.assertEquals;
+@Category(NeedsOwnMiniClusterTest.class)
public class PherfMainIT extends ResultBaseTestIT {
public HashMap<String, String> mapResults(Result r) throws IOException {
diff --git a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/ResultBaseTestIT.java b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/ResultBaseTestIT.java
index f3d7cba..a869c78 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/ResultBaseTestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/ResultBaseTestIT.java
@@ -36,8 +36,7 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
-@Category(NeedsOwnMiniClusterTest.class)
-public class ResultBaseTestIT extends ParallelStatsDisabledIT {
+public abstract class ResultBaseTestIT extends ParallelStatsDisabledIT {
protected static final String matcherScenario = ".*scenario/.*test_scenario.xml";
protected static final String matcherSchema = ".*datamodel/.*test_schema.sql";
diff --git a/pom.xml b/pom.xml
index e53fc19..3cf05c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,12 +47,8 @@
<module>phoenix-hbase-compat-2.1.6</module>
<module>phoenix-core</module>
<module>phoenix-pherf</module>
- <module>phoenix-client-parent</module>
- <module>phoenix-client-parent/phoenix-client</module>
- <module>phoenix-client-parent/phoenix-client-embedded</module>
- <module>phoenix-server</module>
- <module>phoenix-assembly</module>
<module>phoenix-tracing-webapp</module>
+ <!-- shaded artifact and assembly modules are added in shade-and-assembly profile -->
</modules>
<repositories>
@@ -147,10 +143,10 @@
<maven-antlr-eclipse-plugin.version>${antlr.version}</maven-antlr-eclipse-plugin.version>
<maven-project-info-reports-plugin.version>3.1.1</maven-project-info-reports-plugin.version>
<!-- Override property in ASF parent -->
- <surefire.version>2.22.2</surefire.version>
+ <surefire.version>3.0.0-M5</surefire.version>
<spotbugs-maven-plugin.version>4.1.3</spotbugs-maven-plugin.version>
<spotbugs.version>4.1.3</spotbugs.version>
- <jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
+ <jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
<!-- Plugin options -->
<numForkedUT>8</numForkedUT>
@@ -167,7 +163,7 @@
<jacoco.instruction.coverage.percentage>0.700</jacoco.instruction.coverage.percentage>
<jacoco.branch.coverage.percentage>0.600</jacoco.branch.coverage.percentage>
- <maven-owasp-plugin.version>5.3.2</maven-owasp-plugin.version>
+ <maven-owasp-plugin.version>6.3.1</maven-owasp-plugin.version>
<protobuf.plugin.version>0.6.1</protobuf.plugin.version>
<os.maven.version>1.5.0.Final</os.maven.version>
</properties>
@@ -313,16 +309,19 @@
<forkCount>${numForkedIT}</forkCount>
<runOrder>alphabetical</runOrder>
<redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>
- <shutdown>kill</shutdown>
+ <forkedProcessExitTimeoutInSeconds>180</forkedProcessExitTimeoutInSeconds>
+ <shutdown>exit</shutdown>
<testSourceDirectory>${basedir}/src/it/java</testSourceDirectory>
<trimStackTrace>false</trimStackTrace>
+ <!-- https://www.orpiske.net/2021/04/test-woes-with-maven-failsafe-3-0-0-m5 -->
+ <useModulePath>false</useModulePath>
</configuration>
<executions>
<execution>
<id>ParallelStatsEnabledTest</id>
<configuration>
<reuseForks>true</reuseForks>
- <argLine>@{jacocoArgLine} -Xmx2000m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/ -XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops -XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled -XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68 </argLine>
+ <argLine>@{jacocoArgLine} -Xmx3000m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/ -XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops -XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled -XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68</argLine>
<groups>org.apache.phoenix.end2end.ParallelStatsEnabledTest</groups>
</configuration>
<goals>
@@ -334,7 +333,7 @@
<id>ParallelStatsDisabledTest</id>
<configuration>
<reuseForks>true</reuseForks>
- <argLine>@{jacocoArgLine} -Xmx3000m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/ -XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops -XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled -XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68 </argLine>
+ <argLine>@{jacocoArgLine} -Xmx3000m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/ -XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops -XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled -XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68</argLine>
<groups>org.apache.phoenix.end2end.ParallelStatsDisabledTest</groups>
</configuration>
<goals>
@@ -346,7 +345,7 @@
<id>NeedTheirOwnClusterTests</id>
<configuration>
<reuseForks>false</reuseForks>
- <argLine>@{jacocoArgLine} -enableassertions -Xmx2000m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/</argLine>
+ <argLine>@{jacocoArgLine} -enableassertions -Xmx3000m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/ -XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops -XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled -XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68</argLine>
<groups>org.apache.phoenix.end2end.NeedsOwnMiniClusterTest</groups>
</configuration>
<goals>
@@ -553,10 +552,10 @@
<configuration>
<forkCount>${numForkedUT}</forkCount>
<reuseForks>true</reuseForks>
- <argLine>@{jacocoArgLine} -enableassertions -Xmx2250m -XX:MaxPermSize=128m
+ <argLine>@{jacocoArgLine} -enableassertions -Xmx2250m
-Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/</argLine>
<redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>
- <shutdown>kill</shutdown>
+ <shutdown>exit</shutdown>
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
@@ -1501,6 +1500,21 @@
</dependencyManagement>
<profiles>
+ <profile>
+ <id>shade-and-assembly</id>
+ <activation>
+ <property>
+ <name>!PhoenixPatchProcess</name>
+ </property>
+ </activation>
+ <modules>
+ <module>phoenix-client-parent</module>
+ <module>phoenix-client-parent/phoenix-client</module>
+ <module>phoenix-client-parent/phoenix-client-embedded</module>
+ <module>phoenix-server</module>
+ <module>phoenix-assembly</module>
+ </modules>
+ </profile>
<!-- this profile should be activated for release builds -->
<profile>
<id>release</id>