You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by ja...@apache.org on 2019/01/11 21:50:37 UTC
[incubator-pinot] 01/01: Optimize imports for all files
This is an automated email from the ASF dual-hosted git repository.
jackie pushed a commit to branch optimize_imports
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit b8fff8e634ac67d850ffe5196d0fab7c8d74dae6
Author: Jackie (Xiaotian) Jiang <xa...@linkedin.com>
AuthorDate: Fri Jan 11 13:50:01 2019 -0800
Optimize imports for all files
---
.../apache/pinot/client/DynamicBrokerSelector.java | 3 +-
.../org/apache/pinot/filesystem/AzurePinotFS.java | 2 +-
.../pinot/filesystem/test/AzurePinotFSTest.java | 2 +-
.../apache/pinot/broker/api/RequestStatistics.java | 2 +-
.../broker/api/resources/PinotBrokerDebug.java | 12 ++--
.../api/resources/PinotBrokerHealthCheck.java | 6 +-
.../broker/api/resources/PinotClientRequest.java | 12 ++--
.../pinot/broker/broker/AccessControlFactory.java | 2 +-
.../broker/AllowAllAccessControlFactory.java | 2 +-
.../broker/broker/BrokerAdminApiApplication.java | 8 +--
.../pinot/broker/broker/BrokerServerBuilder.java | 6 +-
...okerResourceOnlineOfflineStateModelFactory.java | 13 ++---
.../broker/broker/helix/ClusterChangeMediator.java | 11 ++--
.../broker/broker/helix/HelixBrokerStarter.java | 22 +++----
.../helix/LiveInstancesChangeListenerImpl.java | 10 ++--
.../TimeboundaryRefreshMessageHandlerFactory.java | 10 ++--
.../broker/pruner/PartitionZKMetadataPruner.java | 8 +--
.../pruner/SegmentZKMetadataPrunerService.java | 2 +-
.../broker/queryquota/TableQueryQuotaManager.java | 14 ++---
.../requesthandler/BaseBrokerRequestHandler.java | 22 +++----
.../requesthandler/BrokerRequestHandler.java | 4 +-
.../requesthandler/BrokerRequestOptimizer.java | 4 +-
.../ConnectionPoolBrokerRequestHandler.java | 32 +++++-----
...enNestedPredicatesFilterQueryTreeOptimizer.java | 4 +-
...ualitiesToInClauseFilterQueryTreeOptimizer.java | 7 +--
.../broker/requesthandler/OptimizationFlags.java | 2 +-
.../broker/requesthandler/RangeMergeOptimizer.java | 6 +-
.../SingleConnectionBrokerRequestHandler.java | 12 ++--
.../pinot/broker/routing/CfgBasedRouting.java | 4 +-
.../routing/HelixExternalViewBasedRouting.java | 26 ++++-----
.../HelixExternalViewBasedTimeBoundaryService.java | 12 ++--
.../broker/routing/RoutingTableBuilderFactory.java | 6 +-
.../broker/routing/RoutingTableLookupRequest.java | 4 +-
.../builder/BalancedRandomRoutingTableBuilder.java | 4 +-
.../BasePartitionAwareRoutingTableBuilder.java | 19 +++---
.../routing/builder/BaseRoutingTableBuilder.java | 16 ++---
.../builder/DefaultOfflineRoutingTableBuilder.java | 8 +--
.../DefaultRealtimeRoutingTableBuilder.java | 10 ++--
.../HighLevelConsumerBasedRoutingTableBuilder.java | 6 +-
.../builder/LargeClusterRoutingTableBuilder.java | 4 +-
.../LowLevelConsumerRoutingTableBuilder.java | 10 ++--
.../builder/LowLevelRoutingTableBuilderUtil.java | 4 +-
.../PartitionAwareOfflineRoutingTableBuilder.java | 18 +++---
.../PartitionAwareRealtimeRoutingTableBuilder.java | 16 ++---
.../routing/builder/RoutingTableBuilder.java | 8 +--
.../builder/RoutingTableInstancePruner.java | 2 +-
.../routing/selector/MergedSegmentSelector.java | 8 +--
.../broker/routing/selector/SegmentSelector.java | 4 +-
.../routing/selector/SegmentSelectorProvider.java | 2 +-
.../pinot/broker/broker/BrokerTestUtils.java | 1 -
.../broker/broker/HelixBrokerStarterTest.java | 30 +++++-----
.../broker/broker/HelixBrokerStarterUtilsTest.java | 3 +-
.../broker/pruner/SegmentZKMetadataPrunerTest.java | 10 ++--
.../pinot/broker/queryquota/HitCounterTest.java | 3 -
.../queryquota/TableQueryQuotaManagerTest.java | 12 ++--
.../requesthandler/OptimizationFlagsTest.java | 2 +-
.../requesthandler/RangeMergeOptimizerTest.java | 8 +--
.../broker/routing/RandomRoutingTableTest.java | 8 +--
.../pinot/broker/routing/RoutingTableTest.java | 22 +++----
.../broker/routing/TimeBoundaryServiceTest.java | 16 ++---
.../BalancedRandomRoutingTableBuilderTest.java | 4 +-
.../HighLevelConsumerRoutingTableBuilderTest.java | 8 +--
.../LargeClusterRoutingTableBuilderTest.java | 2 +-
.../LowLevelConsumerRoutingTableBuilderTest.java | 8 +--
...rtitionAwareOfflineRoutingTableBuilderTest.java | 24 ++++----
...titionAwareRealtimeRoutingTableBuilderTest.java | 24 ++++----
.../builder/RoutingTableBuilderTestUtil.java | 6 +-
.../selector/MergedSegmentSelectorTest.java | 10 ++--
.../config/AdjustTableNameChildKeyTransformer.java | 2 +-
.../pinot/common/config/ColumnPartitionConfig.java | 2 +-
.../apache/pinot/common/config/CombinedConfig.java | 4 +-
.../pinot/common/config/CombinedConfigLoader.java | 2 +-
...CombinedConfigSeparatorChildKeyTransformer.java | 2 +-
.../apache/pinot/common/config/Deserializer.java | 2 +-
.../org/apache/pinot/common/config/Duration.java | 2 +-
.../apache/pinot/common/config/IndexingConfig.java | 4 +-
.../pinot/common/config/PinotTaskConfig.java | 2 +-
.../apache/pinot/common/config/QuotaConfig.java | 4 +-
.../common/config/ReplicaGroupStrategyConfig.java | 2 +-
.../apache/pinot/common/config/RoutingConfig.java | 2 +-
.../common/config/SegmentPartitionConfig.java | 4 +-
.../SegmentsValidationAndRetentionConfig.java | 2 +-
.../apache/pinot/common/config/TableConfig.java | 10 ++--
.../pinot/common/config/TableCustomConfig.java | 2 +-
.../pinot/common/config/TableNameBuilder.java | 4 +-
.../pinot/common/config/TableTaskConfig.java | 2 +-
.../apache/pinot/common/config/TenantConfig.java | 2 +-
.../pinot/common/data/DateTimeFieldSpec.java | 2 +-
.../common/data/DateTimeFormatPatternSpec.java | 2 +-
.../pinot/common/data/DateTimeFormatSpec.java | 7 +--
.../pinot/common/data/DateTimeFormatUnitSpec.java | 2 +-
.../pinot/common/data/DateTimeGranularitySpec.java | 5 +-
.../org/apache/pinot/common/data/FieldSpec.java | 8 +--
.../apache/pinot/common/data/MetricFieldSpec.java | 2 +-
.../java/org/apache/pinot/common/data/Schema.java | 12 ++--
.../pinot/common/data/StarTreeIndexSpec.java | 8 +--
.../apache/pinot/common/data/TimeFieldSpec.java | 4 +-
.../pinot/common/data/TimeGranularitySpec.java | 4 +-
.../pinot/common/exception/QueryException.java | 2 +-
.../pinot/common/lineage/SegmentMergeLineage.java | 4 +-
.../lineage/SegmentMergeLineageAccessHelper.java | 9 +--
.../messages/TimeboundaryRefreshMessage.java | 3 +-
.../pinot/common/metadata/ZKMetadataProvider.java | 18 +++---
.../metadata/instance/InstanceZKMetadata.java | 11 ++--
.../metadata/segment/ColumnPartitionMetadata.java | 4 +-
.../segment/LLCRealtimeSegmentZKMetadata.java | 6 +-
.../metadata/segment/OfflineSegmentZKMetadata.java | 8 +--
.../segment/RealtimeSegmentZKMetadata.java | 4 +-
.../metadata/segment/SegmentPartitionMetadata.java | 2 +-
.../common/metadata/segment/SegmentZKMetadata.java | 8 +--
.../SegmentZKMetadataCustomMapModifier.java | 2 +-
.../pinot/common/metrics/AbstractMetrics.java | 4 +-
.../pinot/common/metrics/AggregatedCounter.java | 5 +-
.../pinot/common/metrics/AggregatedHistogram.java | 9 ++-
.../pinot/common/metrics/AggregatedLongGauge.java | 3 +-
.../pinot/common/metrics/AggregatedMeter.java | 9 ++-
.../apache/pinot/common/metrics/MetricsHelper.java | 13 ++---
.../pinot/common/metrics/ValidationMetrics.java | 6 +-
.../common/partition/PartitionAssignment.java | 2 +-
.../ReplicaGroupPartitionAssignmentGenerator.java | 6 +-
.../StreamPartitionAssignmentGenerator.java | 12 ++--
.../protocols/SegmentCompletionProtocol.java | 2 +-
.../apache/pinot/common/query/ReduceService.java | 8 +--
.../pinot/common/query/ReduceServiceRegistry.java | 4 +-
.../pinot/common/request/AggregationInfo.java | 53 +++++++----------
.../apache/pinot/common/request/BrokerRequest.java | 33 ++++-------
.../pinot/common/request/FilterOperator.java | 9 +--
.../apache/pinot/common/request/FilterQuery.java | 67 +++++++++------------
.../pinot/common/request/FilterQueryMap.java | 44 +++++---------
.../org/apache/pinot/common/request/GroupBy.java | 53 +++++++----------
.../pinot/common/request/HavingFilterQuery.java | 67 +++++++++------------
.../pinot/common/request/HavingFilterQueryMap.java | 42 +++++--------
.../pinot/common/request/InstanceRequest.java | 59 ++++++++-----------
.../apache/pinot/common/request/QuerySource.java | 40 +++++--------
.../org/apache/pinot/common/request/QueryType.java | 57 ++++++++----------
.../org/apache/pinot/common/request/Selection.java | 57 ++++++++----------
.../apache/pinot/common/request/SelectionSort.java | 45 ++++++--------
.../request/transform/TransformExpressionTree.java | 11 ++--
.../pinot/common/response/BrokerResponse.java | 2 +-
.../common/response/BrokerResponseFactory.java | 2 +-
.../pinot/common/response/ProcessingException.java | 46 ++++++---------
.../pinot/common/response/ServerInstance.java | 4 +-
.../response/broker/BrokerResponseNative.java | 8 +--
.../common/restlet/resources/RebalanceResult.java | 2 +-
.../common/restlet/resources/ResourceUtils.java | 2 +-
.../pinot/common/segment/SegmentMetadata.java | 4 +-
.../common/segment/fetcher/HdfsSegmentFetcher.java | 4 +-
.../common/segment/fetcher/HttpSegmentFetcher.java | 6 +-
.../segment/fetcher/HttpsSegmentFetcher.java | 6 +-
.../segment/fetcher/PinotFSSegmentFetcher.java | 4 +-
.../common/utils/ClientSSLContextGenerator.java | 2 +-
.../apache/pinot/common/utils/CommonConstants.java | 2 +-
.../org/apache/pinot/common/utils/DataSchema.java | 2 +-
.../org/apache/pinot/common/utils/DataTable.java | 2 +-
.../common/utils/FileUploadDownloadClient.java | 2 +-
.../apache/pinot/common/utils/HLCSegmentName.java | 2 +-
.../org/apache/pinot/common/utils/JsonUtils.java | 2 +-
.../pinot/common/utils/KafkaStarterUtils.java | 4 +-
.../org/apache/pinot/common/utils/SchemaUtils.java | 4 +-
.../apache/pinot/common/utils/ServiceStatus.java | 2 +-
.../pinot/common/utils/TarGzCompressionUtils.java | 3 +-
.../org/apache/pinot/common/utils/ZkStarter.java | 1 -
.../pinot/common/utils/helix/HelixHelper.java | 10 ++--
.../common/utils/request/FilterQueryTree.java | 4 +-
.../common/utils/request/HavingQueryTree.java | 2 +-
.../pinot/common/utils/request/QueryTree.java | 2 +-
.../pinot/common/utils/request/RequestUtils.java | 16 ++---
.../pinot/common/utils/time/TimeConverter.java | 2 +-
.../common/utils/webhdfs/WebHdfsV1Client.java | 1 -
.../apache/pinot/pql/parsers/Pql2AstListener.java | 4 +-
.../org/apache/pinot/pql/parsers/Pql2Compiler.java | 23 ++++----
.../apache/pinot/pql/parsers/pql2/ast/AstNode.java | 2 +-
.../pinot/pql/parsers/pql2/ast/BaseAstNode.java | 2 +-
.../parsers/pql2/ast/BetweenPredicateAstNode.java | 2 +-
.../parsers/pql2/ast/BooleanOperatorAstNode.java | 2 +-
.../pql2/ast/ComparisonPredicateAstNode.java | 2 +-
.../pql/parsers/pql2/ast/FunctionCallAstNode.java | 2 +-
.../pql/parsers/pql2/ast/InPredicateAstNode.java | 10 ++--
.../pinot/pql/parsers/pql2/ast/OptionsAstNode.java | 2 +-
.../pql/parsers/pql2/ast/PredicateListAstNode.java | 4 +-
.../pql2/ast/RegexpLikePredicateAstNode.java | 1 -
.../parsers/pql2/ast/StarColumnListAstNode.java | 4 +-
.../org/apache/pinot/startree/hll/HllConfig.java | 4 +-
.../pinot/common/config/IndexingConfigTest.java | 4 +-
.../pinot/common/config/QuotaConfigTest.java | 2 +-
.../pinot/common/config/TableConfigTest.java | 6 +-
.../pinot/common/config/TagOverrideConfigTest.java | 2 +-
.../org/apache/pinot/common/config/TenantTest.java | 2 +-
.../common/config/TestConfigSerialization.java | 5 --
.../pinot/common/data/DateTimeFormatSpecTest.java | 2 +-
.../common/data/DateTimeGranularitySpecTest.java | 2 +-
.../apache/pinot/common/data/FieldSpecTest.java | 2 +-
.../org/apache/pinot/common/data/SchemaTest.java | 4 +-
.../common/lineage/SegmentMergeLineageTest.java | 2 +-
.../common/metadata/InstanceZKMetadataTest.java | 4 +-
.../metadata/MetadataEqualsHashCodeTest.java | 4 +-
.../pinot/common/metadata/MetadataUtils.java | 1 -
.../common/metadata/SegmentZKMetadataTest.java | 14 ++---
.../pinot/common/metrics/MetricsHelperTest.java | 2 +-
.../common/partition/IdealStateBuilderUtil.java | 4 +-
.../StreamPartitionAssignmentGeneratorTest.java | 8 +--
.../pinot/common/query/gen/AvroQueryGenerator.java | 2 -
.../apache/pinot/common/utils/DataSchemaTest.java | 2 +-
.../common/utils/FileUploadDownloadClientTest.java | 2 +-
.../pinot/common/utils/SegmentNameBuilderTest.java | 4 +-
.../org/apache/pinot/common/utils/UtilsTest.java | 2 +-
.../pinot/common/utils/time/TimeConverterTest.java | 2 +-
.../apache/pinot/pql/parsers/Pql2CompilerTest.java | 4 +-
.../request/BrokerRequestSerializationTest.java | 12 ++--
.../pinot/request/BrokerResponseNativeTest.java | 2 +-
.../apache/pinot/controller/ControllerConf.java | 8 +--
.../apache/pinot/controller/ControllerStarter.java | 32 +++++-----
.../api/ControllerAdminApiApplication.java | 10 ++--
.../pinot/controller/api/pojos/Instance.java | 2 +-
.../pinot/controller/api/resources/Constants.java | 6 +-
.../api/resources/ControllerResponseFilter.java | 4 +-
.../api/resources/FileUploadPathProvider.java | 8 +--
.../controller/api/resources/HeaderAdder.java | 4 +-
.../resources/LLCSegmentCompletionHandlers.java | 16 ++---
.../api/resources/LandingPageHandler.java | 4 +-
.../api/resources/PinotControllerHealthCheck.java | 8 +--
.../resources/PinotControllerResponseFilter.java | 6 +-
.../resources/PinotInstanceRestletResource.java | 8 +--
.../api/resources/PinotSchemaRestletResource.java | 16 ++---
.../api/resources/PinotSegmentRestletResource.java | 16 ++---
.../PinotSegmentUploadRestletResource.java | 44 +++++++-------
.../resources/PinotTableConfigRestletResource.java | 14 ++---
.../api/resources/PinotTableIndexingConfigs.java | 4 +-
.../api/resources/PinotTableInstances.java | 6 +-
.../api/resources/PinotTableMetadataConfigs.java | 4 +-
.../api/resources/PinotTableRestletResource.java | 34 +++++------
.../controller/api/resources/PinotTableSchema.java | 4 +-
.../api/resources/PinotTableSegmentConfigs.java | 8 +--
.../api/resources/PinotTableTenantConfigs.java | 7 +--
.../api/resources/PinotTaskRestletResource.java | 6 +-
.../api/resources/PinotTenantRestletResource.java | 16 ++---
.../api/resources/PinotVersionRestletResource.java | 4 +-
.../controller/api/resources/PqlQueryResource.java | 18 +++---
.../api/resources/ServerTableSizeReader.java | 8 +--
.../pinot/controller/api/resources/TableSize.java | 8 +--
.../pinot/controller/api/resources/TableViews.java | 6 +-
.../resources/WebApplicationExceptionMapper.java | 2 +-
.../controller/api/upload/SegmentValidator.java | 12 ++--
.../pinot/controller/api/upload/ZKOperator.java | 10 ++--
.../helix/ControllerRequestBuilderUtil.java | 14 ++---
.../helix/ControllerRequestURLBuilder.java | 1 -
.../controller/helix/SegmentStatusChecker.java | 16 ++---
...erResourceOnlineOfflineStateModelGenerator.java | 1 -
.../helix/core/PinotHelixResourceManager.java | 68 +++++++++++-----------
.../helix/core/PinotTableIdealStateBuilder.java | 16 ++---
.../helix/core/SegmentDeletionManager.java | 14 ++---
.../controller/helix/core/TableRebalancer.java | 16 ++---
.../helix/core/minion/ClusterInfoProvider.java | 10 ++--
.../core/minion/PinotHelixTaskResourceManager.java | 4 +-
.../helix/core/minion/PinotTaskManager.java | 12 ++--
.../generator/ConvertToRawIndexTaskGenerator.java | 12 ++--
.../core/minion/generator/PinotTaskGenerator.java | 4 +-
.../minion/generator/TaskGeneratorRegistry.java | 4 +-
.../core/minion/generator/TaskGeneratorUtils.java | 8 +--
.../core/periodictask/ControllerPeriodicTask.java | 4 +-
.../ControllerPeriodicTaskScheduler.java | 2 +-
.../realtime/PinotLLCRealtimeSegmentManager.java | 60 +++++++++----------
.../core/realtime/PinotRealtimeSegmentManager.java | 34 +++++------
.../core/realtime/SegmentCompletionManager.java | 16 ++---
.../helix/core/realtime/TableConfigCache.java | 4 +-
.../segment/DefaultFlushThresholdUpdater.java | 6 +-
.../segment/FlushThresholdUpdateManager.java | 4 +-
.../realtime/segment/FlushThresholdUpdater.java | 2 +-
.../SegmentSizeBasedFlushThresholdUpdater.java | 2 +-
.../rebalance/DefaultRebalanceSegmentStrategy.java | 24 ++++----
.../core/rebalance/RebalanceSegmentStrategy.java | 4 +-
.../rebalance/RebalanceSegmentStrategyFactory.java | 2 +-
.../ReplicaGroupRebalanceSegmentStrategy.java | 20 +++----
.../core/relocation/RealtimeSegmentRelocator.java | 18 +++---
.../helix/core/retention/RetentionManager.java | 14 ++---
.../retention/strategy/TimeRetentionStrategy.java | 2 +-
.../BalanceNumSegmentAssignmentStrategy.java | 12 ++--
.../core/sharding/BucketizedSegmentStrategy.java | 6 +-
.../core/sharding/RandomAssignmentStrategy.java | 6 +-
.../ReplicaGroupSegmentAssignmentStrategy.java | 16 ++---
.../core/sharding/SegmentAssignmentStrategy.java | 2 +-
.../helix/core/util/HelixSetupUtils.java | 4 +-
.../helix/core/util/ZKMetadataUtils.java | 4 +-
.../controller/util/AutoAddInvertedIndex.java | 18 +++---
.../controller/util/TableRetentionValidator.java | 12 ++--
.../pinot/controller/util/TableSizeReader.java | 16 ++---
.../BrokerResourceValidationManager.java | 6 +-
.../validation/OfflineSegmentIntervalChecker.java | 6 +-
.../RealtimeSegmentValidationManager.java | 6 +-
.../controller/validation/StorageQuotaChecker.java | 8 +--
.../api/resources/AccessControlTest.java | 4 +-
.../api/resources/FileUploadPathProviderTest.java | 2 +-
.../api/resources/PinotFileUploadTest.java | 10 ++--
.../PinotInstanceRestletResourceTest.java | 2 +-
.../resources/PinotSchemaRestletResourceTest.java | 6 +-
.../resources/PinotSegmentRestletResourceTest.java | 4 +-
.../resources/PinotTableRestletResourceTest.java | 8 +--
.../api/resources/SegmentCompletionUtilsTest.java | 2 +-
.../api/resources/ServerTableSizeReaderTest.java | 6 +-
.../api/resources/TableSizeReaderTest.java | 18 +++---
.../controller/api/resources/TableViewsTest.java | 8 +--
.../helix/ControllerInstanceToggleTest.java | 4 +-
.../controller/helix/ControllerSentinelTestV2.java | 2 +-
.../controller/helix/ControllerTenantTest.java | 2 +-
.../pinot/controller/helix/ControllerTest.java | 16 ++---
.../pinot/controller/helix/HelixHelperTest.java | 4 +-
.../controller/helix/PinotResourceManagerTest.java | 14 ++---
.../controller/helix/SegmentStatusCheckerTest.java | 14 ++---
.../helix/core/PinotHelixResourceManagerTest.java | 20 +++----
.../periodictask/ControllerPeriodicTaskTest.java | 2 +-
.../PinotLLCRealtimeSegmentManagerTest.java | 40 ++++++-------
.../helix/core/realtime/SegmentCompletionTest.java | 19 +++---
.../segment/FlushThresholdUpdaterTest.java | 10 ++--
.../rebalance/DefaultRebalanceStrategyTest.java | 22 +++----
.../ReplicaGroupRebalanceStrategyTest.java | 14 ++---
.../relocation/RealtimeSegmentRelocatorTest.java | 8 +--
.../helix/core/retention/RetentionManagerTest.java | 12 ++--
.../strategy/TimeRetentionStrategyTest.java | 2 +-
.../sharding/SegmentAssignmentStrategyTest.java | 16 ++---
.../core/util/SegmentDeletionManagerTest.java | 8 +--
.../helix/core/util/TableRebalancerTest.java | 6 +-
.../controller/utils/ReplicaGroupTestUtils.java | 10 ++--
.../controller/utils/SegmentMetadataMockUtils.java | 9 ++-
.../validation/StorageQuotaCheckerTest.java | 12 ++--
.../validation/ValidationManagerTest.java | 14 ++---
.../pinot/core/bloom/GuavaOnHeapBloomFilter.java | 3 +-
.../apache/pinot/core/common/DataBlockCache.java | 6 +-
.../org/apache/pinot/core/common/DataFetcher.java | 6 +-
.../apache/pinot/core/common/ObjectSerDeUtils.java | 8 +--
.../org/apache/pinot/core/common/Predicate.java | 4 +-
.../core/common/datatable/DataTableBuilder.java | 18 +++---
.../core/common/datatable/DataTableFactory.java | 2 +-
.../core/common/datatable/DataTableImplV2.java | 10 ++--
.../core/common/datatable/DataTableUtils.java | 2 +-
.../core/common/predicate/BaseInPredicate.java | 2 +-
.../pinot/core/common/predicate/EqPredicate.java | 2 -
.../pinot/core/common/predicate/NEqPredicate.java | 2 -
.../core/common/predicate/RangePredicate.java | 2 -
.../core/common/predicate/RegexpLikePredicate.java | 7 +--
.../org/apache/pinot/core/data/GenericRow.java | 4 +-
.../PercentileTDigestValueAggregator.java | 2 +-
.../data/function/FunctionExpressionEvaluator.java | 2 +-
.../pinot/core/data/function/FunctionInvoker.java | 4 +-
.../pinot/core/data/function/FunctionRegistry.java | 3 +-
.../core/data/manager/BaseTableDataManager.java | 16 ++---
.../core/data/manager/InstanceDataManager.java | 4 +-
.../pinot/core/data/manager/TableDataManager.java | 10 ++--
.../manager/config/InstanceDataManagerConfig.java | 2 +-
.../manager/config/TableDataManagerConfig.java | 6 +-
.../manager/offline/OfflineTableDataManager.java | 6 +-
.../manager/offline/TableDataManagerProvider.java | 8 +--
.../realtime/HLRealtimeSegmentDataManager.java | 16 ++---
.../realtime/LLRealtimeSegmentDataManager.java | 22 +++----
.../manager/realtime/RealtimeTableDataManager.java | 24 ++++----
.../realtime/SegmentBuildTimeLeaseExtender.java | 8 +--
.../data/partition/MurmurPartitionFunction.java | 2 +-
.../pinot/core/data/readers/AvroRecordReader.java | 10 ++--
.../pinot/core/data/readers/CSVRecordReader.java | 6 +-
.../core/data/readers/GenericRowRecordReader.java | 4 +-
.../pinot/core/data/readers/JSONRecordReader.java | 8 +--
.../readers/MultiplePinotSegmentRecordReader.java | 9 ++-
.../data/readers/PinotSegmentRecordReader.java | 14 ++---
.../pinot/core/data/readers/RecordReader.java | 4 +-
.../core/data/readers/RecordReaderFactory.java | 2 +-
.../pinot/core/data/readers/RecordReaderUtils.java | 7 +--
.../core/data/readers/ThriftRecordReader.java | 16 +++--
.../core/data/readers/sort/PinotSegmentSorter.java | 6 +-
.../recordtransformer/CompoundTransformer.java | 4 +-
.../recordtransformer/DataTypeTransformer.java | 4 +-
.../recordtransformer/ExpressionTransformer.java | 6 +-
.../data/recordtransformer/RecordTransformer.java | 2 +-
.../recordtransformer/SanitationTransformer.java | 4 +-
.../pinot/core/indexsegment/IndexSegment.java | 4 +-
.../pinot/core/indexsegment/IndexSegmentUtils.java | 4 +-
.../generator/SegmentGeneratorConfig.java | 30 +++++-----
.../indexsegment/immutable/ImmutableSegment.java | 1 -
.../immutable/ImmutableSegmentImpl.java | 12 ++--
.../immutable/ImmutableSegmentLoader.java | 10 ++--
.../indexsegment/mutable/MutableSegmentImpl.java | 14 ++---
.../impl/FixedByteSingleValueMultiColReader.java | 4 +-
.../reader/impl/v1/BaseChunkSingleValueReader.java | 4 +-
.../reader/impl/v1/FixedBitMultiValueReader.java | 2 +-
.../reader/impl/v1/FixedBitSingleValueReader.java | 2 +-
.../impl/v1/FixedByteChunkSingleValueReader.java | 4 +-
.../core/io/reader/impl/v1/SortedIndexReader.java | 2 +-
.../io/reader/impl/v1/SortedIndexReaderImpl.java | 2 +-
.../impl/v1/VarByteChunkSingleValueReader.java | 2 +-
.../BaseSingleValueMultiColumnReaderWriter.java | 4 +-
.../readerwriter/PinotDataBufferMemoryManager.java | 2 +-
.../RealtimeIndexOffHeapMemoryManager.java | 6 +-
...ixedByteSingleColumnMultiValueReaderWriter.java | 6 +-
...xedByteSingleColumnSingleValueReaderWriter.java | 8 +--
...ixedByteSingleValueMultiColumnReaderWriter.java | 6 +-
.../io/util/DictionaryDelegatingValueReader.java | 2 +-
.../core/io/util/FixedBitIntReaderWriter.java | 2 +-
.../core/io/util/FixedByteValueReaderWriter.java | 4 +-
.../apache/pinot/core/io/util/PinotDataBitSet.java | 2 +-
.../core/io/writer/impl/DirectMemoryManager.java | 2 +-
.../impl/FixedByteSingleValueMultiColWriter.java | 4 +-
.../core/io/writer/impl/MmapMemoryManager.java | 7 +--
.../writer/impl/MutableOffHeapByteArrayStore.java | 4 +-
.../core/io/writer/impl/OffHeapStringStore.java | 4 +-
.../writer/impl/v1/BaseChunkSingleValueWriter.java | 6 +-
.../writer/impl/v1/FixedBitMultiValueWriter.java | 8 +--
.../writer/impl/v1/FixedBitSingleValueWriter.java | 6 +-
.../impl/v1/FixedByteChunkSingleValueWriter.java | 2 +-
.../impl/v1/VarByteChunkSingleValueWriter.java | 4 +-
.../core/metadata/DefaultMetadataExtractor.java | 2 +-
.../pinot/core/metadata/MetadataExtractor.java | 2 +-
.../pinot/core/minion/BackfillDateTimeColumn.java | 6 +-
.../pinot/core/minion/RawIndexConverter.java | 16 ++---
.../apache/pinot/core/minion/SegmentConverter.java | 10 ++--
.../apache/pinot/core/minion/SegmentPurger.java | 10 ++--
.../minion/rollup/MergeRollupSegmentConverter.java | 13 ++---
.../core/minion/rollup/RollupRecordAggregator.java | 6 +-
.../core/minion/segment/MapperRecordReader.java | 6 +-
.../core/minion/segment/RecordAggregator.java | 2 +-
.../core/minion/segment/ReducerRecordReader.java | 6 +-
.../core/operator/CombineGroupByOperator.java | 24 ++++----
.../pinot/core/operator/CombineOperator.java | 16 ++---
.../pinot/core/operator/DocIdSetOperator.java | 2 +-
.../pinot/core/operator/ProjectionOperator.java | 6 +-
.../operator/blocks/IntermediateResultsBlock.java | 18 +++---
.../core/operator/blocks/ProjectionBlock.java | 2 +-
.../pinot/core/operator/blocks/TransformBlock.java | 4 +-
.../operator/dociditerators/AndDocIdIterator.java | 7 +--
.../dociditerators/BitmapDocIdIterator.java | 3 +-
.../dociditerators/MVScanDocIdIterator.java | 2 +-
.../RangelessBitmapDocIdIterator.java | 3 +-
.../dociditerators/ScanBasedDocIdIterator.java | 3 +-
.../dociditerators/SortedDocIdIterator.java | 7 +--
.../core/operator/docidsets/AndBlockDocIdSet.java | 4 +-
.../core/operator/docidsets/OrBlockDocIdSet.java | 4 +-
.../core/operator/docidsets/SortedDocIdSet.java | 4 +-
.../core/operator/filter/AndFilterOperator.java | 4 +-
.../operator/filter/BitmapBasedFilterOperator.java | 4 +-
.../core/operator/filter/FilterOperatorUtils.java | 8 +--
.../core/operator/filter/OrFilterOperator.java | 4 +-
.../SortedInvertedIndexBasedFilterOperator.java | 6 +-
.../predicate/InPredicateEvaluatorFactory.java | 10 ++--
.../predicate/NotInPredicateEvaluatorFactory.java | 10 ++--
.../predicate/RangePredicateEvaluatorFactory.java | 4 +-
.../RegexpLikePredicateEvaluatorFactory.java | 6 +-
.../operator/query/AggregationGroupByOperator.java | 2 +-
.../core/operator/query/AggregationOperator.java | 4 +-
.../query/DictionaryBasedAggregationOperator.java | 6 +-
.../operator/query/EmptySelectionOperator.java | 6 +-
.../query/MetadataBasedAggregationOperator.java | 6 +-
.../core/operator/query/SelectionOnlyOperator.java | 8 +--
.../operator/query/SelectionOrderByOperator.java | 4 +-
.../core/operator/transform/TransformOperator.java | 8 +--
.../function/AdditionTransformFunction.java | 8 +--
.../transform/function/BaseTransformFunction.java | 2 +-
.../DateTimeConversionTransformFunction.java | 6 +-
.../function/DivisionTransformFunction.java | 8 +--
.../function/IdentifierTransformFunction.java | 6 +-
.../function/LiteralTransformFunction.java | 6 +-
.../function/MultiplicationTransformFunction.java | 8 +--
.../function/SubtractionTransformFunction.java | 8 +--
.../function/TimeConversionTransformFunction.java | 8 +--
.../transform/function/TransformFunction.java | 6 +-
.../function/TransformFunctionFactory.java | 6 +-
.../function/ValueInTransformFunction.java | 12 ++--
.../datetime/BaseDateTimeTransformer.java | 7 +--
.../datetime/EpochToEpochTransformer.java | 2 +-
.../datetime/EpochToSDFTransformer.java | 2 +-
.../datetime/SDFToEpochTransformer.java | 2 +-
.../transformer/datetime/SDFToSDFTransformer.java | 2 +-
.../core/plan/AggregationGroupByPlanNode.java | 8 +--
.../pinot/core/plan/AggregationPlanNode.java | 8 +--
.../apache/pinot/core/plan/CombinePlanNode.java | 10 ++--
.../plan/DictionaryBasedAggregationPlanNode.java | 6 +-
.../apache/pinot/core/plan/DocIdSetPlanNode.java | 2 +-
.../org/apache/pinot/core/plan/FilterPlanNode.java | 8 +--
.../plan/MetadataBasedAggregationPlanNode.java | 6 +-
.../apache/pinot/core/plan/ProjectionPlanNode.java | 6 +-
.../apache/pinot/core/plan/TransformPlanNode.java | 6 +-
.../core/plan/maker/BrokerRequestPreProcessor.java | 4 +-
.../core/plan/maker/InstancePlanMakerImplV2.java | 6 +-
.../apache/pinot/core/plan/maker/PlanMaker.java | 4 +-
.../query/aggregation/AggregationExecutor.java | 2 +-
.../aggregation/DefaultAggregationExecutor.java | 6 +-
.../aggregation/function/AggregationFunction.java | 2 +-
.../function/AggregationFunctionFactory.java | 2 +-
.../function/AggregationFunctionType.java | 2 +-
.../function/AggregationFunctionUtils.java | 10 ++--
.../function/AvgAggregationFunction.java | 2 +-
.../function/AvgMVAggregationFunction.java | 2 +-
.../function/CountAggregationFunction.java | 2 +-
.../function/CountMVAggregationFunction.java | 2 +-
.../function/DistinctCountAggregationFunction.java | 4 +-
.../DistinctCountHLLAggregationFunction.java | 2 +-
.../DistinctCountHLLMVAggregationFunction.java | 2 +-
.../DistinctCountMVAggregationFunction.java | 4 +-
.../function/FastHLLAggregationFunction.java | 2 +-
.../function/MaxAggregationFunction.java | 2 +-
.../function/MaxMVAggregationFunction.java | 2 +-
.../function/MinAggregationFunction.java | 2 +-
.../function/MinMVAggregationFunction.java | 2 +-
.../function/MinMaxRangeAggregationFunction.java | 2 +-
.../function/MinMaxRangeMVAggregationFunction.java | 2 +-
.../function/PercentileAggregationFunction.java | 6 +-
.../function/PercentileEstAggregationFunction.java | 2 +-
.../PercentileEstMVAggregationFunction.java | 2 +-
.../function/PercentileMVAggregationFunction.java | 4 +-
.../PercentileTDigestAggregationFunction.java | 6 +-
.../PercentileTDigestMVAggregationFunction.java | 4 +-
.../function/SumAggregationFunction.java | 2 +-
.../function/SumMVAggregationFunction.java | 2 +-
.../groupby/AggregationGroupByResult.java | 2 +-
.../groupby/AggregationGroupByTrimmingService.java | 8 +--
.../groupby/DefaultGroupByExecutor.java | 4 +-
.../groupby/DictionaryBasedGroupKeyGenerator.java | 10 ++--
.../query/aggregation/groupby/GroupByExecutor.java | 2 +-
.../aggregation/groupby/GroupKeyGenerator.java | 2 +-
.../NoDictionaryMultiColumnGroupKeyGenerator.java | 8 +--
.../NoDictionarySingleColumnGroupKeyGenerator.java | 10 ++--
.../core/query/config/SegmentPrunerConfig.java | 1 -
.../pinot/core/query/executor/QueryExecutor.java | 8 +--
.../query/executor/ServerQueryExecutorV1Impl.java | 16 ++---
.../core/query/pruner/AbstractSegmentPruner.java | 7 +--
.../query/pruner/ColumnValueSegmentPruner.java | 13 ++---
.../core/query/pruner/DataSchemaSegmentPruner.java | 4 +-
.../core/query/pruner/PartitionSegmentPruner.java | 11 ++--
.../pinot/core/query/pruner/SegmentPruner.java | 2 +-
.../core/query/pruner/SegmentPrunerService.java | 4 +-
.../core/query/pruner/ValidSegmentPruner.java | 2 +-
.../core/query/reduce/BrokerReduceService.java | 24 ++++----
.../pinot/core/query/reduce/CombineService.java | 10 ++--
.../query/reduce/HavingClauseComparisonTree.java | 8 +--
.../core/query/request/ServerQueryRequest.java | 8 +--
.../core/query/request/context/TimerContext.java | 4 +-
.../query/scheduler/MultiLevelPriorityQueue.java | 4 +-
.../core/query/scheduler/PriorityScheduler.java | 9 ++-
.../pinot/core/query/scheduler/QueryScheduler.java | 16 ++---
.../query/scheduler/QuerySchedulerFactory.java | 10 ++--
.../query/scheduler/SchedulerQueryContext.java | 2 +-
.../query/scheduler/fcfs/BoundedFCFSScheduler.java | 6 +-
.../query/scheduler/fcfs/FCFSQueryScheduler.java | 6 +-
.../query/scheduler/fcfs/FCFSSchedulerGroup.java | 2 +-
.../resources/BoundedAccountingExecutor.java | 2 +-
.../resources/PolicyBasedResourceManager.java | 2 +-
.../query/scheduler/resources/ResourceManager.java | 4 +-
.../resources/UnboundedResourceManager.java | 2 +-
.../tokenbucket/TokenPriorityScheduler.java | 6 +-
.../scheduler/tokenbucket/TokenSchedulerGroup.java | 4 +-
.../core/query/selection/SelectionFetcher.java | 2 +-
.../query/selection/SelectionOperatorService.java | 22 +++----
.../query/selection/SelectionOperatorUtils.java | 18 +++---
.../comparator/CompositeDocIdValComparator.java | 1 -
.../DoubleArraySelectionColumnIterator.java | 1 -
.../iterator/DoubleSelectionColumnIterator.java | 1 -
.../FloatArraySelectionColumnIterator.java | 1 -
.../iterator/FloatSelectionColumnIterator.java | 1 -
.../iterator/IntArraySelectionColumnIterator.java | 1 -
.../iterator/IntSelectionColumnIterator.java | 1 -
.../iterator/LongArraySelectionColumnIterator.java | 1 -
.../iterator/LongSelectionColumnIterator.java | 1 -
.../SelectionMultiValueColumnIterator.java | 3 +-
...SelectionSingleValueColumnWithDictIterator.java | 5 +-
.../StringArraySelectionColumnIterator.java | 1 -
.../iterator/StringSelectionColumnIterator.java | 2 +-
.../apache/pinot/core/query/utils/TrieNode.java | 1 -
.../converter/RealtimeSegmentConverter.java | 12 ++--
.../converter/stats/RealtimeColumnStatistics.java | 6 +-
.../stats/RealtimeNoDictionaryColStatistics.java | 4 +-
.../stats/RealtimeSegmentStatsContainer.java | 4 +-
.../core/realtime/impl/RealtimeSegmentConfig.java | 2 +-
.../dictionary/BaseOffHeapMutableDictionary.java | 4 +-
.../dictionary/BytesOffHeapMutableDictionary.java | 6 +-
.../dictionary/BytesOnHeapMutableDictionary.java | 2 +-
.../dictionary/DoubleOffHeapMutableDictionary.java | 4 +-
.../dictionary/FloatOffHeapMutableDictionary.java | 4 +-
.../dictionary/IntOffHeapMutableDictionary.java | 4 +-
.../dictionary/LongOffHeapMutableDictionary.java | 4 +-
.../impl/dictionary/MutableDictionary.java | 2 +-
.../dictionary/StringOffHeapMutableDictionary.java | 6 +-
.../invertedindex/RealtimeInvertedIndexReader.java | 2 +-
.../impl/kafka/AvroRecordToPinotRowGenerator.java | 6 +-
.../impl/kafka/KafkaAvroMessageDecoder.java | 8 +--
.../realtime/impl/kafka/KafkaBrokerWrapper.java | 1 -
.../impl/kafka/KafkaConnectionHandler.java | 6 +-
.../impl/kafka/KafkaHighLevelStreamConfig.java | 8 +--
.../impl/kafka/KafkaJSONMessageDecoder.java | 5 +-
.../impl/kafka/KafkaLowLevelStreamConfig.java | 5 +-
.../impl/kafka/KafkaPartitionLevelConsumer.java | 6 +-
.../impl/kafka/KafkaStreamLevelConsumer.java | 6 +-
.../impl/kafka/KafkaStreamMetadataProvider.java | 6 +-
.../impl/kafka/SimpleConsumerMessageBatch.java | 2 +-
.../ConsumingSegmentAssignmentStrategy.java | 6 +-
.../segment/RealtimeSegmentAssignmentStrategy.java | 4 +-
.../stream/PartitionLevelStreamConfig.java | 2 +-
.../pinot/core/realtime/stream/StreamConfig.java | 8 +--
.../realtime/stream/StreamDecoderProvider.java | 2 +-
.../core/realtime/stream/StreamMessageDecoder.java | 1 -
.../segment/creator/ColumnIndexCreationInfo.java | 4 +-
.../core/segment/creator/ColumnStatistics.java | 2 +-
.../pinot/core/segment/creator/SegmentCreator.java | 6 +-
.../creator/SegmentIndexCreationDriver.java | 2 +-
.../core/segment/creator/StatsCollectorConfig.java | 4 +-
.../creator/impl/SegmentColumnarIndexCreator.java | 22 +++----
.../creator/impl/SegmentDictionaryCreator.java | 10 ++--
.../impl/SegmentIndexCreationDriverImpl.java | 22 +++----
.../creator/impl/bloom/BloomFilterCreator.java | 9 ++-
.../fwd/MultiValueUnsortedForwardIndexCreator.java | 4 +-
.../fwd/SingleValueFixedByteRawIndexCreator.java | 4 +-
.../fwd/SingleValueSortedForwardIndexCreator.java | 6 +-
.../SingleValueUnsortedForwardIndexCreator.java | 4 +-
.../fwd/SingleValueVarByteRawIndexCreator.java | 4 +-
.../inv/OffHeapBitmapInvertedIndexCreator.java | 8 +--
.../impl/inv/OnHeapBitmapInvertedIndexCreator.java | 4 +-
.../stats/AbstractColumnStatisticsCollector.java | 8 +--
.../stats/BytesColumnPredIndexStatsCollector.java | 4 +-
.../stats/DoubleColumnPreIndexStatsCollector.java | 2 +-
.../stats/FloatColumnPreIndexStatsCollector.java | 2 +-
.../stats/IntColumnPreIndexStatsCollector.java | 2 +-
.../stats/LongColumnPreIndexStatsCollector.java | 2 +-
.../stats/SegmentPreIndexStatsCollectorImpl.java | 4 +-
.../stats/StringColumnPreIndexStatsCollector.java | 6 +-
.../pinot/core/segment/index/ColumnMetadata.java | 12 ++--
.../core/segment/index/SegmentMetadataImpl.java | 26 ++++-----
.../index/column/PhysicalColumnIndexContainer.java | 3 +-
.../converter/SegmentV1V2ToV3FormatConverter.java | 18 +++---
.../segment/index/loader/IndexLoadingConfig.java | 12 ++--
.../core/segment/index/loader/LoaderUtils.java | 8 +--
.../segment/index/loader/SegmentPreProcessor.java | 8 +--
.../loader/bloomfilter/BloomFilterHandler.java | 7 +--
.../ColumnMinMaxValueGenerator.java | 2 +-
.../defaultcolumn/BaseDefaultColumnHandler.java | 18 +++---
.../defaultcolumn/DefaultColumnHandlerFactory.java | 2 +-
.../defaultcolumn/DefaultColumnStatistics.java | 4 +-
.../defaultcolumn/V1DefaultColumnHandler.java | 2 +-
.../defaultcolumn/V3DefaultColumnHandler.java | 2 +-
.../loader/invertedindex/InvertedIndexHandler.java | 12 ++--
.../index/readers/BitmapInvertedIndexReader.java | 2 +-
.../segment/index/readers/BloomFilterReader.java | 9 ++-
.../index/readers/ImmutableDictionaryReader.java | 4 +-
.../index/readers/OnHeapDoubleDictionary.java | 2 +-
.../index/readers/OnHeapFloatDictionary.java | 2 +-
.../segment/index/readers/OnHeapIntDictionary.java | 2 +-
.../index/readers/OnHeapLongDictionary.java | 2 +-
.../index/readers/OnHeapStringDictionary.java | 2 +-
.../name/NormalizedDateSegmentNameGenerator.java | 4 +-
.../core/segment/store/ColumnIndexDirectory.java | 6 +-
.../core/segment/store/FilePerIndexDirectory.java | 6 +-
.../pinot/core/segment/store/SegmentDirectory.java | 6 +-
.../core/segment/store/SegmentDirectoryPaths.java | 4 +-
.../segment/store/SegmentLocalFSDirectory.java | 10 ++--
.../segment/store/SingleFileIndexDirectory.java | 6 +-
.../virtualcolumn/DocIdVirtualColumnProvider.java | 3 +-
.../IntSingleValueDataFileReader.java | 4 +-
.../SingleStringVirtualColumnProvider.java | 2 +-
.../virtualcolumn/VirtualColumnIndexContainer.java | 1 -
.../pinot/core/startree/DimensionBuffer.java | 2 +-
.../apache/pinot/core/startree/MetricBuffer.java | 4 +-
.../pinot/core/startree/OffHeapStarTree.java | 6 +-
.../core/startree/OffHeapStarTreeBuilder.java | 20 +++----
.../pinot/core/startree/OffHeapStarTreeNode.java | 2 +-
.../org/apache/pinot/core/startree/StarTree.java | 2 +-
.../pinot/core/startree/StarTreeBuilder.java | 4 +-
.../pinot/core/startree/StarTreeBuilderConfig.java | 2 +-
.../pinot/core/startree/StarTreeBuilderUtils.java | 4 +-
.../pinot/core/startree/StarTreeDataTable.java | 4 +-
.../apache/pinot/core/startree/StarTreeUtils.java | 10 ++--
.../executor/StarTreeAggregationExecutor.java | 2 +-
.../startree/executor/StarTreeGroupByExecutor.java | 2 +-
.../apache/pinot/core/startree/hll/HllUtil.java | 4 +-
.../startree/operator/StarTreeFilterOperator.java | 28 ++++-----
.../startree/plan/StarTreeDocIdSetPlanNode.java | 6 +-
.../core/startree/plan/StarTreeFilterPlanNode.java | 6 +-
.../startree/plan/StarTreeProjectionPlanNode.java | 8 +--
.../startree/plan/StarTreeTransformPlanNode.java | 10 ++--
.../startree/v2/AggregationFunctionColumnPair.java | 2 +-
.../startree/v2/builder/BaseSingleTreeBuilder.java | 22 +++----
.../startree/v2/builder/MultipleTreesBuilder.java | 12 ++--
.../v2/builder/OffHeapSingleTreeBuilder.java | 4 +-
.../v2/builder/OnHeapSingleTreeBuilder.java | 2 +-
.../startree/v2/builder/StarTreeIndexCombiner.java | 2 +-
.../v2/builder/StarTreeV2BuilderConfig.java | 4 +-
.../startree/v2/store/StarTreeIndexContainer.java | 14 ++---
.../startree/v2/store/StarTreeLoaderUtils.java | 16 ++---
.../pinot/core/transport/AsyncQueryResponse.java | 2 +-
.../pinot/core/transport/DataTableHandler.java | 6 +-
.../apache/pinot/core/transport/QueryRouter.java | 12 ++--
.../pinot/core/transport/ServerChannels.java | 8 +--
.../pinot/core/transport/ServerResponse.java | 2 +-
.../java/org/apache/pinot/core/util/AvroUtils.java | 12 ++--
.../java/org/apache/pinot/core/util/CrcUtils.java | 2 +-
.../pinot/core/util/FixedIntArrayOffHeapIdMap.java | 6 +-
.../core/util/IntDoubleIndexedPriorityQueue.java | 3 +-
.../core/util/IntObjectIndexedPriorityQueue.java | 2 +-
.../pinot/core/util/SortedRangeIntersection.java | 1 -
.../apache/pinot/core/util/trace/TraceContext.java | 2 +-
.../server/realtime/ControllerLeaderLocator.java | 2 +-
.../ServerSegmentCompletionProtocolHandler.java | 8 +--
.../apache/pinot/core/common/DataFetcherTest.java | 16 ++---
.../pinot/core/common/ObjectSerDeUtilsTest.java | 10 ++--
.../core/common/RealtimeNoDictionaryTest.java | 6 +-
.../core/common/datatable/DataTableSerDeTest.java | 8 +--
.../core/common/docidsets/BitmapDocIdSetTest.java | 6 +-
.../core/common/docidsets/SortedDocIdSetTest.java | 5 +-
.../function/FunctionExpressionEvaluatorTest.java | 2 +-
.../data/manager/BaseTableDataManagerTest.java | 12 ++--
.../realtime/LLRealtimeSegmentDataManagerTest.java | 21 ++++---
.../readers/BackfillDateTimeRecordReaderTest.java | 16 ++---
.../core/data/readers/JSONRecordReaderTest.java | 2 +-
.../MultiplePinotSegmentRecordReaderTest.java | 10 ++--
.../data/readers/PinotSegmentRecordReaderTest.java | 10 ++--
.../pinot/core/data/readers/PinotSegmentUtil.java | 10 ++--
.../core/data/readers/ThriftRecordReaderTest.java | 6 +-
.../pinot/core/data/readers/ThriftSampleData.java | 33 +++++------
.../recordtransformer/RecordTransformerTest.java | 4 +-
.../recordtransformer/TimeTransformerTest.java | 2 +-
.../MutableSegmentImplAggregateMetricsTest.java | 6 +-
.../mutable/MutableSegmentImplTest.java | 8 +--
.../mutable/MutableSegmentImplTestUtils.java | 4 +-
.../pinot/core/io/util/PinotDataBitSetTest.java | 2 +-
.../impl/MmapMemoryManagerFileCleanupTest.java | 2 +-
.../core/io/writer/impl/MmapMemoryManagerTest.java | 4 +-
.../impl/MutableOffHeapByteArrayStoreTest.java | 2 +-
.../io/writer/impl/OffHeapStringStoreTest.java | 2 +-
.../minion/MergeRollupSegmentConverterTest.java | 14 ++---
.../pinot/core/minion/SegmentConverterTest.java | 12 ++--
.../pinot/core/minion/SegmentPurgerTest.java | 10 ++--
.../RealtimeSingleValueIteratorTest.java | 4 +-
.../operator/filter/AndFilterOperatorTest.java | 4 +-
.../core/operator/filter/OrFilterOperatorTest.java | 4 +-
.../function/BaseTransformFunctionTest.java | 20 +++----
.../DateTimeConversionTransformFunctionTest.java | 2 +-
.../TimeConversionTransformFunctionTest.java | 2 +-
.../function/ValueInTransformFunctionTest.java | 6 +-
.../pinot/core/plan/CombinePlanNodeTest.java | 6 +-
...adataAndDictionaryAggregationPlanMakerTest.java | 14 ++---
.../pinot/core/predicate/InPredicateTest.java | 2 +-
.../NoDictionaryEqualsPredicateEvaluatorsTest.java | 8 +--
.../NoDictionaryInPredicateEvaluatorTest.java | 12 ++--
.../NoDictionaryRangePredicateEvaluatorTest.java | 2 +-
.../scheduler/MultiLevelPriorityQueueTest.java | 10 ++--
.../query/scheduler/PrioritySchedulerTest.java | 22 +++----
.../pinot/core/query/scheduler/TestHelper.java | 2 +-
.../scheduler/fcfs/FCFSSchedulerGroupTest.java | 2 +-
.../resources/BoundedAccountingExecutorTest.java | 2 +-
.../scheduler/resources/ResourceManagerTest.java | 4 +-
.../resources/UnboundedResourceManagerTest.java | 2 +-
.../impl/RealtimeSegmentStatsHistoryTest.java | 2 +-
.../impl/dictionary/MultiValueDictionaryTest.java | 2 +-
.../impl/dictionary/MutableDictionaryTest.java | 8 +--
.../kafka/AvroRecordToPinotRowGeneratorTest.java | 4 +-
.../impl/kafka/KafkaLowLevelStreamConfigTest.java | 5 +-
.../kafka/KafkaPartitionLevelConsumerTest.java | 12 ++--
.../ConsumingSegmentAssignmentStrategyTest.java | 12 ++--
.../core/realtime/stream/StreamConfigTest.java | 4 +-
.../core/segment/index/ColumnMetadataTest.java | 10 ++--
.../segment/index/SegmentMetadataImplTest.java | 10 ++--
.../SegmentV1V2ToV3FormatConverterTest.java | 10 ++--
.../index/creator/BloomFilterCreatorTest.java | 20 ++-----
.../segment/index/creator/RawIndexCreatorTest.java | 16 ++---
.../SegmentGenerationWithBytesTypeTest.java | 26 ++++-----
.../SegmentGenerationWithTimeColumnTest.java | 16 ++---
.../index/creator/SegmentPartitionTest.java | 18 +++---
.../core/segment/index/loader/LoaderTest.java | 6 +-
.../core/segment/index/loader/LoaderUtilsTest.java | 2 +-
.../index/loader/SegmentPreProcessorTest.java | 16 ++---
.../readers/ImmutableDictionaryReaderTest.java | 12 ++--
.../name/DefaultSegmentNameGeneratorTest.java | 6 +-
.../store/ColumnIndexDirectoryTestHelper.java | 4 +-
.../segment/store/FilePerIndexDirectoryTest.java | 8 +--
.../segment/store/SegmentDirectoryPathsTest.java | 4 +-
.../segment/store/SegmentLocalFSDirectoryTest.java | 10 ++--
.../store/SingleFileIndexDirectoryTest.java | 11 ++--
.../pinot/core/startree/BaseStarTreeIndexTest.java | 8 +--
.../core/startree/OffHeapStarTreeBuilderTest.java | 12 ++--
.../pinot/core/startree/StarTreeDataTableTest.java | 2 +-
.../startree/StarTreeIndexTestSegmentHelper.java | 12 ++--
.../pinot/core/startree/SumStarTreeIndexTest.java | 10 ++--
.../pinot/core/startree/TestStarTreeMetadata.java | 14 ++---
.../pinot/core/startree/hll/HllFieldSizeTest.java | 3 +-
.../core/startree/hll/HllIndexCreationTest.java | 14 ++---
.../core/startree/hll/HllStarTreeIndexTest.java | 18 +++---
.../core/startree/hll/HllTypeConversionTest.java | 7 +--
.../OffHeapStarTreeBuilderWithHllFieldTest.java | 22 +++----
.../hll/SegmentWithHllIndexCreateHelper.java | 12 ++--
.../pinot/core/startree/v2/AvgStarTreeV2Test.java | 2 +-
.../pinot/core/startree/v2/BaseStarTreeV2Test.java | 24 ++++----
.../core/startree/v2/CountStarTreeV2Test.java | 2 +-
.../v2/DistinctCountHLLStarTreeV2Test.java | 2 +-
.../pinot/core/startree/v2/MaxStarTreeV2Test.java | 2 +-
.../startree/v2/MinMaxRangeStarTreeV2Test.java | 2 +-
.../pinot/core/startree/v2/MinStarTreeV2Test.java | 2 +-
.../startree/v2/PercentileEstStarTreeV2Test.java | 2 +-
.../v2/PercentileTDigestStarTreeV2Test.java | 4 +-
.../v2/PreAggregatedAvgStarTreeV2Test.java | 2 +-
...reAggregatedDistinctCountHLLStarTreeV2Test.java | 2 +-
.../v2/PreAggregatedMinMaxRangeStarTreeV2Test.java | 2 +-
.../PreAggregatedPercentileEstStarTreeV2Test.java | 2 +-
...eAggregatedPercentileTDigestStarTreeV2Test.java | 4 +-
.../pinot/core/startree/v2/SumStarTreeV2Test.java | 2 +-
.../pinot/core/transport/QueryRouterTest.java | 6 +-
.../org/apache/pinot/core/util/CrcUtilsTest.java | 6 +-
.../core/util/SortedRangeIntersectionTest.java | 6 +-
.../pinot/core/util/trace/TraceContextTest.java | 2 +-
.../pinot/index/persist/AvroDataPublisherTest.java | 8 +--
.../pinot/index/reader/FixedBitMultiValueTest.java | 8 +--
.../FixedByteWidthRowColDataFileReaderTest.java | 4 +-
.../index/reader/SortedForwardIndexReaderTest.java | 4 +-
.../FixedByteChunkSingleValueReaderWriteTest.java | 10 ++--
...ByteSingleColumnMultiValueReaderWriterTest.java | 6 +-
...yteSingleColumnSingleValueReaderWriterTest.java | 6 +-
...ByteSingleValueMultiColumnReaderWriterTest.java | 6 +-
.../VarByteChunkSingleValueReaderWriteTest.java | 10 ++--
.../FixedByteWidthRowColDataFileWriterTest.java | 8 +--
.../pinot/queries/BaseMultiValueQueriesTest.java | 12 ++--
.../org/apache/pinot/queries/BaseQueriesTest.java | 10 ++--
.../pinot/queries/BaseSingleValueQueriesTest.java | 12 ++--
.../apache/pinot/queries/FastHllQueriesTest.java | 14 ++---
...InnerSegmentSelectionMultiValueQueriesTest.java | 6 +-
...nnerSegmentSelectionSingleValueQueriesTest.java | 6 +-
.../queries/PercentileTDigestMVQueriesTest.java | 12 ++--
.../queries/PercentileTDigestQueriesTest.java | 26 ++++-----
.../org/apache/pinot/queries/QueriesTestUtils.java | 6 +-
.../DefaultAggregationExecutorTest.java | 18 +++---
.../DoubleAggregationResultHolderTest.java | 2 +-
.../AggregationGroupByTrimmingServiceTest.java | 8 +--
.../DictionaryBasedGroupKeyGeneratorTest.java | 24 ++++----
.../groupby/DoubleGroupByResultHolderTest.java | 2 +-
.../groupby/NoDictionaryGroupKeyGeneratorTest.java | 24 ++++----
.../pinot/query/executor/QueryExecutorTest.java | 20 +++----
.../query/pruner/ColumnValueSegmentPrunerTest.java | 8 +--
.../selection/SelectionOperatorServiceTest.java | 14 ++---
.../converter/RealtimeSegmentConverterTest.java | 2 +-
.../pinot/reduce/HavingClauseComparisonTests.java | 6 +-
.../v1/creator/BitmapInvertedIndexCreatorTest.java | 12 ++--
.../v1/creator/BitmapInvertedIndexTest.java | 20 +++----
.../pinot/segments/v1/creator/BlocksTest.java | 10 ++--
.../segments/v1/creator/DictionariesTest.java | 29 +++++----
.../v1/creator/FixedIntArrayIdMapTest.java | 6 +-
.../pinot/segments/v1/creator/IntArraysTest.java | 14 ++---
.../v1/creator/OnHeapDictionariesTest.java | 20 +++----
.../segments/v1/creator/SegmentTestUtils.java | 22 +++----
.../realtime/ControllerLeaderLocatorTest.java | 5 +-
.../util/IntDoubleIndexedPriorityQueueTest.java | 4 +-
.../util/IntObjectIndexedPriorityQueueTest.java | 6 +-
.../test/java/org/apache/pinot/util/TestUtils.java | 2 +-
.../src/test/resources/generate-test-data.py | 2 +-
.../org/apache/pinot/filesystem/HadoopPinotFS.java | 4 +-
.../pinot/hadoop/PinotHadoopJobLauncher.java | 1 -
.../pinot/hadoop/io/JsonPinotOutputFormat.java | 6 +-
.../apache/pinot/hadoop/io/PinotOutputFormat.java | 22 ++++---
.../org/apache/pinot/hadoop/io/PinotRecord.java | 5 +-
.../pinot/hadoop/io/PinotRecordSerialization.java | 6 +-
.../apache/pinot/hadoop/io/PinotRecordWriter.java | 16 +++--
.../apache/pinot/hadoop/job/ControllerRestApi.java | 8 +--
.../pinot/hadoop/job/SegmentCreationJob.java | 12 ++--
.../apache/pinot/hadoop/job/SegmentTarPushJob.java | 4 +-
.../apache/pinot/hadoop/job/SegmentUriPushJob.java | 4 +-
.../mapper/HadoopSegmentCreationMapReduceJob.java | 22 +++----
.../pinot/hadoop/io/PinotOutputFormatTest.java | 27 ++++-----
...umSegmentAssignmentStrategyIntegrationTest.java | 4 +-
.../tests/BaseClusterIntegrationTest.java | 14 ++---
.../tests/BaseClusterIntegrationTestSet.java | 16 ++---
.../tests/ChaosMonkeyIntegrationTest.java | 8 +--
.../tests/ClusterIntegrationTestUtils.java | 20 +++----
.../pinot/integration/tests/ClusterTest.java | 46 +++++++--------
...vertToRawIndexMinionClusterIntegrationTest.java | 18 +++---
.../DeleteAPIHybridClusterIntegrationTest.java | 4 +-
...lakyConsumerRealtimeClusterIntegrationTest.java | 2 +-
...mentBuildPushOfflineClusterIntegrationTest.java | 12 ++--
.../tests/HybridClusterIntegrationTest.java | 14 ++---
...ridClusterIntegrationTestCommandLineRunner.java | 12 ++--
.../tests/LLCRealtimeClusterIntegrationTest.java | 6 +-
...CRealtimeClusterSplitCommitIntegrationTest.java | 2 +-
...onaryAggregationPlanClusterIntegrationTest.java | 4 +-
.../tests/NewConfigApplyIntegrationTest.java | 10 ++--
.../tests/OfflineClusterIntegrationTest.java | 10 ++--
.../tests/PinotURIUploadIntegrationTest.java | 10 ++--
.../pinot/integration/tests/QueryGenerator.java | 2 +-
.../tests/RealtimeClusterIntegrationTest.java | 6 +-
.../tests/SegmentCompletionIntegrationTests.java | 26 ++++-----
.../tests/SimpleMinionClusterIntegrationTest.java | 20 +++----
.../tests/StarTreeClusterIntegrationTest.java | 10 ++--
.../tests/StarTreeV2ClusterIntegrationTest.java | 12 ++--
.../tests/UploadRefreshDeleteIntegrationTest.java | 4 +-
.../org/apache/pinot/minion/MinionContext.java | 4 +-
.../org/apache/pinot/minion/MinionStarter.java | 24 ++++----
.../minion/events/DefaultMinionEventObserver.java | 2 +-
.../pinot/minion/events/MinionEventObserver.java | 2 +-
.../BaseMultipleSegmentsConversionExecutor.java | 12 ++--
.../BaseSingleSegmentConversionExecutor.java | 14 ++---
.../executor/ConvertToRawIndexTaskExecutor.java | 8 +--
.../pinot/minion/executor/PinotTaskExecutor.java | 2 +-
.../pinot/minion/executor/PurgeTaskExecutor.java | 8 +--
.../minion/executor/SegmentConversionResult.java | 2 +-
.../minion/executor/SegmentConversionUtils.java | 15 ++---
.../executor/TaskExecutorFactoryRegistry.java | 2 +-
.../apache/pinot/minion/metrics/MinionMetrics.java | 2 +-
.../minion/taskfactory/TaskFactoryRegistry.java | 16 ++---
.../minion/executor/PurgeTaskExecutorTest.java | 10 ++--
.../org/apache/pinot/perf/BenchmarkDictionary.java | 8 +--
.../pinot/perf/BenchmarkDictionaryCreation.java | 7 +--
.../perf/BenchmarkFixedIntArrayOffHeapIdMap.java | 6 +-
.../pinot/perf/BenchmarkOfflineIndexReader.java | 12 ++--
.../pinot/perf/BenchmarkOrDocIdIterator.java | 2 +-
.../apache/pinot/perf/BenchmarkQueryEngine.java | 10 ++--
.../perf/BenchmarkRealtimeConsumptionSpeed.java | 10 ++--
.../pinot/perf/BenchmarkStringDictionary.java | 4 +-
.../org/apache/pinot/perf/DictionaryDumper.java | 7 +--
.../pinot/perf/ForwardIndexWriterBenchmark.java | 4 +-
.../org/apache/pinot/perf/RawIndexBenchmark.java | 20 +++----
.../org/apache/pinot/perf/RealtimeStressTest.java | 12 ++--
.../pinot/perf/StringDictionaryPerfTest.java | 19 +++---
.../api/resources/DefaultExceptionMapper.java | 2 +-
.../pinot/server/api/resources/ErrorInfo.java | 2 +-
.../pinot/server/api/resources/ErrorResponse.java | 2 +-
.../server/api/resources/HealthCheckResource.java | 9 +--
.../server/api/resources/MmapDebugResource.java | 2 +-
.../server/api/resources/SchedulerResource.java | 2 +-
.../server/api/resources/TableSizeResource.java | 18 +++---
.../pinot/server/api/resources/TablesResource.java | 16 ++---
.../server/request/ScheduledRequestHandler.java | 6 +-
.../apache/pinot/server/starter/ServerBuilder.java | 14 ++---
.../pinot/server/starter/ServerInstance.java | 10 ++--
.../server/starter/helix/AdminApiApplication.java | 2 +-
.../helix/DefaultHelixStarterServerConfig.java | 4 +-
.../starter/helix/HelixInstanceDataManager.java | 30 +++++-----
.../helix/HelixInstanceDataManagerConfig.java | 4 +-
.../server/starter/helix/HelixServerStarter.java | 34 +++++------
.../starter/helix/SegmentFetcherAndLoader.java | 16 ++---
.../helix/SegmentMessageHandlerFactory.java | 12 ++--
.../SegmentOnlineOfflineStateModelFactory.java | 22 +++----
.../server/api/resources/BaseResourceTest.java | 20 +++----
.../api/resources/TableSizeResourceTest.java | 2 +-
.../server/api/resources/TablesResourceTest.java | 4 +-
.../realtime/RealtimeTableDataManagerTest.java | 24 ++++----
.../request/ScheduledRequestHandlerTest.java | 26 ++++-----
.../apache/pinot/server/util/SegmentTestUtils.java | 10 ++--
.../apache/pinot/tools/AbstractBaseCommand.java | 1 -
.../apache/pinot/tools/ClusterStateVerifier.java | 2 +-
.../org/apache/pinot/tools/HybridQuickstart.java | 14 ++---
.../apache/pinot/tools/PinotIdealstateChanger.java | 4 +-
.../apache/pinot/tools/PinotNumReplicaChanger.java | 8 +--
.../apache/pinot/tools/PinotSegmentRebalancer.java | 14 ++---
.../org/apache/pinot/tools/PinotToolLauncher.java | 2 +-
.../org/apache/pinot/tools/PinotZKChanger.java | 2 +-
.../java/org/apache/pinot/tools/Quickstart.java | 4 +-
.../apache/pinot/tools/QuickstartTableRequest.java | 1 -
.../org/apache/pinot/tools/RealtimeQuickStart.java | 13 ++---
.../org/apache/pinot/tools/SegmentDumpTool.java | 12 ++--
.../apache/pinot/tools/StarTreeIndexViewer.java | 24 ++++----
.../org/apache/pinot/tools/UpdateSegmentState.java | 2 +-
.../pinot/tools/admin/PinotAdministrator.java | 26 ++++-----
.../admin/command/AbstractBaseAdminCommand.java | 2 +-
.../tools/admin/command/AddSchemaCommand.java | 4 +-
.../pinot/tools/admin/command/AddTableCommand.java | 4 +-
.../tools/admin/command/AddTenantCommand.java | 9 ++-
.../admin/command/ApplyTableConfigCommand.java | 10 ++--
.../admin/command/AvroSchemaToPinotSchema.java | 8 +--
.../command/BackfillDateTimeColumnCommand.java | 11 ++--
.../admin/command/ChangeNumReplicasCommand.java | 4 +-
.../tools/admin/command/ChangeTableState.java | 4 +-
.../tools/admin/command/CreateSegmentCommand.java | 16 ++---
.../tools/admin/command/DeleteClusterCommand.java | 2 +-
.../tools/admin/command/GenerateDataCommand.java | 14 ++---
.../tools/admin/command/MoveReplicaGroup.java | 14 ++---
.../tools/admin/command/PostQueryCommand.java | 2 +-
.../tools/admin/command/QuickstartRunner.java | 8 +--
.../command/RealtimeProvisioningHelperCommand.java | 8 +--
.../tools/admin/command/RebalanceTableCommand.java | 4 +-
.../admin/command/ShowClusterInfoCommand.java | 6 +-
.../tools/admin/command/StartBrokerCommand.java | 9 +--
.../admin/command/StartControllerCommand.java | 4 +-
.../tools/admin/command/StartKafkaCommand.java | 4 +-
.../tools/admin/command/StartServerCommand.java | 6 +-
.../tools/admin/command/StartZookeeperCommand.java | 10 +---
.../tools/admin/command/StopProcessCommand.java | 9 ++-
.../admin/command/StreamAvroIntoKafkaCommand.java | 8 +--
.../tools/admin/command/UploadSegmentCommand.java | 6 +-
.../tools/admin/command/ValidateConfigCommand.java | 14 ++---
.../tools/admin/command/VerifySegmentState.java | 6 +-
.../pinot/tools/backfill/BackfillSegmentUtils.java | 10 ++--
.../pinot/tools/data/generator/AvroWriter.java | 6 +-
.../pinot/tools/data/generator/DataGenerator.java | 16 ++---
.../tools/data/generator/DataGeneratorSpec.java | 2 -
.../tools/data/generator/NumberGenerator.java | 4 +-
.../tools/data/generator/RangeLongGenerator.java | 1 -
.../tools/data/generator/StringGenerator.java | 1 -
.../pinot/tools/perf/PerfBenchmarkDriver.java | 28 ++++-----
.../pinot/tools/perf/PerfBenchmarkDriverConf.java | 3 +-
.../pinot/tools/perf/PerfBenchmarkRunner.java | 6 +-
.../org/apache/pinot/tools/perf/QueryRunner.java | 4 +-
.../tools/query/comparison/ClusterStarter.java | 20 +++----
.../tools/query/comparison/QueryComparison.java | 8 +--
.../query/comparison/QueryComparisonConfig.java | 2 +-
.../query/comparison/SegmentInfoProvider.java | 14 ++---
.../query/comparison/StarQueryComparison.java | 2 +-
.../query/comparison/StarTreeQueryGenerator.java | 10 ++--
.../realtime/provisioning/MemoryEstimator.java | 14 ++---
.../apache/pinot/tools/scan/query/Aggregation.java | 10 ++--
.../apache/pinot/tools/scan/query/AvgFunction.java | 2 -
.../pinot/tools/scan/query/CountFunction.java | 2 -
.../tools/scan/query/DistinctCountFunction.java | 2 -
.../pinot/tools/scan/query/InPredicateFilter.java | 2 +-
.../apache/pinot/tools/scan/query/MaxFunction.java | 2 -
.../apache/pinot/tools/scan/query/MinFunction.java | 2 -
.../tools/scan/query/MinMaxRangeFunction.java | 2 -
.../tools/scan/query/NotInPredicateFilter.java | 2 +-
.../apache/pinot/tools/scan/query/Projection.java | 14 ++---
.../pinot/tools/scan/query/QueryResponse.java | 4 +-
.../tools/scan/query/RangePredicateFilter.java | 2 +-
.../apache/pinot/tools/scan/query/ResultTable.java | 2 +-
.../tools/scan/query/ScanBasedQueryProcessor.java | 10 ++--
.../tools/scan/query/SegmentQueryProcessor.java | 14 ++---
.../apache/pinot/tools/scan/query/Selection.java | 6 +-
.../apache/pinot/tools/scan/query/SumFunction.java | 2 -
.../converter/ColumnarToStarTreeConverter.java | 6 +-
.../converter/DictionaryToRawIndexConverter.java | 18 +++---
.../converter/PinotSegmentConvertCommand.java | 8 +--
.../converter/PinotSegmentToAvroConverter.java | 12 ++--
.../converter/PinotSegmentToCsvConverter.java | 4 +-
.../converter/PinotSegmentToJsonConverter.java | 6 +-
.../segment/converter/SegmentMergeCommand.java | 16 ++---
.../pinot/tools/streams/AirlineDataStream.java | 12 ++--
.../pinot/tools/streams/MeetupRsvpStream.java | 8 +--
.../common/AbstractCompositeListenableFuture.java | 3 +-
.../transport/common/AsyncResponseFuture.java | 2 +-
.../pinot/transport/common/CompositeFuture.java | 2 +-
.../pinot/transport/common/SelectingFuture.java | 3 +-
.../transport/common/ServerResponseFuture.java | 3 +-
.../pinot/transport/conf/TransportClientConf.java | 2 +-
.../transport/metrics/AggregatedPoolStats.java | 5 +-
.../metrics/AggregatedTransportClientMetrics.java | 8 +--
.../metrics/AggregatedTransportServerMetrics.java | 6 +-
.../pinot/transport/metrics/AsyncPoolStats.java | 4 +-
.../transport/metrics/NettyClientMetrics.java | 4 +-
.../transport/metrics/NettyServerMetrics.java | 4 +-
.../apache/pinot/transport/metrics/PoolStats.java | 4 +-
.../transport/metrics/TransportClientMetrics.java | 2 +-
.../transport/metrics/TransportServerMetrics.java | 2 +-
.../transport/netty/NettyClientConnection.java | 8 +--
.../apache/pinot/transport/netty/NettyServer.java | 10 ++--
.../transport/netty/NettyTCPClientConnection.java | 8 +--
.../pinot/transport/netty/NettyTCPServer.java | 3 +-
.../netty/PooledNettyClientResourceManager.java | 8 +--
.../org/apache/pinot/transport/pool/AsyncPool.java | 5 +-
.../apache/pinot/transport/pool/AsyncPoolImpl.java | 10 ++--
.../pool/AsyncPoolResourceManagerAdapter.java | 12 ++--
.../org/apache/pinot/transport/pool/KeyedPool.java | 4 +-
.../apache/pinot/transport/pool/KeyedPoolImpl.java | 10 ++--
.../transport/scattergather/ScatterGather.java | 4 +-
.../transport/scattergather/ScatterGatherImpl.java | 22 +++----
.../scattergather/ScatterGatherRequest.java | 2 +-
.../scattergather/ScatterGatherStats.java | 2 +-
.../transport/common/CompositeFutureTest.java | 4 +-
.../pinot/transport/common/ResponseFutureTest.java | 9 +--
.../transport/common/SelectingFutureTest.java | 2 +-
.../pinot/transport/common/ServerInstanceTest.java | 4 +-
.../transport/netty/NettyCloseChannelTest.java | 6 +-
.../NettySingleConnectionIntegrationTest.java | 26 ++++-----
.../transport/perf/ScatterGatherPerfClient.java | 30 +++++-----
.../transport/perf/ScatterGatherPerfServer.java | 10 ++--
.../transport/perf/ScatterGatherPerfTester.java | 12 ++--
.../pool/AsyncPoolResourceManagerAdapterTest.java | 5 +-
.../pinot/transport/pool/KeyedPoolImplTest.java | 14 ++---
.../transport/scattergather/ScatterGatherTest.java | 24 ++++----
1063 files changed, 4048 insertions(+), 4430 deletions(-)
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/DynamicBrokerSelector.java b/pinot-api/src/main/java/org/apache/pinot/client/DynamicBrokerSelector.java
index e733a42..770540f 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/DynamicBrokerSelector.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/DynamicBrokerSelector.java
@@ -31,8 +31,7 @@ import org.I0Itec.zkclient.IZkDataListener;
import org.I0Itec.zkclient.ZkClient;
import org.I0Itec.zkclient.serialize.BytesPushThroughSerializer;
-import static org.apache.pinot.client.ExternalViewReader.OFFLINE_SUFFIX;
-import static org.apache.pinot.client.ExternalViewReader.REALTIME_SUFFIX;
+import static org.apache.pinot.client.ExternalViewReader.*;
/**
diff --git a/pinot-azure-filesystem/src/main/java/org/apache/pinot/filesystem/AzurePinotFS.java b/pinot-azure-filesystem/src/main/java/org/apache/pinot/filesystem/AzurePinotFS.java
index 5780571..fd25bd0 100644
--- a/pinot-azure-filesystem/src/main/java/org/apache/pinot/filesystem/AzurePinotFS.java
+++ b/pinot-azure-filesystem/src/main/java/org/apache/pinot/filesystem/AzurePinotFS.java
@@ -19,7 +19,6 @@
package org.apache.pinot.filesystem;
import com.google.common.annotations.VisibleForTesting;
-import org.apache.pinot.common.utils.CommonConstants;
import com.microsoft.azure.datalake.store.ADLStoreClient;
import com.microsoft.azure.datalake.store.DirectoryEntry;
import com.microsoft.azure.datalake.store.DirectoryEntryType;
@@ -41,6 +40,7 @@ import java.util.List;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
+import org.apache.pinot.common.utils.CommonConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-azure-filesystem/src/test/java/org/apache/pinot/filesystem/test/AzurePinotFSTest.java b/pinot-azure-filesystem/src/test/java/org/apache/pinot/filesystem/test/AzurePinotFSTest.java
index 00c8989..aa742f2 100644
--- a/pinot-azure-filesystem/src/test/java/org/apache/pinot/filesystem/test/AzurePinotFSTest.java
+++ b/pinot-azure-filesystem/src/test/java/org/apache/pinot/filesystem/test/AzurePinotFSTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.pinot.filesystem.test;
-import org.apache.pinot.filesystem.AzurePinotFS;
import com.microsoft.azure.datalake.store.ADLStoreClient;
import com.microsoft.azure.datalake.store.MockADLFileInputStream;
import java.io.ByteArrayInputStream;
@@ -28,6 +27,7 @@ import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Paths;
import org.apache.commons.io.FileUtils;
+import org.apache.pinot.filesystem.AzurePinotFS;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
import org.testng.Assert;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/api/RequestStatistics.java b/pinot-broker/src/main/java/org/apache/pinot/broker/api/RequestStatistics.java
index 97e0f99..2709692 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/api/RequestStatistics.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/api/RequestStatistics.java
@@ -18,8 +18,8 @@
*/
package org.apache.pinot.broker.api;
-import org.apache.pinot.common.response.BrokerResponse;
import java.util.concurrent.TimeUnit;
+import org.apache.pinot.common.response.BrokerResponse;
/**
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/PinotBrokerDebug.java b/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/PinotBrokerDebug.java
index 154b6a1..d2e8c3d 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/PinotBrokerDebug.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/PinotBrokerDebug.java
@@ -18,12 +18,6 @@
*/
package org.apache.pinot.broker.api.resources;
-import org.apache.pinot.broker.routing.RoutingTable;
-import org.apache.pinot.broker.routing.TimeBoundaryService;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.metrics.BrokerMeter;
-import org.apache.pinot.common.metrics.BrokerMetrics;
-import org.apache.pinot.common.utils.CommonConstants;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -37,6 +31,12 @@ import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.pinot.broker.routing.RoutingTable;
+import org.apache.pinot.broker.routing.TimeBoundaryService;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.metrics.BrokerMeter;
+import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.common.utils.CommonConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/PinotBrokerHealthCheck.java b/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/PinotBrokerHealthCheck.java
index a6fa66d..dcdafab 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/PinotBrokerHealthCheck.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/PinotBrokerHealthCheck.java
@@ -18,9 +18,6 @@
*/
package org.apache.pinot.broker.api.resources;
-import org.apache.pinot.broker.broker.BrokerServerBuilder;
-import org.apache.pinot.common.metrics.BrokerMeter;
-import org.apache.pinot.common.metrics.BrokerMetrics;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -32,6 +29,9 @@ import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.pinot.broker.broker.BrokerServerBuilder;
+import org.apache.pinot.common.metrics.BrokerMeter;
+import org.apache.pinot.common.metrics.BrokerMetrics;
@Api(tags = "Health")
@Path("/")
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/PinotClientRequest.java b/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/PinotClientRequest.java
index 0a47b3e..735c86b 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/PinotClientRequest.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/PinotClientRequest.java
@@ -20,12 +20,6 @@ package org.apache.pinot.broker.api.resources;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.pinot.broker.api.RequestStatistics;
-import org.apache.pinot.broker.requesthandler.BrokerRequestHandler;
-import org.apache.pinot.common.metrics.BrokerMeter;
-import org.apache.pinot.common.metrics.BrokerMetrics;
-import org.apache.pinot.common.response.BrokerResponse;
-import org.apache.pinot.common.utils.JsonUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -40,6 +34,12 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.pinot.broker.api.RequestStatistics;
+import org.apache.pinot.broker.requesthandler.BrokerRequestHandler;
+import org.apache.pinot.common.metrics.BrokerMeter;
+import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.common.response.BrokerResponse;
+import org.apache.pinot.common.utils.JsonUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/AccessControlFactory.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/AccessControlFactory.java
index a12b45a..ef00605 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/AccessControlFactory.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/AccessControlFactory.java
@@ -18,8 +18,8 @@
*/
package org.apache.pinot.broker.broker;
-import org.apache.pinot.broker.api.AccessControl;
import org.apache.commons.configuration.Configuration;
+import org.apache.pinot.broker.api.AccessControl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/AllowAllAccessControlFactory.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/AllowAllAccessControlFactory.java
index 097a5f6..4a01bad 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/AllowAllAccessControlFactory.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/AllowAllAccessControlFactory.java
@@ -18,10 +18,10 @@
*/
package org.apache.pinot.broker.broker;
+import org.apache.commons.configuration.Configuration;
import org.apache.pinot.broker.api.AccessControl;
import org.apache.pinot.broker.api.RequesterIdentity;
import org.apache.pinot.common.request.BrokerRequest;
-import org.apache.commons.configuration.Configuration;
public class AllowAllAccessControlFactory extends AccessControlFactory {
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerAdminApiApplication.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerAdminApiApplication.java
index 075a9b0..9f0503f 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerAdminApiApplication.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerAdminApiApplication.java
@@ -19,14 +19,14 @@
package org.apache.pinot.broker.broker;
import com.google.common.base.Preconditions;
-import org.apache.pinot.broker.requesthandler.BrokerRequestHandler;
-import org.apache.pinot.broker.routing.RoutingTable;
-import org.apache.pinot.broker.routing.TimeBoundaryService;
-import org.apache.pinot.common.metrics.BrokerMetrics;
import io.swagger.jaxrs.config.BeanConfig;
import java.net.URI;
import java.net.URL;
import java.net.URLClassLoader;
+import org.apache.pinot.broker.requesthandler.BrokerRequestHandler;
+import org.apache.pinot.broker.routing.RoutingTable;
+import org.apache.pinot.broker.routing.TimeBoundaryService;
+import org.apache.pinot.common.metrics.BrokerMetrics;
import org.glassfish.grizzly.http.server.CLStaticHttpHandler;
import org.glassfish.grizzly.http.server.HttpHandler;
import org.glassfish.grizzly.http.server.HttpServer;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerServerBuilder.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerServerBuilder.java
index e42cb8d..2224743 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerServerBuilder.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerServerBuilder.java
@@ -19,6 +19,9 @@
package org.apache.pinot.broker.broker;
import com.google.common.base.Preconditions;
+import com.yammer.metrics.core.MetricsRegistry;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.commons.configuration.Configuration;
import org.apache.pinot.broker.broker.helix.LiveInstancesChangeListenerImpl;
import org.apache.pinot.broker.queryquota.TableQueryQuotaManager;
import org.apache.pinot.broker.requesthandler.BrokerRequestHandler;
@@ -30,9 +33,6 @@ import org.apache.pinot.common.Utils;
import org.apache.pinot.common.metrics.BrokerMetrics;
import org.apache.pinot.common.metrics.MetricsHelper;
import org.apache.pinot.common.utils.CommonConstants;
-import com.yammer.metrics.core.MetricsRegistry;
-import java.util.concurrent.atomic.AtomicReference;
-import org.apache.commons.configuration.Configuration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BrokerResourceOnlineOfflineStateModelFactory.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BrokerResourceOnlineOfflineStateModelFactory.java
index baa8bdf..fa363ee 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BrokerResourceOnlineOfflineStateModelFactory.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BrokerResourceOnlineOfflineStateModelFactory.java
@@ -18,13 +18,6 @@
*/
package org.apache.pinot.broker.broker.helix;
-import org.apache.pinot.broker.queryquota.TableQueryQuotaManager;
-import org.apache.pinot.broker.routing.HelixExternalViewBasedRouting;
-import org.apache.pinot.common.Utils;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.metadata.ZKMetadataProvider;
-import org.apache.pinot.common.utils.helix.HelixHelper;
-
import java.util.List;
import org.apache.helix.HelixAdmin;
import org.apache.helix.HelixDataAccessor;
@@ -39,6 +32,12 @@ import org.apache.helix.participant.statemachine.StateModelFactory;
import org.apache.helix.participant.statemachine.StateModelInfo;
import org.apache.helix.participant.statemachine.Transition;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.broker.queryquota.TableQueryQuotaManager;
+import org.apache.pinot.broker.routing.HelixExternalViewBasedRouting;
+import org.apache.pinot.common.Utils;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.utils.helix.HelixHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/ClusterChangeMediator.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/ClusterChangeMediator.java
index 4aef39b..ae87a7f 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/ClusterChangeMediator.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/ClusterChangeMediator.java
@@ -18,24 +18,23 @@
*/
package org.apache.pinot.broker.broker.helix;
-import org.apache.pinot.broker.queryquota.TableQueryQuotaManager;
-import org.apache.pinot.broker.routing.HelixExternalViewBasedRouting;
-import org.apache.pinot.common.metrics.BrokerMetrics;
-import org.apache.pinot.common.metrics.BrokerTimer;
-
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
+import org.apache.helix.NotificationContext;
import org.apache.helix.api.listeners.ExternalViewChangeListener;
import org.apache.helix.api.listeners.InstanceConfigChangeListener;
import org.apache.helix.api.listeners.LiveInstanceChangeListener;
-import org.apache.helix.NotificationContext;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.InstanceConfig;
import org.apache.helix.model.LiveInstance;
+import org.apache.pinot.broker.queryquota.TableQueryQuotaManager;
+import org.apache.pinot.broker.routing.HelixExternalViewBasedRouting;
+import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.common.metrics.BrokerTimer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/HelixBrokerStarter.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/HelixBrokerStarter.java
index 5387c79..3d75a0b 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/HelixBrokerStarter.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/HelixBrokerStarter.java
@@ -19,17 +19,6 @@
package org.apache.pinot.broker.broker.helix;
import com.google.common.collect.ImmutableList;
-import org.apache.pinot.broker.broker.AccessControlFactory;
-import org.apache.pinot.broker.broker.BrokerServerBuilder;
-import org.apache.pinot.broker.queryquota.TableQueryQuotaManager;
-import org.apache.pinot.broker.routing.HelixExternalViewBasedRouting;
-import org.apache.pinot.common.config.TagNameUtils;
-import org.apache.pinot.common.metadata.ZKMetadataProvider;
-import org.apache.pinot.common.metrics.BrokerMeter;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.NetUtil;
-import org.apache.pinot.common.utils.ServiceStatus;
-import org.apache.pinot.common.utils.StringUtil;
import com.yammer.metrics.core.MetricsRegistry;
import java.util.ArrayList;
import java.util.List;
@@ -48,6 +37,17 @@ import org.apache.helix.model.Message;
import org.apache.helix.participant.StateMachineEngine;
import org.apache.helix.participant.statemachine.StateModelFactory;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.broker.broker.AccessControlFactory;
+import org.apache.pinot.broker.broker.BrokerServerBuilder;
+import org.apache.pinot.broker.queryquota.TableQueryQuotaManager;
+import org.apache.pinot.broker.routing.HelixExternalViewBasedRouting;
+import org.apache.pinot.common.config.TagNameUtils;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.metrics.BrokerMeter;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.NetUtil;
+import org.apache.pinot.common.utils.ServiceStatus;
+import org.apache.pinot.common.utils.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/LiveInstancesChangeListenerImpl.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/LiveInstancesChangeListenerImpl.java
index 45d1cc5..62498b6 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/LiveInstancesChangeListenerImpl.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/LiveInstancesChangeListenerImpl.java
@@ -18,16 +18,16 @@
*/
package org.apache.pinot.broker.broker.helix;
-import org.apache.pinot.common.response.ServerInstance;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.transport.netty.PooledNettyClientResourceManager;
-import org.apache.pinot.transport.pool.KeyedPool;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.helix.api.listeners.LiveInstanceChangeListener;
import org.apache.helix.NotificationContext;
+import org.apache.helix.api.listeners.LiveInstanceChangeListener;
import org.apache.helix.model.LiveInstance;
+import org.apache.pinot.common.response.ServerInstance;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.transport.netty.PooledNettyClientResourceManager;
+import org.apache.pinot.transport.pool.KeyedPool;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/TimeboundaryRefreshMessageHandlerFactory.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/TimeboundaryRefreshMessageHandlerFactory.java
index 17318a5..9e3e1cc 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/TimeboundaryRefreshMessageHandlerFactory.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/TimeboundaryRefreshMessageHandlerFactory.java
@@ -18,20 +18,18 @@
*/
package org.apache.pinot.broker.broker.helix;
-import org.apache.pinot.broker.routing.HelixExternalViewBasedRouting;
-import org.apache.pinot.common.messages.TimeboundaryRefreshMessage;
-import com.sun.org.apache.xpath.internal.operations.Bool;
+import java.util.Iterator;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.helix.NotificationContext;
import org.apache.helix.messaging.handling.HelixTaskResult;
import org.apache.helix.messaging.handling.MessageHandler;
import org.apache.helix.messaging.handling.MessageHandlerFactory;
import org.apache.helix.model.Message;
+import org.apache.pinot.broker.routing.HelixExternalViewBasedRouting;
+import org.apache.pinot.common.messages.TimeboundaryRefreshMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Iterator;
-import java.util.concurrent.ConcurrentHashMap;
-
// Handle the TimeboundaryRefresh message. The Timeboundary refresh requests are handled asynchronously: i.e., they are
// first put into a request map first. The map dedups requests by their tables thus multiple requests for the same
// table only needs to be executed once. A background thread periodically checks the map and performs refreshing for
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/pruner/PartitionZKMetadataPruner.java b/pinot-broker/src/main/java/org/apache/pinot/broker/pruner/PartitionZKMetadataPruner.java
index debb8df..6b1d5af 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/pruner/PartitionZKMetadataPruner.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/pruner/PartitionZKMetadataPruner.java
@@ -18,6 +18,10 @@
*/
package org.apache.pinot.broker.pruner;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nonnull;
+import org.apache.commons.lang.math.IntRange;
import org.apache.pinot.common.metadata.segment.ColumnPartitionMetadata;
import org.apache.pinot.common.metadata.segment.SegmentPartitionMetadata;
import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
@@ -25,10 +29,6 @@ import org.apache.pinot.common.request.FilterOperator;
import org.apache.pinot.common.utils.request.FilterQueryTree;
import org.apache.pinot.core.data.partition.PartitionFunction;
import org.apache.pinot.core.data.partition.PartitionFunctionFactory;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Nonnull;
-import org.apache.commons.lang.math.IntRange;
/**
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/pruner/SegmentZKMetadataPrunerService.java b/pinot-broker/src/main/java/org/apache/pinot/broker/pruner/SegmentZKMetadataPrunerService.java
index 37d4164..1c237be 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/pruner/SegmentZKMetadataPrunerService.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/pruner/SegmentZKMetadataPrunerService.java
@@ -18,10 +18,10 @@
*/
package org.apache.pinot.broker.pruner;
-import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nonnull;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/queryquota/TableQueryQuotaManager.java b/pinot-broker/src/main/java/org/apache/pinot/broker/queryquota/TableQueryQuotaManager.java
index 377c00a..84c52b6 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/queryquota/TableQueryQuotaManager.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/queryquota/TableQueryQuotaManager.java
@@ -21,6 +21,13 @@ package org.apache.pinot.broker.queryquota;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Strings;
import com.google.common.util.concurrent.RateLimiter;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.helix.HelixManager;
+import org.apache.helix.ZNRecord;
+import org.apache.helix.model.ExternalView;
+import org.apache.helix.store.zk.ZkHelixPropertyStore;
import org.apache.pinot.common.config.QuotaConfig;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.config.TableNameBuilder;
@@ -29,13 +36,6 @@ import org.apache.pinot.common.metrics.BrokerGauge;
import org.apache.pinot.common.metrics.BrokerMetrics;
import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.common.utils.helix.HelixHelper;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.helix.HelixManager;
-import org.apache.helix.ZNRecord;
-import org.apache.helix.model.ExternalView;
-import org.apache.helix.store.zk.ZkHelixPropertyStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
index 1b0cc43..91b7267 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
@@ -20,6 +20,17 @@ package org.apache.pinot.broker.requesthandler;
import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.base.Splitter;
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.ThreadSafe;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.lang3.StringUtils;
import org.apache.pinot.broker.api.RequestStatistics;
import org.apache.pinot.broker.api.RequesterIdentity;
import org.apache.pinot.broker.broker.AccessControlFactory;
@@ -41,17 +52,6 @@ import org.apache.pinot.common.response.broker.BrokerResponseNative;
import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.core.query.reduce.BrokerReduceService;
import org.apache.pinot.pql.parsers.Pql2Compiler;
-import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestHandler.java b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestHandler.java
index 304bae3..1d6ccb1 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestHandler.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestHandler.java
@@ -19,11 +19,11 @@
package org.apache.pinot.broker.requesthandler;
import com.fasterxml.jackson.databind.JsonNode;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.ThreadSafe;
import org.apache.pinot.broker.api.RequestStatistics;
import org.apache.pinot.broker.api.RequesterIdentity;
import org.apache.pinot.common.response.BrokerResponse;
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
@ThreadSafe
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestOptimizer.java b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestOptimizer.java
index bec3cc6..36a1a36 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestOptimizer.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestOptimizer.java
@@ -18,12 +18,12 @@
*/
package org.apache.pinot.broker.requesthandler;
+import java.util.Arrays;
+import java.util.List;
import org.apache.pinot.common.request.BrokerRequest;
import org.apache.pinot.common.request.FilterQuery;
import org.apache.pinot.common.utils.request.FilterQueryTree;
import org.apache.pinot.common.utils.request.RequestUtils;
-import java.util.Arrays;
-import java.util.List;
public class BrokerRequestOptimizer {
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/ConnectionPoolBrokerRequestHandler.java b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/ConnectionPoolBrokerRequestHandler.java
index 3a19ed4..e379386 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/ConnectionPoolBrokerRequestHandler.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/ConnectionPoolBrokerRequestHandler.java
@@ -18,6 +18,22 @@
*/
package org.apache.pinot.broker.requesthandler;
+import com.yammer.metrics.core.MetricsRegistry;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.util.HashedWheelTimer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.ThreadSafe;
+import org.apache.commons.configuration.Configuration;
import org.apache.pinot.broker.api.RequestStatistics;
import org.apache.pinot.broker.broker.AccessControlFactory;
import org.apache.pinot.broker.broker.helix.LiveInstancesChangeListenerImpl;
@@ -50,22 +66,6 @@ import org.apache.pinot.transport.scattergather.ScatterGather;
import org.apache.pinot.transport.scattergather.ScatterGatherImpl;
import org.apache.pinot.transport.scattergather.ScatterGatherRequest;
import org.apache.pinot.transport.scattergather.ScatterGatherStats;
-import com.yammer.metrics.core.MetricsRegistry;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.util.HashedWheelTimer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
-import org.apache.commons.configuration.Configuration;
import org.apache.thrift.protocol.TCompactProtocol;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/FlattenNestedPredicatesFilterQueryTreeOptimizer.java b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/FlattenNestedPredicatesFilterQueryTreeOptimizer.java
index d11c041..00eb3cd 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/FlattenNestedPredicatesFilterQueryTreeOptimizer.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/FlattenNestedPredicatesFilterQueryTreeOptimizer.java
@@ -18,11 +18,11 @@
*/
package org.apache.pinot.broker.requesthandler;
-import org.apache.pinot.common.request.FilterOperator;
-import org.apache.pinot.common.utils.request.FilterQueryTree;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.apache.pinot.common.request.FilterOperator;
+import org.apache.pinot.common.utils.request.FilterQueryTree;
/**
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/MultipleOrEqualitiesToInClauseFilterQueryTreeOptimizer.java b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/MultipleOrEqualitiesToInClauseFilterQueryTreeOptimizer.java
index d692db5..286d83f 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/MultipleOrEqualitiesToInClauseFilterQueryTreeOptimizer.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/MultipleOrEqualitiesToInClauseFilterQueryTreeOptimizer.java
@@ -19,18 +19,15 @@
package org.apache.pinot.broker.requesthandler;
import com.google.common.base.Splitter;
-import org.apache.pinot.common.request.FilterOperator;
-import org.apache.pinot.common.utils.StringUtil;
-import org.apache.pinot.common.utils.request.FilterQueryTree;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
+import org.apache.pinot.common.request.FilterOperator;
+import org.apache.pinot.common.utils.request.FilterQueryTree;
/**
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/OptimizationFlags.java b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/OptimizationFlags.java
index 3b2f0e5..f10f0de 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/OptimizationFlags.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/OptimizationFlags.java
@@ -20,11 +20,11 @@ package org.apache.pinot.broker.requesthandler;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
-import org.apache.pinot.common.request.BrokerRequest;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.annotation.Nullable;
+import org.apache.pinot.common.request.BrokerRequest;
/**
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/RangeMergeOptimizer.java b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/RangeMergeOptimizer.java
index 5be0fac..0361983 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/RangeMergeOptimizer.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/RangeMergeOptimizer.java
@@ -18,14 +18,14 @@
*/
package org.apache.pinot.broker.requesthandler;
-import org.apache.pinot.common.request.FilterOperator;
-import org.apache.pinot.common.utils.request.FilterQueryTree;
-import org.apache.pinot.core.common.predicate.RangePredicate;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.apache.pinot.common.request.FilterOperator;
+import org.apache.pinot.common.utils.request.FilterQueryTree;
+import org.apache.pinot.core.common.predicate.RangePredicate;
/**
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/SingleConnectionBrokerRequestHandler.java b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/SingleConnectionBrokerRequestHandler.java
index fa5f07f..198d4e5 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/SingleConnectionBrokerRequestHandler.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/SingleConnectionBrokerRequestHandler.java
@@ -18,6 +18,12 @@
*/
package org.apache.pinot.broker.requesthandler;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.ThreadSafe;
+import org.apache.commons.configuration.Configuration;
import org.apache.pinot.broker.api.RequestStatistics;
import org.apache.pinot.broker.broker.AccessControlFactory;
import org.apache.pinot.broker.queryquota.TableQueryQuotaManager;
@@ -37,12 +43,6 @@ import org.apache.pinot.core.transport.AsyncQueryResponse;
import org.apache.pinot.core.transport.QueryRouter;
import org.apache.pinot.core.transport.Server;
import org.apache.pinot.core.transport.ServerResponse;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
-import org.apache.commons.configuration.Configuration;
/**
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/CfgBasedRouting.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/CfgBasedRouting.java
index b25b40d..1856b70 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/CfgBasedRouting.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/CfgBasedRouting.java
@@ -18,10 +18,10 @@
*/
package org.apache.pinot.broker.routing;
-import org.apache.pinot.transport.config.PerTableRoutingConfig;
-import org.apache.pinot.transport.config.RoutingTableConfig;
import java.util.List;
import java.util.Map;
+import org.apache.pinot.transport.config.PerTableRoutingConfig;
+import org.apache.pinot.transport.config.RoutingTableConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/HelixExternalViewBasedRouting.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/HelixExternalViewBasedRouting.java
index 92603ab..66ef930 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/HelixExternalViewBasedRouting.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/HelixExternalViewBasedRouting.java
@@ -21,19 +21,6 @@ package org.apache.pinot.broker.routing;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.collect.Sets;
-import org.apache.pinot.broker.routing.builder.RoutingTableBuilder;
-import org.apache.pinot.broker.routing.selector.SegmentSelector;
-import org.apache.pinot.broker.routing.selector.SegmentSelectorProvider;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.metrics.BrokerMeter;
-import org.apache.pinot.common.metrics.BrokerMetrics;
-import org.apache.pinot.common.metrics.BrokerTimer;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.EqualityUtils;
-import org.apache.pinot.common.utils.JsonUtils;
-import org.apache.pinot.common.utils.NetUtil;
-import org.apache.pinot.common.utils.helix.HelixHelper;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -52,6 +39,19 @@ import org.apache.helix.ZNRecord;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.InstanceConfig;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.broker.routing.builder.RoutingTableBuilder;
+import org.apache.pinot.broker.routing.selector.SegmentSelector;
+import org.apache.pinot.broker.routing.selector.SegmentSelectorProvider;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.metrics.BrokerMeter;
+import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.common.metrics.BrokerTimer;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.JsonUtils;
+import org.apache.pinot.common.utils.NetUtil;
+import org.apache.pinot.common.utils.helix.HelixHelper;
import org.apache.zookeeper.data.Stat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/HelixExternalViewBasedTimeBoundaryService.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/HelixExternalViewBasedTimeBoundaryService.java
index 89b3b1f..759ce91 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/HelixExternalViewBasedTimeBoundaryService.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/HelixExternalViewBasedTimeBoundaryService.java
@@ -18,12 +18,6 @@
*/
package org.apache.pinot.broker.routing;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.metadata.ZKMetadataProvider;
-import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
-import org.apache.pinot.common.utils.CommonConstants.Helix.TableType;
-import org.apache.pinot.common.utils.time.TimeUtils;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -33,6 +27,12 @@ import javax.annotation.concurrent.ThreadSafe;
import org.apache.helix.ZNRecord;
import org.apache.helix.model.ExternalView;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
+import org.apache.pinot.common.utils.CommonConstants.Helix.TableType;
+import org.apache.pinot.common.utils.time.TimeUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/RoutingTableBuilderFactory.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/RoutingTableBuilderFactory.java
index 0ba4c86..8f5ffa0 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/RoutingTableBuilderFactory.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/RoutingTableBuilderFactory.java
@@ -18,6 +18,9 @@
*/
package org.apache.pinot.broker.routing;
+import org.apache.commons.configuration.Configuration;
+import org.apache.helix.ZNRecord;
+import org.apache.helix.store.zk.ZkHelixPropertyStore;
import org.apache.pinot.broker.routing.builder.BalancedRandomRoutingTableBuilder;
import org.apache.pinot.broker.routing.builder.DefaultOfflineRoutingTableBuilder;
import org.apache.pinot.broker.routing.builder.DefaultRealtimeRoutingTableBuilder;
@@ -32,9 +35,6 @@ import org.apache.pinot.common.metrics.BrokerMetrics;
import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.common.utils.CommonConstants.Helix.TableType;
import org.apache.pinot.core.realtime.stream.StreamConfig;
-import org.apache.commons.configuration.Configuration;
-import org.apache.helix.ZNRecord;
-import org.apache.helix.store.zk.ZkHelixPropertyStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/RoutingTableLookupRequest.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/RoutingTableLookupRequest.java
index 31f0617..48d737d 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/RoutingTableLookupRequest.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/RoutingTableLookupRequest.java
@@ -20,12 +20,12 @@ package org.apache.pinot.broker.routing;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Splitter;
-import org.apache.pinot.common.request.BrokerRequest;
-import org.apache.pinot.common.request.QuerySource;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import javax.annotation.Nonnull;
+import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.QuerySource;
/**
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/BalancedRandomRoutingTableBuilder.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/BalancedRandomRoutingTableBuilder.java
index a2c29d6..3fb1e2d 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/BalancedRandomRoutingTableBuilder.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/BalancedRandomRoutingTableBuilder.java
@@ -18,8 +18,6 @@
*/
package org.apache.pinot.broker.routing.builder;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.metrics.BrokerMetrics;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -28,6 +26,8 @@ import java.util.Set;
import org.apache.commons.configuration.Configuration;
import org.apache.helix.ZNRecord;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.metrics.BrokerMetrics;
/**
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/BasePartitionAwareRoutingTableBuilder.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/BasePartitionAwareRoutingTableBuilder.java
index 8fb9e7c..b6ebf50 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/BasePartitionAwareRoutingTableBuilder.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/BasePartitionAwareRoutingTableBuilder.java
@@ -18,25 +18,24 @@
*/
package org.apache.pinot.broker.routing.builder;
-import org.apache.pinot.broker.pruner.SegmentPrunerContext;
-import org.apache.pinot.broker.pruner.SegmentZKMetadataPrunerService;
-import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
-import org.apache.pinot.broker.routing.selector.SegmentSelector;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
-import org.apache.pinot.common.metrics.BrokerMeter;
-import org.apache.pinot.common.metrics.BrokerMetrics;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.Random;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.commons.configuration.Configuration;
import org.apache.helix.ZNRecord;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.broker.pruner.SegmentPrunerContext;
+import org.apache.pinot.broker.pruner.SegmentZKMetadataPrunerService;
+import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
+import org.apache.pinot.broker.routing.selector.SegmentSelector;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.common.metrics.BrokerMeter;
+import org.apache.pinot.common.metrics.BrokerMetrics;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/BaseRoutingTableBuilder.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/BaseRoutingTableBuilder.java
index 7122845..7c63d43 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/BaseRoutingTableBuilder.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/BaseRoutingTableBuilder.java
@@ -18,25 +18,25 @@
*/
package org.apache.pinot.broker.routing.builder;
-import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
-import org.apache.pinot.broker.routing.selector.SegmentSelector;
-import org.apache.pinot.common.config.RoutingConfig;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.metrics.BrokerMeter;
-import org.apache.pinot.common.metrics.BrokerMetrics;
-import org.apache.pinot.common.utils.CommonConstants;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
-import java.util.Set;
import java.util.Map;
import java.util.Random;
+import java.util.Set;
import org.apache.commons.configuration.Configuration;
import org.apache.helix.ZNRecord;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.InstanceConfig;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
+import org.apache.pinot.broker.routing.selector.SegmentSelector;
+import org.apache.pinot.common.config.RoutingConfig;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.metrics.BrokerMeter;
+import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.common.utils.CommonConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/DefaultOfflineRoutingTableBuilder.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/DefaultOfflineRoutingTableBuilder.java
index e991bd6..8bdb9df 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/DefaultOfflineRoutingTableBuilder.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/DefaultOfflineRoutingTableBuilder.java
@@ -18,10 +18,6 @@
*/
package org.apache.pinot.broker.routing.builder;
-import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
-import org.apache.pinot.broker.routing.selector.SegmentSelector;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.metrics.BrokerMetrics;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -31,6 +27,10 @@ import org.apache.helix.ZNRecord;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.InstanceConfig;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
+import org.apache.pinot.broker.routing.selector.SegmentSelector;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.metrics.BrokerMetrics;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/DefaultRealtimeRoutingTableBuilder.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/DefaultRealtimeRoutingTableBuilder.java
index e383cc6..e46b3b6 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/DefaultRealtimeRoutingTableBuilder.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/DefaultRealtimeRoutingTableBuilder.java
@@ -18,11 +18,6 @@
*/
package org.apache.pinot.broker.routing.builder;
-import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
-import org.apache.pinot.broker.routing.selector.SegmentSelector;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.metrics.BrokerMetrics;
-import org.apache.pinot.common.utils.SegmentName;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -32,6 +27,11 @@ import org.apache.helix.ZNRecord;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.InstanceConfig;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
+import org.apache.pinot.broker.routing.selector.SegmentSelector;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.common.utils.SegmentName;
/**
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/HighLevelConsumerBasedRoutingTableBuilder.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/HighLevelConsumerBasedRoutingTableBuilder.java
index 933ed31..e1368e6 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/HighLevelConsumerBasedRoutingTableBuilder.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/HighLevelConsumerBasedRoutingTableBuilder.java
@@ -18,9 +18,6 @@
*/
package org.apache.pinot.broker.routing.builder;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.HLCSegmentName;
-import org.apache.pinot.common.utils.SegmentName;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -28,6 +25,9 @@ import java.util.Map;
import java.util.Set;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.InstanceConfig;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.HLCSegmentName;
+import org.apache.pinot.common.utils.SegmentName;
public class HighLevelConsumerBasedRoutingTableBuilder extends BaseRoutingTableBuilder {
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/LargeClusterRoutingTableBuilder.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/LargeClusterRoutingTableBuilder.java
index c039460..ab9bde8 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/LargeClusterRoutingTableBuilder.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/LargeClusterRoutingTableBuilder.java
@@ -18,11 +18,11 @@
*/
package org.apache.pinot.broker.routing.builder;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.metrics.BrokerMetrics;
import org.apache.commons.configuration.Configuration;
import org.apache.helix.ZNRecord;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.metrics.BrokerMetrics;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/LowLevelConsumerRoutingTableBuilder.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/LowLevelConsumerRoutingTableBuilder.java
index 6df3b34..e3cf792 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/LowLevelConsumerRoutingTableBuilder.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/LowLevelConsumerRoutingTableBuilder.java
@@ -18,11 +18,6 @@
*/
package org.apache.pinot.broker.routing.builder;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.metrics.BrokerMetrics;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.LLCUtils;
-import org.apache.pinot.common.utils.SegmentName;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -33,6 +28,11 @@ import org.apache.helix.ZNRecord;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.InstanceConfig;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.LLCUtils;
+import org.apache.pinot.common.utils.SegmentName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/LowLevelRoutingTableBuilderUtil.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/LowLevelRoutingTableBuilderUtil.java
index 61622c7..96e831d 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/LowLevelRoutingTableBuilderUtil.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/LowLevelRoutingTableBuilderUtil.java
@@ -18,12 +18,12 @@
*/
package org.apache.pinot.broker.routing.builder;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.SegmentName;
import java.util.HashMap;
import java.util.Map;
import java.util.SortedSet;
import org.apache.helix.model.ExternalView;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.SegmentName;
/**
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/PartitionAwareOfflineRoutingTableBuilder.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/PartitionAwareOfflineRoutingTableBuilder.java
index cc2a0a9..113a94d 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/PartitionAwareOfflineRoutingTableBuilder.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/PartitionAwareOfflineRoutingTableBuilder.java
@@ -18,15 +18,6 @@
*/
package org.apache.pinot.broker.routing.builder;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.metadata.ZKMetadataProvider;
-import org.apache.pinot.common.metadata.segment.ColumnPartitionMetadata;
-import org.apache.pinot.common.metadata.segment.SegmentPartitionMetadata;
-import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
-import org.apache.pinot.common.metrics.BrokerMetrics;
-import org.apache.pinot.common.partition.ReplicaGroupPartitionAssignment;
-import org.apache.pinot.common.partition.ReplicaGroupPartitionAssignmentGenerator;
-import org.apache.pinot.common.utils.CommonConstants;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -37,6 +28,15 @@ import org.apache.helix.ZNRecord;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.InstanceConfig;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.metadata.segment.ColumnPartitionMetadata;
+import org.apache.pinot.common.metadata.segment.SegmentPartitionMetadata;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.common.partition.ReplicaGroupPartitionAssignment;
+import org.apache.pinot.common.partition.ReplicaGroupPartitionAssignmentGenerator;
+import org.apache.pinot.common.utils.CommonConstants;
/**
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/PartitionAwareRealtimeRoutingTableBuilder.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/PartitionAwareRealtimeRoutingTableBuilder.java
index dd44512..6bd0ebb 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/PartitionAwareRealtimeRoutingTableBuilder.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/PartitionAwareRealtimeRoutingTableBuilder.java
@@ -18,14 +18,6 @@
*/
package org.apache.pinot.broker.routing.builder;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.metadata.ZKMetadataProvider;
-import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
-import org.apache.pinot.common.metrics.BrokerMetrics;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.LLCSegmentName;
-import org.apache.pinot.common.utils.LLCUtils;
-import org.apache.pinot.common.utils.SegmentName;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -38,6 +30,14 @@ import org.apache.helix.ZNRecord;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.InstanceConfig;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.LLCSegmentName;
+import org.apache.pinot.common.utils.LLCUtils;
+import org.apache.pinot.common.utils.SegmentName;
/**
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/RoutingTableBuilder.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/RoutingTableBuilder.java
index 1402b93..7745d83 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/RoutingTableBuilder.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/RoutingTableBuilder.java
@@ -18,10 +18,6 @@
*/
package org.apache.pinot.broker.routing.builder;
-import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
-import org.apache.pinot.broker.routing.selector.SegmentSelector;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.metrics.BrokerMetrics;
import java.util.List;
import java.util.Map;
import org.apache.commons.configuration.Configuration;
@@ -29,6 +25,10 @@ import org.apache.helix.ZNRecord;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.InstanceConfig;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
+import org.apache.pinot.broker.routing.selector.SegmentSelector;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.metrics.BrokerMetrics;
/**
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/RoutingTableInstancePruner.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/RoutingTableInstancePruner.java
index 6d88359..0f907e0 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/RoutingTableInstancePruner.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/RoutingTableInstancePruner.java
@@ -18,11 +18,11 @@
*/
package org.apache.pinot.broker.routing.builder;
-import org.apache.pinot.common.utils.CommonConstants;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.helix.model.InstanceConfig;
+import org.apache.pinot.common.utils.CommonConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/selector/MergedSegmentSelector.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/selector/MergedSegmentSelector.java
index 90f46cc..e670288 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/selector/MergedSegmentSelector.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/selector/MergedSegmentSelector.java
@@ -18,15 +18,15 @@
*/
package org.apache.pinot.broker.routing.selector;
+import java.util.HashSet;
+import java.util.Set;
+import org.apache.helix.ZNRecord;
+import org.apache.helix.store.zk.ZkHelixPropertyStore;
import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.lineage.SegmentGroup;
import org.apache.pinot.common.lineage.SegmentMergeLineage;
import org.apache.pinot.common.lineage.SegmentMergeLineageAccessHelper;
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.helix.ZNRecord;
-import org.apache.helix.store.zk.ZkHelixPropertyStore;
/**
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/selector/SegmentSelector.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/selector/SegmentSelector.java
index 9e1f271..3fb62da 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/selector/SegmentSelector.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/selector/SegmentSelector.java
@@ -18,11 +18,11 @@
*/
package org.apache.pinot.broker.routing.selector;
-import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
-import org.apache.pinot.common.config.TableConfig;
import java.util.Set;
import org.apache.helix.ZNRecord;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
+import org.apache.pinot.common.config.TableConfig;
/**
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/selector/SegmentSelectorProvider.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/selector/SegmentSelectorProvider.java
index f24fc03..1398d34 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/selector/SegmentSelectorProvider.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/selector/SegmentSelectorProvider.java
@@ -18,9 +18,9 @@
*/
package org.apache.pinot.broker.routing.selector;
-import org.apache.pinot.common.config.TableConfig;
import org.apache.helix.ZNRecord;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.TableConfig;
/**
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/broker/BrokerTestUtils.java b/pinot-broker/src/test/java/org/apache/pinot/broker/broker/BrokerTestUtils.java
index fe4e5c5..ef65e08 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/broker/BrokerTestUtils.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/broker/BrokerTestUtils.java
@@ -19,7 +19,6 @@
package org.apache.pinot.broker.broker;
import org.apache.commons.configuration.Configuration;
-
import org.apache.pinot.broker.broker.helix.DefaultHelixBrokerConfig;
import org.apache.pinot.broker.broker.helix.HelixBrokerStarter;
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/broker/HelixBrokerStarterTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/broker/HelixBrokerStarterTest.java
index 162d12f..a2ce793 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/broker/HelixBrokerStarterTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/broker/HelixBrokerStarterTest.java
@@ -19,6 +19,22 @@
package org.apache.pinot.broker.broker;
import com.google.common.util.concurrent.Uninterruptibles;
+import com.yammer.metrics.core.MetricsRegistry;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+import org.I0Itec.zkclient.ZkClient;
+import org.apache.commons.configuration.Configuration;
+import org.apache.helix.HelixAdmin;
+import org.apache.helix.model.ExternalView;
+import org.apache.helix.model.IdealState;
+import org.apache.helix.model.InstanceConfig;
import org.apache.pinot.broker.broker.helix.DefaultHelixBrokerConfig;
import org.apache.pinot.broker.broker.helix.HelixBrokerStarter;
import org.apache.pinot.broker.routing.HelixExternalViewBasedRouting;
@@ -36,20 +52,6 @@ import org.apache.pinot.controller.helix.ControllerRequestBuilderUtil;
import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.apache.pinot.controller.helix.core.realtime.PinotLLCRealtimeSegmentManager;
import org.apache.pinot.controller.utils.SegmentMetadataMockUtils;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.*;
-import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
-
-import com.yammer.metrics.core.MetricsRegistry;
-import org.I0Itec.zkclient.ZkClient;
-import org.apache.commons.configuration.Configuration;
-import org.apache.helix.HelixAdmin;
-import org.apache.helix.model.ExternalView;
-import org.apache.helix.model.IdealState;
-import org.apache.helix.model.InstanceConfig;
import org.testng.Assert;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeTest;
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/broker/HelixBrokerStarterUtilsTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/broker/HelixBrokerStarterUtilsTest.java
index 1fffc1f..f974cf7 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/broker/HelixBrokerStarterUtilsTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/broker/HelixBrokerStarterUtilsTest.java
@@ -18,11 +18,10 @@
*/
package org.apache.pinot.broker.broker;
+import org.apache.pinot.broker.broker.helix.HelixBrokerStarter;
import org.testng.Assert;
import org.testng.annotations.Test;
-import org.apache.pinot.broker.broker.helix.HelixBrokerStarter;
-
public class HelixBrokerStarterUtilsTest {
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/pruner/SegmentZKMetadataPrunerTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/pruner/SegmentZKMetadataPrunerTest.java
index b87b77f..98a8dc6 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/pruner/SegmentZKMetadataPrunerTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/pruner/SegmentZKMetadataPrunerTest.java
@@ -18,17 +18,17 @@
*/
package org.apache.pinot.broker.pruner;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import junit.framework.Assert;
+import org.apache.commons.lang.math.IntRange;
import org.apache.pinot.common.metadata.segment.ColumnPartitionMetadata;
import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
import org.apache.pinot.common.metadata.segment.SegmentPartitionMetadata;
import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
import org.apache.pinot.common.request.BrokerRequest;
import org.apache.pinot.pql.parsers.Pql2Compiler;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import junit.framework.Assert;
-import org.apache.commons.lang.math.IntRange;
import org.testng.annotations.Test;
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/queryquota/HitCounterTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/queryquota/HitCounterTest.java
index 619d812..635838b 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/queryquota/HitCounterTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/queryquota/HitCounterTest.java
@@ -21,10 +21,7 @@ package org.apache.pinot.broker.queryquota;
import com.google.common.util.concurrent.Uninterruptibles;
import java.util.ArrayList;
import java.util.List;
-
import java.util.Random;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/queryquota/TableQueryQuotaManagerTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/queryquota/TableQueryQuotaManagerTest.java
index ee6737a..8bc4398 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/queryquota/TableQueryQuotaManagerTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/queryquota/TableQueryQuotaManagerTest.java
@@ -18,12 +18,6 @@
*/
package org.apache.pinot.broker.queryquota;
-import org.apache.pinot.common.config.QuotaConfig;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.metadata.ZKMetadataProvider;
-import org.apache.pinot.common.utils.StringUtil;
-import org.apache.pinot.common.utils.ZkStarter;
import org.apache.commons.lang.StringUtils;
import org.apache.helix.HelixManager;
import org.apache.helix.InstanceType;
@@ -34,6 +28,12 @@ import org.apache.helix.manager.zk.ZkBaseDataAccessor;
import org.apache.helix.manager.zk.ZkClient;
import org.apache.helix.model.ExternalView;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.QuotaConfig;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.utils.StringUtil;
+import org.apache.pinot.common.utils.ZkStarter;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.AfterTest;
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/OptimizationFlagsTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/OptimizationFlagsTest.java
index 52745c3..19f7a74 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/OptimizationFlagsTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/OptimizationFlagsTest.java
@@ -18,8 +18,8 @@
*/
package org.apache.pinot.broker.requesthandler;
-import org.apache.pinot.common.request.BrokerRequest;
import java.util.Collections;
+import org.apache.pinot.common.request.BrokerRequest;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/RangeMergeOptimizerTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/RangeMergeOptimizerTest.java
index a3ce665..ddc6717 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/RangeMergeOptimizerTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/RangeMergeOptimizerTest.java
@@ -18,14 +18,14 @@
*/
package org.apache.pinot.broker.requesthandler;
-import org.apache.pinot.common.request.BrokerRequest;
-import org.apache.pinot.common.utils.request.FilterQueryTree;
-import org.apache.pinot.common.utils.request.RequestUtils;
-import org.apache.pinot.pql.parsers.Pql2Compiler;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.utils.request.FilterQueryTree;
+import org.apache.pinot.common.utils.request.RequestUtils;
+import org.apache.pinot.pql.parsers.Pql2Compiler;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/RandomRoutingTableTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/RandomRoutingTableTest.java
index 7d845cd..f894191 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/RandomRoutingTableTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/RandomRoutingTableTest.java
@@ -18,10 +18,6 @@
*/
package org.apache.pinot.broker.routing;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.config.TableConfig.Builder;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.utils.CommonConstants.Helix.TableType;
import java.io.FileInputStream;
import java.net.URL;
import java.util.ArrayList;
@@ -35,6 +31,10 @@ import org.apache.helix.ZNRecord;
import org.apache.helix.manager.zk.ZNRecordSerializer;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.InstanceConfig;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.config.TableConfig.Builder;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.utils.CommonConstants.Helix.TableType;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/RoutingTableTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/RoutingTableTest.java
index c04b6c8..9ee925b 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/RoutingTableTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/RoutingTableTest.java
@@ -18,6 +18,17 @@
*/
package org.apache.pinot.broker.routing;
+import com.yammer.metrics.core.MetricsRegistry;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import org.apache.commons.configuration.BaseConfiguration;
+import org.apache.commons.lang.mutable.MutableBoolean;
+import org.apache.helix.model.ExternalView;
+import org.apache.helix.model.InstanceConfig;
import org.apache.pinot.broker.routing.builder.HighLevelConsumerBasedRoutingTableBuilder;
import org.apache.pinot.broker.routing.builder.RoutingTableBuilder;
import org.apache.pinot.broker.util.FakePropertyStore;
@@ -30,17 +41,6 @@ import org.apache.pinot.common.metrics.BrokerMetrics;
import org.apache.pinot.common.utils.CommonConstants.Helix.TableType;
import org.apache.pinot.common.utils.HLCSegmentName;
import org.apache.pinot.common.utils.LLCSegmentName;
-import com.yammer.metrics.core.MetricsRegistry;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import org.apache.commons.configuration.BaseConfiguration;
-import org.apache.commons.lang.mutable.MutableBoolean;
-import org.apache.helix.model.ExternalView;
-import org.apache.helix.model.InstanceConfig;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/TimeBoundaryServiceTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/TimeBoundaryServiceTest.java
index 3a4542b..f808c47 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/TimeBoundaryServiceTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/TimeBoundaryServiceTest.java
@@ -18,14 +18,6 @@
*/
package org.apache.pinot.broker.routing;
-import org.apache.pinot.broker.routing.TimeBoundaryService.TimeBoundaryInfo;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.metadata.ZKMetadataProvider;
-import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.CommonConstants.Segment.SegmentType;
-import org.apache.pinot.common.utils.StringUtil;
-import org.apache.pinot.common.utils.ZkStarter;
import java.util.List;
import java.util.concurrent.TimeUnit;
import org.apache.commons.lang.StringUtils;
@@ -35,6 +27,14 @@ import org.apache.helix.manager.zk.ZkBaseDataAccessor;
import org.apache.helix.manager.zk.ZkClient;
import org.apache.helix.model.ExternalView;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.broker.routing.TimeBoundaryService.TimeBoundaryInfo;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.CommonConstants.Segment.SegmentType;
+import org.apache.pinot.common.utils.StringUtil;
+import org.apache.pinot.common.utils.ZkStarter;
import org.testng.Assert;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeTest;
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/BalancedRandomRoutingTableBuilderTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/BalancedRandomRoutingTableBuilderTest.java
index 740e876..03c2951 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/BalancedRandomRoutingTableBuilderTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/BalancedRandomRoutingTableBuilderTest.java
@@ -18,8 +18,6 @@
*/
package org.apache.pinot.broker.routing.builder;
-import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
-import org.apache.pinot.common.config.TableConfig;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
@@ -29,6 +27,8 @@ import java.util.Set;
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.InstanceConfig;
+import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
+import org.apache.pinot.common.config.TableConfig;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/HighLevelConsumerRoutingTableBuilderTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/HighLevelConsumerRoutingTableBuilderTest.java
index 05294ec..c2d230c 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/HighLevelConsumerRoutingTableBuilderTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/HighLevelConsumerRoutingTableBuilderTest.java
@@ -18,10 +18,6 @@
*/
package org.apache.pinot.broker.routing.builder;
-import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.HLCSegmentName;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -32,6 +28,10 @@ import java.util.Set;
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.InstanceConfig;
+import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.HLCSegmentName;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/LargeClusterRoutingTableBuilderTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/LargeClusterRoutingTableBuilderTest.java
index 3bc81d1..fcdd74e 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/LargeClusterRoutingTableBuilderTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/LargeClusterRoutingTableBuilderTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.pinot.broker.routing.builder;
-import org.apache.pinot.common.utils.CommonConstants;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -27,6 +26,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.InstanceConfig;
+import org.apache.pinot.common.utils.CommonConstants;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/LowLevelConsumerRoutingTableBuilderTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/LowLevelConsumerRoutingTableBuilderTest.java
index f690ab4..150d4d7 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/LowLevelConsumerRoutingTableBuilderTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/LowLevelConsumerRoutingTableBuilderTest.java
@@ -18,10 +18,6 @@
*/
package org.apache.pinot.broker.routing.builder;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.LLCSegmentName;
-import org.apache.pinot.common.utils.SegmentName;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -31,6 +27,10 @@ import java.util.Set;
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.InstanceConfig;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.LLCSegmentName;
+import org.apache.pinot.common.utils.SegmentName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/PartitionAwareOfflineRoutingTableBuilderTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/PartitionAwareOfflineRoutingTableBuilderTest.java
index 018f3d5..e95b8e5 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/PartitionAwareOfflineRoutingTableBuilderTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/PartitionAwareOfflineRoutingTableBuilderTest.java
@@ -18,8 +18,19 @@
*/
package org.apache.pinot.broker.routing.builder;
-import org.apache.pinot.broker.util.FakePropertyStore;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import org.apache.commons.lang.math.IntRange;
+import org.apache.helix.model.ExternalView;
+import org.apache.helix.model.InstanceConfig;
import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
+import org.apache.pinot.broker.util.FakePropertyStore;
import org.apache.pinot.common.config.ReplicaGroupStrategyConfig;
import org.apache.pinot.common.config.RoutingConfig;
import org.apache.pinot.common.config.TableConfig;
@@ -32,17 +43,6 @@ import org.apache.pinot.common.partition.ReplicaGroupPartitionAssignment;
import org.apache.pinot.common.partition.ReplicaGroupPartitionAssignmentGenerator;
import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.pql.parsers.Pql2Compiler;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import org.apache.commons.lang.math.IntRange;
-import org.apache.helix.model.ExternalView;
-import org.apache.helix.model.InstanceConfig;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/PartitionAwareRealtimeRoutingTableBuilderTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/PartitionAwareRealtimeRoutingTableBuilderTest.java
index b02ed86..ad20aee 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/PartitionAwareRealtimeRoutingTableBuilderTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/PartitionAwareRealtimeRoutingTableBuilderTest.java
@@ -18,8 +18,19 @@
*/
package org.apache.pinot.broker.routing.builder;
-import org.apache.pinot.broker.util.FakePropertyStore;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import org.apache.commons.lang.math.IntRange;
+import org.apache.helix.model.ExternalView;
+import org.apache.helix.model.InstanceConfig;
import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
+import org.apache.pinot.broker.util.FakePropertyStore;
import org.apache.pinot.common.config.ColumnPartitionConfig;
import org.apache.pinot.common.config.RoutingConfig;
import org.apache.pinot.common.config.SegmentPartitionConfig;
@@ -32,17 +43,6 @@ import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.common.utils.LLCSegmentName;
import org.apache.pinot.pql.parsers.Pql2Compiler;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import org.apache.commons.lang.math.IntRange;
-import org.apache.helix.model.ExternalView;
-import org.apache.helix.model.InstanceConfig;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/RoutingTableBuilderTestUtil.java b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/RoutingTableBuilderTestUtil.java
index e27da1b..1c9ab3e 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/RoutingTableBuilderTestUtil.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/builder/RoutingTableBuilderTestUtil.java
@@ -18,13 +18,13 @@
*/
package org.apache.pinot.broker.routing.builder;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.pinot.common.config.RoutingConfig;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.config.TableNameBuilder;
import org.apache.pinot.common.utils.CommonConstants;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
/**
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/selector/MergedSegmentSelectorTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/selector/MergedSegmentSelectorTest.java
index 7b8440a..3d72344 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/selector/MergedSegmentSelectorTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/selector/MergedSegmentSelectorTest.java
@@ -18,17 +18,17 @@
*/
package org.apache.pinot.broker.routing.selector;
-import org.apache.pinot.broker.util.FakePropertyStore;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.lineage.SegmentMergeLineage;
-import org.apache.pinot.common.lineage.SegmentMergeLineageAccessHelper;
-import org.apache.pinot.common.utils.CommonConstants;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.helix.ZNRecord;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.broker.util.FakePropertyStore;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.lineage.SegmentMergeLineage;
+import org.apache.pinot.common.lineage.SegmentMergeLineageAccessHelper;
+import org.apache.pinot.common.utils.CommonConstants;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/AdjustTableNameChildKeyTransformer.java b/pinot-common/src/main/java/org/apache/pinot/common/config/AdjustTableNameChildKeyTransformer.java
index 6886271..dc92c57 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/AdjustTableNameChildKeyTransformer.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/AdjustTableNameChildKeyTransformer.java
@@ -18,10 +18,10 @@
*/
package org.apache.pinot.common.config;
-import org.apache.pinot.common.utils.CommonConstants;
import io.vavr.collection.List;
import io.vavr.collection.Map;
import java.util.Collection;
+import org.apache.pinot.common.utils.CommonConstants;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/ColumnPartitionConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/config/ColumnPartitionConfig.java
index 4b13c57..e773172 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/ColumnPartitionConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/ColumnPartitionConfig.java
@@ -21,11 +21,11 @@ package org.apache.pinot.common.config;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Preconditions;
-import org.apache.pinot.common.utils.EqualityUtils;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nonnull;
import org.apache.commons.lang.math.IntRange;
+import org.apache.pinot.common.utils.EqualityUtils;
@SuppressWarnings("unused") // Suppress incorrect warnings as methods used for ser/de.
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/CombinedConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/config/CombinedConfig.java
index 2431f5f..8eea9d2 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/CombinedConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/CombinedConfig.java
@@ -21,9 +21,7 @@ package org.apache.pinot.common.config;
import org.apache.pinot.common.data.Schema;
import org.apache.pinot.common.utils.EqualityUtils;
-import static org.apache.pinot.common.utils.EqualityUtils.hashCodeOf;
-import static org.apache.pinot.common.utils.EqualityUtils.isEqual;
-import static org.apache.pinot.common.utils.EqualityUtils.isNullOrNotSameClass;
+import static org.apache.pinot.common.utils.EqualityUtils.*;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/CombinedConfigLoader.java b/pinot-common/src/main/java/org/apache/pinot/common/config/CombinedConfigLoader.java
index a82143a..bfeea39 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/CombinedConfigLoader.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/CombinedConfigLoader.java
@@ -18,7 +18,6 @@
*/
package org.apache.pinot.common.config;
-import org.apache.pinot.common.utils.EqualityUtils;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigIncludeContext;
@@ -33,6 +32,7 @@ import io.vavr.collection.Set;
import java.io.File;
import java.util.Arrays;
import java.util.Map;
+import org.apache.pinot.common.utils.EqualityUtils;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/CombinedConfigSeparatorChildKeyTransformer.java b/pinot-common/src/main/java/org/apache/pinot/common/config/CombinedConfigSeparatorChildKeyTransformer.java
index ddd94f9..bd3bba6 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/CombinedConfigSeparatorChildKeyTransformer.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/CombinedConfigSeparatorChildKeyTransformer.java
@@ -18,7 +18,6 @@
*/
package org.apache.pinot.common.config;
-import org.apache.pinot.common.utils.EqualityUtils;
import io.vavr.Tuple;
import io.vavr.Tuple2;
import io.vavr.collection.List;
@@ -26,6 +25,7 @@ import io.vavr.collection.Map;
import io.vavr.collection.Seq;
import io.vavr.collection.Set;
import io.vavr.control.Option;
+import org.apache.pinot.common.utils.EqualityUtils;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/Deserializer.java b/pinot-common/src/main/java/org/apache/pinot/common/config/Deserializer.java
index 2ac8d72..94afbf2 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/Deserializer.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/Deserializer.java
@@ -18,7 +18,6 @@
*/
package org.apache.pinot.common.config;
-import org.apache.pinot.common.Utils;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigIncludeContext;
@@ -38,6 +37,7 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
+import org.apache.pinot.common.Utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/Duration.java b/pinot-common/src/main/java/org/apache/pinot/common/config/Duration.java
index 2257778..17f000b 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/Duration.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/Duration.java
@@ -18,8 +18,8 @@
*/
package org.apache.pinot.common.config;
-import org.apache.pinot.common.utils.EqualityUtils;
import java.util.concurrent.TimeUnit;
+import org.apache.pinot.common.utils.EqualityUtils;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/IndexingConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/config/IndexingConfig.java
index a81cf8b..657a340 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/IndexingConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/IndexingConfig.java
@@ -19,13 +19,13 @@
package org.apache.pinot.common.config;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.apache.pinot.common.data.StarTreeIndexSpec;
-import org.apache.pinot.common.utils.EqualityUtils;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.pinot.common.data.StarTreeIndexSpec;
+import org.apache.pinot.common.utils.EqualityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/PinotTaskConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/config/PinotTaskConfig.java
index 410ba03..2ccc1cd 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/PinotTaskConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/PinotTaskConfig.java
@@ -18,11 +18,11 @@
*/
package org.apache.pinot.common.config;
-import org.apache.pinot.common.utils.EqualityUtils;
import java.util.HashMap;
import java.util.Map;
import javax.annotation.Nonnull;
import org.apache.helix.task.TaskConfig;
+import org.apache.pinot.common.utils.EqualityUtils;
public class PinotTaskConfig {
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/QuotaConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/config/QuotaConfig.java
index d3136b6..32adf5e 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/QuotaConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/QuotaConfig.java
@@ -20,10 +20,10 @@ package org.apache.pinot.common.config;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.apache.pinot.common.utils.DataSize;
-import org.apache.pinot.common.utils.EqualityUtils;
import javax.annotation.Nullable;
import org.apache.commons.configuration.ConfigurationRuntimeException;
+import org.apache.pinot.common.utils.DataSize;
+import org.apache.pinot.common.utils.EqualityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/ReplicaGroupStrategyConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/config/ReplicaGroupStrategyConfig.java
index 01c419a..4c6450c 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/ReplicaGroupStrategyConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/ReplicaGroupStrategyConfig.java
@@ -19,8 +19,8 @@
package org.apache.pinot.common.config;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.apache.pinot.common.utils.EqualityUtils;
import javax.annotation.Nullable;
+import org.apache.pinot.common.utils.EqualityUtils;
/**
* Class representing configurations related to segment assignment strategy.
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/RoutingConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/config/RoutingConfig.java
index 1530b3b..66e59e5 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/RoutingConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/RoutingConfig.java
@@ -19,9 +19,9 @@
package org.apache.pinot.common.config;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.apache.pinot.common.utils.EqualityUtils;
import java.util.HashMap;
import java.util.Map;
+import org.apache.pinot.common.utils.EqualityUtils;
@JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/SegmentPartitionConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/config/SegmentPartitionConfig.java
index adad360..db024ee 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/SegmentPartitionConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/SegmentPartitionConfig.java
@@ -22,12 +22,12 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Preconditions;
-import org.apache.pinot.common.utils.EqualityUtils;
-import org.apache.pinot.common.utils.JsonUtils;
import java.io.IOException;
import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.apache.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.JsonUtils;
@SuppressWarnings("unused") // Suppress incorrect warning, as methods are used for json ser/de.
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/SegmentsValidationAndRetentionConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/config/SegmentsValidationAndRetentionConfig.java
index 820b8dc..399b261 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/SegmentsValidationAndRetentionConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/SegmentsValidationAndRetentionConfig.java
@@ -20,9 +20,9 @@ package org.apache.pinot.common.config;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import java.lang.reflect.Field;
import org.apache.pinot.common.utils.EqualityUtils;
import org.apache.pinot.startree.hll.HllConfig;
-import java.lang.reflect.Field;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/TableConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/config/TableConfig.java
index b7a6ac6..ed99729 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/TableConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/TableConfig.java
@@ -22,11 +22,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Preconditions;
-import org.apache.pinot.common.data.StarTreeIndexSpec;
-import org.apache.pinot.common.utils.CommonConstants.Helix.TableType;
-import org.apache.pinot.common.utils.EqualityUtils;
-import org.apache.pinot.common.utils.JsonUtils;
-import org.apache.pinot.startree.hll.HllConfig;
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
@@ -35,6 +30,11 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.apache.helix.ZNRecord;
+import org.apache.pinot.common.data.StarTreeIndexSpec;
+import org.apache.pinot.common.utils.CommonConstants.Helix.TableType;
+import org.apache.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.JsonUtils;
+import org.apache.pinot.startree.hll.HllConfig;
@SuppressWarnings("unused")
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/TableCustomConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/config/TableCustomConfig.java
index 5bdd7e4..4c2b798 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/TableCustomConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/TableCustomConfig.java
@@ -19,9 +19,9 @@
package org.apache.pinot.common.config;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.apache.pinot.common.utils.EqualityUtils;
import java.lang.reflect.Field;
import java.util.Map;
+import org.apache.pinot.common.utils.EqualityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/TableNameBuilder.java b/pinot-common/src/main/java/org/apache/pinot/common/config/TableNameBuilder.java
index 4b57bfe..f8e6bea 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/TableNameBuilder.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/TableNameBuilder.java
@@ -19,10 +19,10 @@
package org.apache.pinot.common.config;
import com.google.common.base.Preconditions;
-import org.apache.pinot.common.utils.CommonConstants.Helix.TableType;
-import org.apache.pinot.common.utils.SegmentName;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.apache.pinot.common.utils.CommonConstants.Helix.TableType;
+import org.apache.pinot.common.utils.SegmentName;
public class TableNameBuilder {
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/TableTaskConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/config/TableTaskConfig.java
index d68c848..514e51d 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/TableTaskConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/TableTaskConfig.java
@@ -20,8 +20,8 @@ package org.apache.pinot.common.config;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.apache.pinot.common.utils.EqualityUtils;
import java.util.Map;
+import org.apache.pinot.common.utils.EqualityUtils;
@SuppressWarnings("unused")
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/TenantConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/config/TenantConfig.java
index bb9d7fb..3802f47 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/TenantConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/TenantConfig.java
@@ -19,8 +19,8 @@
package org.apache.pinot.common.config;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.apache.pinot.common.utils.EqualityUtils;
import java.lang.reflect.Field;
+import org.apache.pinot.common.utils.EqualityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeFieldSpec.java b/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeFieldSpec.java
index dbb4f66..2dd18cb 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeFieldSpec.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeFieldSpec.java
@@ -22,9 +22,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Preconditions;
+import javax.annotation.Nonnull;
import org.apache.pinot.common.config.ConfigKey;
import org.apache.pinot.common.utils.EqualityUtils;
-import javax.annotation.Nonnull;
@SuppressWarnings("unused")
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeFormatPatternSpec.java b/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeFormatPatternSpec.java
index 8060891..6387280 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeFormatPatternSpec.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeFormatPatternSpec.java
@@ -18,10 +18,10 @@
*/
package org.apache.pinot.common.data;
-import org.apache.pinot.common.utils.EqualityUtils;
import java.util.TimeZone;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.pinot.common.utils.EqualityUtils;
import org.joda.time.DateTimeZone;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeFormatSpec.java b/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeFormatSpec.java
index 3b0cfb5..d8d6221 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeFormatSpec.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeFormatSpec.java
@@ -18,14 +18,11 @@
*/
package org.apache.pinot.common.data;
-import org.apache.pinot.common.utils.EqualityUtils;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
+import java.util.concurrent.TimeUnit;
import org.apache.pinot.common.data.DateTimeFieldSpec.TimeFormat;
-import org.apache.commons.lang.StringUtils;
+import org.apache.pinot.common.utils.EqualityUtils;
import org.joda.time.DateTimeZone;
import org.joda.time.format.DateTimeFormatter;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeFormatUnitSpec.java b/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeFormatUnitSpec.java
index 81097e2..f9c50b2 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeFormatUnitSpec.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeFormatUnitSpec.java
@@ -18,9 +18,9 @@
*/
package org.apache.pinot.common.data;
-import org.apache.pinot.common.utils.EqualityUtils;
import java.util.concurrent.TimeUnit;
import org.apache.commons.lang3.EnumUtils;
+import org.apache.pinot.common.utils.EqualityUtils;
import org.joda.time.DurationFieldType;
import org.joda.time.chrono.ISOChronology;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeGranularitySpec.java b/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeGranularitySpec.java
index 302375c..dc1c5f3 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeGranularitySpec.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeGranularitySpec.java
@@ -20,10 +20,9 @@ package org.apache.pinot.common.data;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
-import org.apache.pinot.common.utils.EqualityUtils;
-import org.apache.commons.lang3.EnumUtils;
-
import java.util.concurrent.TimeUnit;
+import org.apache.commons.lang3.EnumUtils;
+import org.apache.pinot.common.utils.EqualityUtils;
/**
* Class to represent granularity from {@link DateTimeFieldSpec}
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/data/FieldSpec.java b/pinot-common/src/main/java/org/apache/pinot/common/data/FieldSpec.java
index 95c0746..2671150 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/data/FieldSpec.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/data/FieldSpec.java
@@ -20,15 +20,15 @@ package org.apache.pinot.common.data;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
+import javax.annotation.Nullable;
+import org.apache.avro.Schema.Type;
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.binary.Hex;
import org.apache.pinot.common.Utils;
import org.apache.pinot.common.config.ConfigKey;
import org.apache.pinot.common.config.ConfigNodeLifecycleAware;
import org.apache.pinot.common.utils.EqualityUtils;
import org.apache.pinot.common.utils.JsonUtils;
-import javax.annotation.Nullable;
-import org.apache.avro.Schema.Type;
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/data/MetricFieldSpec.java b/pinot-common/src/main/java/org/apache/pinot/common/data/MetricFieldSpec.java
index 1d25f34..a121893 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/data/MetricFieldSpec.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/data/MetricFieldSpec.java
@@ -22,9 +22,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Preconditions;
+import javax.annotation.Nonnull;
import org.apache.pinot.common.config.ConfigKey;
import org.apache.pinot.common.utils.EqualityUtils;
-import javax.annotation.Nonnull;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/data/Schema.java b/pinot-common/src/main/java/org/apache/pinot/common/data/Schema.java
index b1df4c9..1da8094 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/data/Schema.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/data/Schema.java
@@ -24,12 +24,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Preconditions;
-import org.apache.pinot.common.config.ConfigKey;
-import org.apache.pinot.common.config.UseChildKeyHandler;
-import org.apache.pinot.common.data.FieldSpec.DataType;
-import org.apache.pinot.common.data.FieldSpec.FieldType;
-import org.apache.pinot.common.utils.EqualityUtils;
-import org.apache.pinot.common.utils.JsonUtils;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -42,6 +36,12 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import javax.annotation.Nonnull;
+import org.apache.pinot.common.config.ConfigKey;
+import org.apache.pinot.common.config.UseChildKeyHandler;
+import org.apache.pinot.common.data.FieldSpec.DataType;
+import org.apache.pinot.common.data.FieldSpec.FieldType;
+import org.apache.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.JsonUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/data/StarTreeIndexSpec.java b/pinot-common/src/main/java/org/apache/pinot/common/data/StarTreeIndexSpec.java
index 0a65230..b266a65 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/data/StarTreeIndexSpec.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/data/StarTreeIndexSpec.java
@@ -21,16 +21,16 @@ package org.apache.pinot.common.data;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.google.common.collect.Sets;
-import org.apache.pinot.common.config.ConfigKey;
-import org.apache.pinot.common.segment.StarTreeMetadata;
-import org.apache.pinot.common.utils.EqualityUtils;
-import org.apache.pinot.common.utils.JsonUtils;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.Set;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
+import org.apache.pinot.common.config.ConfigKey;
+import org.apache.pinot.common.segment.StarTreeMetadata;
+import org.apache.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.JsonUtils;
@SuppressWarnings("unused")
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/data/TimeFieldSpec.java b/pinot-common/src/main/java/org/apache/pinot/common/data/TimeFieldSpec.java
index a7e2f90..bf49dea 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/data/TimeFieldSpec.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/data/TimeFieldSpec.java
@@ -22,11 +22,11 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Preconditions;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nonnull;
import org.apache.pinot.common.config.ConfigKey;
import org.apache.pinot.common.utils.EqualityUtils;
import org.apache.pinot.common.utils.JsonUtils;
-import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
@SuppressWarnings("unused")
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/data/TimeGranularitySpec.java b/pinot-common/src/main/java/org/apache/pinot/common/data/TimeGranularitySpec.java
index 08b76fa..3f6e10f 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/data/TimeGranularitySpec.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/data/TimeGranularitySpec.java
@@ -21,12 +21,12 @@ package org.apache.pinot.common.data;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Preconditions;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nonnull;
import org.apache.pinot.common.config.ConfigKey;
import org.apache.pinot.common.data.FieldSpec.DataType;
import org.apache.pinot.common.utils.EqualityUtils;
import org.apache.pinot.common.utils.JsonUtils;
-import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/exception/QueryException.java b/pinot-common/src/main/java/org/apache/pinot/common/exception/QueryException.java
index 26e27ce..e0ed903 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/exception/QueryException.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/exception/QueryException.java
@@ -18,9 +18,9 @@
*/
package org.apache.pinot.common.exception;
-import org.apache.pinot.common.response.ProcessingException;
import java.io.PrintWriter;
import java.io.StringWriter;
+import org.apache.pinot.common.response.ProcessingException;
public class QueryException {
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentMergeLineage.java b/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentMergeLineage.java
index 2c46aef..04c173d 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentMergeLineage.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentMergeLineage.java
@@ -18,8 +18,6 @@
*/
package org.apache.pinot.common.lineage;
-import org.apache.pinot.common.exception.InvalidConfigException;
-import org.apache.pinot.common.utils.EqualityUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -28,6 +26,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import org.apache.helix.ZNRecord;
+import org.apache.pinot.common.exception.InvalidConfigException;
+import org.apache.pinot.common.utils.EqualityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentMergeLineageAccessHelper.java b/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentMergeLineageAccessHelper.java
index 86002f7..1fb8cf7 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentMergeLineageAccessHelper.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentMergeLineageAccessHelper.java
@@ -18,17 +18,10 @@
*/
package org.apache.pinot.common.lineage;
-import org.apache.pinot.common.metadata.ZKMetadataProvider;
-import org.apache.pinot.common.utils.retry.RetryPolicies;
-import org.apache.pinot.common.utils.retry.RetryPolicy;
-import java.util.List;
import org.apache.helix.AccessOption;
-import org.apache.helix.PropertyPathConfig;
-import org.apache.helix.PropertyType;
import org.apache.helix.ZNRecord;
-import org.apache.helix.manager.zk.ZKHelixAdmin;
-import org.apache.helix.manager.zk.ZNRecordSerializer;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
import org.apache.zookeeper.data.Stat;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/messages/TimeboundaryRefreshMessage.java b/pinot-common/src/main/java/org/apache/pinot/common/messages/TimeboundaryRefreshMessage.java
index 5b90846..190b8d4 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/messages/TimeboundaryRefreshMessage.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/messages/TimeboundaryRefreshMessage.java
@@ -19,9 +19,8 @@
package org.apache.pinot.common.messages;
import com.google.common.base.Preconditions;
-import org.apache.helix.model.Message;
-
import java.util.UUID;
+import org.apache.helix.model.Message;
// A message intended for a pinot Broker to ask it to refresh its Timeboundary Info.
public class TimeboundaryRefreshMessage extends Message {
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metadata/ZKMetadataProvider.java b/pinot-common/src/main/java/org/apache/pinot/common/metadata/ZKMetadataProvider.java
index aa403a0..74e208b 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metadata/ZKMetadataProvider.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metadata/ZKMetadataProvider.java
@@ -18,6 +18,15 @@
*/
package org.apache.pinot.common.metadata;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.I0Itec.zkclient.exception.ZkBadVersionException;
+import org.apache.helix.AccessOption;
+import org.apache.helix.ZNRecord;
+import org.apache.helix.store.zk.ZkHelixPropertyStore;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.config.TableNameBuilder;
import org.apache.pinot.common.data.Schema;
@@ -29,15 +38,6 @@ import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.common.utils.SchemaUtils;
import org.apache.pinot.common.utils.SegmentName;
import org.apache.pinot.common.utils.StringUtil;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.I0Itec.zkclient.exception.ZkBadVersionException;
-import org.apache.helix.AccessOption;
-import org.apache.helix.ZNRecord;
-import org.apache.helix.store.zk.ZkHelixPropertyStore;
import org.apache.zookeeper.data.Stat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metadata/instance/InstanceZKMetadata.java b/pinot-common/src/main/java/org/apache/pinot/common/metadata/instance/InstanceZKMetadata.java
index 116972f..da41a79 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metadata/instance/InstanceZKMetadata.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metadata/instance/InstanceZKMetadata.java
@@ -18,17 +18,14 @@
*/
package org.apache.pinot.common.metadata.instance;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.metadata.ZKMetadata;
-import org.apache.pinot.common.utils.StringUtil;
import java.util.HashMap;
import java.util.Map;
import org.apache.helix.ZNRecord;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.metadata.ZKMetadata;
+import org.apache.pinot.common.utils.StringUtil;
-import static org.apache.pinot.common.utils.EqualityUtils.hashCodeOf;
-import static org.apache.pinot.common.utils.EqualityUtils.isEqual;
-import static org.apache.pinot.common.utils.EqualityUtils.isNullOrNotSameClass;
-import static org.apache.pinot.common.utils.EqualityUtils.isSameReference;
+import static org.apache.pinot.common.utils.EqualityUtils.*;
public final class InstanceZKMetadata implements ZKMetadata {
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/ColumnPartitionMetadata.java b/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/ColumnPartitionMetadata.java
index 95b3c83..11e408f 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/ColumnPartitionMetadata.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/ColumnPartitionMetadata.java
@@ -28,12 +28,12 @@ import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import org.apache.pinot.common.config.ColumnPartitionConfig;
-import org.apache.pinot.common.utils.EqualityUtils;
import java.io.IOException;
import java.util.List;
import javax.annotation.Nonnull;
import org.apache.commons.lang.math.IntRange;
+import org.apache.pinot.common.config.ColumnPartitionConfig;
+import org.apache.pinot.common.utils.EqualityUtils;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/LLCRealtimeSegmentZKMetadata.java b/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/LLCRealtimeSegmentZKMetadata.java
index 66a6abc..c341e8c 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/LLCRealtimeSegmentZKMetadata.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/LLCRealtimeSegmentZKMetadata.java
@@ -20,10 +20,8 @@ package org.apache.pinot.common.metadata.segment;
import java.util.Map;
import org.apache.helix.ZNRecord;
-import static org.apache.pinot.common.utils.EqualityUtils.hashCodeOf;
-import static org.apache.pinot.common.utils.EqualityUtils.isEqual;
-import static org.apache.pinot.common.utils.EqualityUtils.isNullOrNotSameClass;
-import static org.apache.pinot.common.utils.EqualityUtils.isSameReference;
+
+import static org.apache.pinot.common.utils.EqualityUtils.*;
public class LLCRealtimeSegmentZKMetadata extends RealtimeSegmentZKMetadata {
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/OfflineSegmentZKMetadata.java b/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/OfflineSegmentZKMetadata.java
index 45dac2c..44ada1f 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/OfflineSegmentZKMetadata.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/OfflineSegmentZKMetadata.java
@@ -19,15 +19,11 @@
package org.apache.pinot.common.metadata.segment;
import java.util.Map;
-
import org.apache.helix.ZNRecord;
-
import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.common.utils.CommonConstants.Segment.SegmentType;
-import static org.apache.pinot.common.utils.EqualityUtils.isEqual;
-import static org.apache.pinot.common.utils.EqualityUtils.hashCodeOf;
-import static org.apache.pinot.common.utils.EqualityUtils.isSameReference;
-import static org.apache.pinot.common.utils.EqualityUtils.isNullOrNotSameClass;
+
+import static org.apache.pinot.common.utils.EqualityUtils.*;
public class OfflineSegmentZKMetadata extends SegmentZKMetadata {
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/RealtimeSegmentZKMetadata.java b/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/RealtimeSegmentZKMetadata.java
index b1850a1..c1e8c88 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/RealtimeSegmentZKMetadata.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/RealtimeSegmentZKMetadata.java
@@ -18,11 +18,11 @@
*/
package org.apache.pinot.common.metadata.segment;
+import java.util.Map;
+import org.apache.helix.ZNRecord;
import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.common.utils.CommonConstants.Segment.Realtime.Status;
import org.apache.pinot.common.utils.CommonConstants.Segment.SegmentType;
-import java.util.Map;
-import org.apache.helix.ZNRecord;
import static org.apache.pinot.common.utils.EqualityUtils.*;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/SegmentPartitionMetadata.java b/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/SegmentPartitionMetadata.java
index 06766e7..34a3703 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/SegmentPartitionMetadata.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/SegmentPartitionMetadata.java
@@ -38,13 +38,13 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Preconditions;
-import org.apache.pinot.common.utils.JsonUtils;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.apache.commons.lang.math.IntRange;
+import org.apache.pinot.common.utils.JsonUtils;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/SegmentZKMetadata.java b/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/SegmentZKMetadata.java
index d19480a..dd523c1 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/SegmentZKMetadata.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/SegmentZKMetadata.java
@@ -19,16 +19,16 @@
package org.apache.pinot.common.metadata.segment;
import com.fasterxml.jackson.core.JsonProcessingException;
-import org.apache.pinot.common.metadata.ZKMetadata;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.CommonConstants.Segment.SegmentType;
-import org.apache.pinot.common.utils.JsonUtils;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import javax.annotation.Nonnull;
import org.apache.helix.ZNRecord;
+import org.apache.pinot.common.metadata.ZKMetadata;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.CommonConstants.Segment.SegmentType;
+import org.apache.pinot.common.utils.JsonUtils;
import org.joda.time.Duration;
import org.joda.time.Interval;
import org.slf4j.Logger;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/SegmentZKMetadataCustomMapModifier.java b/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/SegmentZKMetadataCustomMapModifier.java
index f6a3917..598d653 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/SegmentZKMetadataCustomMapModifier.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/SegmentZKMetadataCustomMapModifier.java
@@ -20,13 +20,13 @@ package org.apache.pinot.common.metadata.segment;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.pinot.common.utils.JsonUtils;
import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.apache.pinot.common.utils.JsonUtils;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/AbstractMetrics.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/AbstractMetrics.java
index 268be18..6f78211 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/AbstractMetrics.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/AbstractMetrics.java
@@ -19,8 +19,6 @@
package org.apache.pinot.common.metrics;
import com.google.common.annotations.VisibleForTesting;
-import org.apache.pinot.common.Utils;
-import org.apache.pinot.common.request.BrokerRequest;
import com.yammer.metrics.core.MetricName;
import com.yammer.metrics.core.MetricsRegistry;
import java.util.Map;
@@ -29,6 +27,8 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import javax.annotation.Nullable;
+import org.apache.pinot.common.Utils;
+import org.apache.pinot.common.request.BrokerRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/AggregatedCounter.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/AggregatedCounter.java
index f127d00..ed4d4c0 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/AggregatedCounter.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/AggregatedCounter.java
@@ -18,13 +18,12 @@
*/
package org.apache.pinot.common.metrics;
-import java.util.Collection;
-import java.util.concurrent.CopyOnWriteArrayList;
-
import com.yammer.metrics.core.Counter;
import com.yammer.metrics.core.Metric;
import com.yammer.metrics.core.MetricName;
import com.yammer.metrics.core.MetricProcessor;
+import java.util.Collection;
+import java.util.concurrent.CopyOnWriteArrayList;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/AggregatedHistogram.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/AggregatedHistogram.java
index b39b7be..ec0af54 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/AggregatedHistogram.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/AggregatedHistogram.java
@@ -18,11 +18,6 @@
*/
package org.apache.pinot.common.metrics;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
import com.yammer.metrics.core.Histogram;
import com.yammer.metrics.core.Metric;
import com.yammer.metrics.core.MetricName;
@@ -30,6 +25,10 @@ import com.yammer.metrics.core.MetricProcessor;
import com.yammer.metrics.core.Sampling;
import com.yammer.metrics.core.Summarizable;
import com.yammer.metrics.stats.Snapshot;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/AggregatedLongGauge.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/AggregatedLongGauge.java
index 2618ab9..b4205ba 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/AggregatedLongGauge.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/AggregatedLongGauge.java
@@ -18,12 +18,11 @@
*/
package org.apache.pinot.common.metrics;
+import com.yammer.metrics.core.Gauge;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-import com.yammer.metrics.core.Gauge;
-
/**
* An aggregated gauge that provides an average among the underlying gauges. You can have
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/AggregatedMeter.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/AggregatedMeter.java
index d93e437..f1c3355 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/AggregatedMeter.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/AggregatedMeter.java
@@ -18,15 +18,14 @@
*/
package org.apache.pinot.common.metrics;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.TimeUnit;
-
import com.yammer.metrics.core.Metered;
import com.yammer.metrics.core.MetricName;
import com.yammer.metrics.core.MetricProcessor;
import com.yammer.metrics.core.Stoppable;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.TimeUnit;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/MetricsHelper.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/MetricsHelper.java
index fbb0fbf..ee03290 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/MetricsHelper.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/MetricsHelper.java
@@ -18,13 +18,6 @@
*/
package org.apache.pinot.common.metrics;
-import com.yammer.metrics.core.Timer;
-import java.lang.reflect.Constructor;
-import java.util.Map;
-import java.util.Set;
-import java.util.WeakHashMap;
-import java.util.concurrent.TimeUnit;
-
import com.yammer.metrics.Metrics;
import com.yammer.metrics.core.Counter;
import com.yammer.metrics.core.Gauge;
@@ -35,6 +28,12 @@ import com.yammer.metrics.core.MetricName;
import com.yammer.metrics.core.MetricsRegistry;
import com.yammer.metrics.core.Sampling;
import com.yammer.metrics.core.Stoppable;
+import com.yammer.metrics.core.Timer;
+import java.lang.reflect.Constructor;
+import java.util.Map;
+import java.util.Set;
+import java.util.WeakHashMap;
+import java.util.concurrent.TimeUnit;
import org.apache.commons.configuration.Configuration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ValidationMetrics.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ValidationMetrics.java
index b1da713..0a676f1 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ValidationMetrics.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ValidationMetrics.java
@@ -18,14 +18,14 @@
*/
package org.apache.pinot.common.metrics;
+import com.yammer.metrics.core.Gauge;
+import com.yammer.metrics.core.MetricName;
+import com.yammer.metrics.core.MetricsRegistry;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import com.yammer.metrics.core.Gauge;
-import com.yammer.metrics.core.MetricName;
-import com.yammer.metrics.core.MetricsRegistry;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/partition/PartitionAssignment.java b/pinot-common/src/main/java/org/apache/pinot/common/partition/PartitionAssignment.java
index ffb9290..690e4eb 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/partition/PartitionAssignment.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/partition/PartitionAssignment.java
@@ -18,13 +18,13 @@
*/
package org.apache.pinot.common.partition;
-import org.apache.pinot.common.utils.EqualityUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.pinot.common.utils.EqualityUtils;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/partition/ReplicaGroupPartitionAssignmentGenerator.java b/pinot-common/src/main/java/org/apache/pinot/common/partition/ReplicaGroupPartitionAssignmentGenerator.java
index df42b42..c7076c8 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/partition/ReplicaGroupPartitionAssignmentGenerator.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/partition/ReplicaGroupPartitionAssignmentGenerator.java
@@ -19,14 +19,14 @@
package org.apache.pinot.common.partition;
import com.google.common.base.Preconditions;
-import org.apache.pinot.common.config.ReplicaGroupStrategyConfig;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.metadata.ZKMetadataProvider;
import java.util.Collections;
import java.util.List;
import org.apache.helix.AccessOption;
import org.apache.helix.ZNRecord;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.ReplicaGroupStrategyConfig;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/partition/StreamPartitionAssignmentGenerator.java b/pinot-common/src/main/java/org/apache/pinot/common/partition/StreamPartitionAssignmentGenerator.java
index 9198e0e..888fbda 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/partition/StreamPartitionAssignmentGenerator.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/partition/StreamPartitionAssignmentGenerator.java
@@ -20,12 +20,6 @@ package org.apache.pinot.common.partition;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Lists;
-import org.apache.pinot.common.config.RealtimeTagConfig;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.exception.InvalidConfigException;
-import org.apache.pinot.common.utils.EqualityUtils;
-import org.apache.pinot.common.utils.LLCSegmentName;
-import org.apache.pinot.common.utils.helix.HelixHelper;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -35,6 +29,12 @@ import java.util.Map;
import java.util.Set;
import org.apache.helix.HelixManager;
import org.apache.helix.model.IdealState;
+import org.apache.pinot.common.config.RealtimeTagConfig;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.exception.InvalidConfigException;
+import org.apache.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.LLCSegmentName;
+import org.apache.pinot.common.utils.helix.HelixHelper;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/protocols/SegmentCompletionProtocol.java b/pinot-common/src/main/java/org/apache/pinot/common/protocols/SegmentCompletionProtocol.java
index 805281a..6ea75f8 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/protocols/SegmentCompletionProtocol.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/protocols/SegmentCompletionProtocol.java
@@ -21,9 +21,9 @@ package org.apache.pinot.common.protocols;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
-import org.apache.pinot.common.utils.JsonUtils;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
+import org.apache.pinot.common.utils.JsonUtils;
/*
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/query/ReduceService.java b/pinot-common/src/main/java/org/apache/pinot/common/query/ReduceService.java
index c5af786..052adc4 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/query/ReduceService.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/query/ReduceService.java
@@ -18,15 +18,15 @@
*/
package org.apache.pinot.common.query;
+import java.util.Map;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.ThreadSafe;
import org.apache.pinot.common.metrics.BrokerMetrics;
import org.apache.pinot.common.request.BrokerRequest;
import org.apache.pinot.common.response.BrokerResponse;
import org.apache.pinot.common.response.ServerInstance;
import org.apache.pinot.common.utils.DataTable;
-import java.util.Map;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/query/ReduceServiceRegistry.java b/pinot-common/src/main/java/org/apache/pinot/common/query/ReduceServiceRegistry.java
index 59f1460..1bc0668 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/query/ReduceServiceRegistry.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/query/ReduceServiceRegistry.java
@@ -18,10 +18,10 @@
*/
package org.apache.pinot.common.query;
-import org.apache.pinot.common.response.BrokerResponse;
-import org.apache.pinot.common.response.BrokerResponseFactory;
import java.util.HashMap;
import java.util.Map;
+import org.apache.pinot.common.response.BrokerResponse;
+import org.apache.pinot.common.response.BrokerResponseFactory;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/AggregationInfo.java b/pinot-common/src/main/java/org/apache/pinot/common/request/AggregationInfo.java
index 2fb0ecc..aa0b3db 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/AggregationInfo.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/AggregationInfo.java
@@ -24,38 +24,27 @@
*/
package org.apache.pinot.common.request;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+import java.util.BitSet;
+import java.util.Collections;
import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+import org.apache.thrift.scheme.TupleScheme;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* AUTO GENERATED: DO NOT EDIT
* Aggregation
- *
+ *
*/
@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2017-8-24")
public class AggregationInfo implements org.apache.thrift.TBase<AggregationInfo, AggregationInfo._Fields>, java.io.Serializable, Cloneable, Comparable<AggregationInfo> {
@@ -146,13 +135,13 @@ public class AggregationInfo implements org.apache.thrift.TBase<AggregationInfo,
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.AGGREGATION_TYPE, new org.apache.thrift.meta_data.FieldMetaData("aggregationType", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.AGGREGATION_TYPE, new org.apache.thrift.meta_data.FieldMetaData("aggregationType", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.AGGREGATION_PARAMS, new org.apache.thrift.meta_data.FieldMetaData("aggregationParams", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
+ tmpMap.put(_Fields.AGGREGATION_PARAMS, new org.apache.thrift.meta_data.FieldMetaData("aggregationParams", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
- tmpMap.put(_Fields.IS_IN_SELECT_LIST, new org.apache.thrift.meta_data.FieldMetaData("isInSelectList", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.IS_IN_SELECT_LIST, new org.apache.thrift.meta_data.FieldMetaData("isInSelectList", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AggregationInfo.class, metaDataMap);
@@ -517,7 +506,7 @@ public class AggregationInfo implements org.apache.thrift.TBase<AggregationInfo,
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -525,7 +514,7 @@ public class AggregationInfo implements org.apache.thrift.TBase<AggregationInfo,
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.aggregationType = iprot.readString();
struct.setAggregationTypeIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -545,7 +534,7 @@ public class AggregationInfo implements org.apache.thrift.TBase<AggregationInfo,
iprot.readMapEnd();
}
struct.setAggregationParamsIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -553,7 +542,7 @@ public class AggregationInfo implements org.apache.thrift.TBase<AggregationInfo,
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.isInSelectList = iprot.readBool();
struct.setIsInSelectListIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/BrokerRequest.java b/pinot-common/src/main/java/org/apache/pinot/common/request/BrokerRequest.java
index 0c8d058..c95c782 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/BrokerRequest.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/BrokerRequest.java
@@ -24,32 +24,21 @@
*/
package org.apache.pinot.common.request;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+import java.util.BitSet;
+import java.util.Collections;
import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+import org.apache.thrift.scheme.TupleScheme;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/FilterOperator.java b/pinot-common/src/main/java/org/apache/pinot/common/request/FilterOperator.java
index 8926036..797aad5 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/FilterOperator.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/FilterOperator.java
@@ -24,15 +24,10 @@
*/
package org.apache.pinot.common.request;
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
/**
* AUTO GENERATED: DO NOT EDIT
* Filter Operator
- *
+ *
*/
public enum FilterOperator implements org.apache.thrift.TEnum {
AND(0),
@@ -61,7 +56,7 @@ public enum FilterOperator implements org.apache.thrift.TEnum {
* Find a the enum type by its integer value, as defined in the Thrift IDL.
* @return null if the value is not found.
*/
- public static FilterOperator findByValue(int value) {
+ public static FilterOperator findByValue(int value) {
switch (value) {
case 0:
return AND;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/FilterQuery.java b/pinot-common/src/main/java/org/apache/pinot/common/request/FilterQuery.java
index 26a4bc2..54a8141 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/FilterQuery.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/FilterQuery.java
@@ -24,38 +24,27 @@
*/
package org.apache.pinot.common.request;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+import java.util.BitSet;
+import java.util.Collections;
import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+import org.apache.thrift.scheme.TupleScheme;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* AUTO GENERATED: DO NOT EDIT
* Filter query
- *
+ *
*/
@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2017-5-24")
public class FilterQuery implements org.apache.thrift.TBase<FilterQuery, FilterQuery._Fields>, java.io.Serializable, Cloneable, Comparable<FilterQuery> {
@@ -88,7 +77,7 @@ public class FilterQuery implements org.apache.thrift.TBase<FilterQuery, FilterQ
COLUMN((short)2, "column"),
VALUE((short)3, "value"),
/**
- *
+ *
* @see FilterOperator
*/
OPERATOR((short)4, "operator"),
@@ -163,17 +152,17 @@ public class FilterQuery implements org.apache.thrift.TBase<FilterQuery, FilterQ
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
- tmpMap.put(_Fields.COLUMN, new org.apache.thrift.meta_data.FieldMetaData("column", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.COLUMN, new org.apache.thrift.meta_data.FieldMetaData("column", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
- tmpMap.put(_Fields.OPERATOR, new org.apache.thrift.meta_data.FieldMetaData("operator", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.OPERATOR, new org.apache.thrift.meta_data.FieldMetaData("operator", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, FilterOperator.class)));
- tmpMap.put(_Fields.NESTED_FILTER_QUERY_IDS, new org.apache.thrift.meta_data.FieldMetaData("nestedFilterQueryIds", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ tmpMap.put(_Fields.NESTED_FILTER_QUERY_IDS, new org.apache.thrift.meta_data.FieldMetaData("nestedFilterQueryIds", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(FilterQuery.class, metaDataMap);
@@ -320,7 +309,7 @@ public class FilterQuery implements org.apache.thrift.TBase<FilterQuery, FilterQ
}
/**
- *
+ *
* @see FilterOperator
*/
public FilterOperator getOperator() {
@@ -328,7 +317,7 @@ public class FilterQuery implements org.apache.thrift.TBase<FilterQuery, FilterQ
}
/**
- *
+ *
* @see FilterOperator
*/
public void setOperator(FilterOperator operator) {
@@ -730,7 +719,7 @@ public class FilterQuery implements org.apache.thrift.TBase<FilterQuery, FilterQ
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -738,7 +727,7 @@ public class FilterQuery implements org.apache.thrift.TBase<FilterQuery, FilterQ
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.id = iprot.readI32();
struct.setIdIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -746,7 +735,7 @@ public class FilterQuery implements org.apache.thrift.TBase<FilterQuery, FilterQ
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.column = iprot.readString();
struct.setColumnIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -764,7 +753,7 @@ public class FilterQuery implements org.apache.thrift.TBase<FilterQuery, FilterQ
iprot.readListEnd();
}
struct.setValueIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -772,7 +761,7 @@ public class FilterQuery implements org.apache.thrift.TBase<FilterQuery, FilterQ
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.operator = org.apache.pinot.common.request.FilterOperator.findByValue(iprot.readI32());
struct.setOperatorIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -790,7 +779,7 @@ public class FilterQuery implements org.apache.thrift.TBase<FilterQuery, FilterQ
iprot.readListEnd();
}
struct.setNestedFilterQueryIdsIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/FilterQueryMap.java b/pinot-common/src/main/java/org/apache/pinot/common/request/FilterQueryMap.java
index 9a9b2d4..8754c80 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/FilterQueryMap.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/FilterQueryMap.java
@@ -24,38 +24,26 @@
*/
package org.apache.pinot.common.request;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+import java.util.BitSet;
+import java.util.Collections;
import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+import org.apache.thrift.scheme.TupleScheme;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* AUTO GENERATED: DO NOT EDIT
* Filter Query is nested but thrift stable version does not support yet (The support is there in top of the trunk but no released jars. Two concerns : stability and onus of maintaining a stable point. Also, its pretty difficult to compile thrift in Linkedin software development environment which is not geared towards c++ dev. Hence, the )
- *
+ *
*/
@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2017-5-24")
public class FilterQueryMap implements org.apache.thrift.TBase<FilterQueryMap, FilterQueryMap._Fields>, java.io.Serializable, Cloneable, Comparable<FilterQueryMap> {
@@ -134,9 +122,9 @@ public class FilterQueryMap implements org.apache.thrift.TBase<FilterQueryMap, F
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.FILTER_QUERY_MAP, new org.apache.thrift.meta_data.FieldMetaData("filterQueryMap", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32),
+ tmpMap.put(_Fields.FILTER_QUERY_MAP, new org.apache.thrift.meta_data.FieldMetaData("filterQueryMap", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32),
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, FilterQuery.class))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(FilterQueryMap.class, metaDataMap);
@@ -367,7 +355,7 @@ public class FilterQueryMap implements org.apache.thrift.TBase<FilterQueryMap, F
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -388,7 +376,7 @@ public class FilterQueryMap implements org.apache.thrift.TBase<FilterQueryMap, F
iprot.readMapEnd();
}
struct.setFilterQueryMapIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/GroupBy.java b/pinot-common/src/main/java/org/apache/pinot/common/request/GroupBy.java
index ab13dde..134eb6b 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/GroupBy.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/GroupBy.java
@@ -24,38 +24,27 @@
*/
package org.apache.pinot.common.request;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+import java.util.BitSet;
+import java.util.Collections;
import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+import org.apache.thrift.scheme.TupleScheme;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* AUTO GENERATED: DO NOT EDIT
* GroupBy
- *
+ *
*/
@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2017-5-24")
public class GroupBy implements org.apache.thrift.TBase<GroupBy, GroupBy._Fields>, java.io.Serializable, Cloneable, Comparable<GroupBy> {
@@ -146,13 +135,13 @@ public class GroupBy implements org.apache.thrift.TBase<GroupBy, GroupBy._Fields
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
- tmpMap.put(_Fields.TOP_N, new org.apache.thrift.meta_data.FieldMetaData("topN", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.TOP_N, new org.apache.thrift.meta_data.FieldMetaData("topN", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
- tmpMap.put(_Fields.EXPRESSIONS, new org.apache.thrift.meta_data.FieldMetaData("expressions", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ tmpMap.put(_Fields.EXPRESSIONS, new org.apache.thrift.meta_data.FieldMetaData("expressions", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GroupBy.class, metaDataMap);
@@ -537,7 +526,7 @@ public class GroupBy implements org.apache.thrift.TBase<GroupBy, GroupBy._Fields
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -555,7 +544,7 @@ public class GroupBy implements org.apache.thrift.TBase<GroupBy, GroupBy._Fields
iprot.readListEnd();
}
struct.setColumnsIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -563,7 +552,7 @@ public class GroupBy implements org.apache.thrift.TBase<GroupBy, GroupBy._Fields
if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
struct.topN = iprot.readI64();
struct.setTopNIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -581,7 +570,7 @@ public class GroupBy implements org.apache.thrift.TBase<GroupBy, GroupBy._Fields
iprot.readListEnd();
}
struct.setExpressionsIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/HavingFilterQuery.java b/pinot-common/src/main/java/org/apache/pinot/common/request/HavingFilterQuery.java
index 51cd76a..3ab0de9 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/HavingFilterQuery.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/HavingFilterQuery.java
@@ -24,38 +24,27 @@
*/
package org.apache.pinot.common.request;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+import java.util.BitSet;
+import java.util.Collections;
import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+import org.apache.thrift.scheme.TupleScheme;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* AUTO GENERATED: DO NOT EDIT
* Having Filter query
- *
+ *
*/
@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2017-8-24")
public class HavingFilterQuery implements org.apache.thrift.TBase<HavingFilterQuery, HavingFilterQuery._Fields>, java.io.Serializable, Cloneable, Comparable<HavingFilterQuery> {
@@ -88,7 +77,7 @@ public class HavingFilterQuery implements org.apache.thrift.TBase<HavingFilterQu
AGGREGATION_INFO((short)2, "aggregationInfo"),
VALUE((short)3, "value"),
/**
- *
+ *
* @see FilterOperator
*/
OPERATOR((short)4, "operator"),
@@ -163,17 +152,17 @@ public class HavingFilterQuery implements org.apache.thrift.TBase<HavingFilterQu
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
- tmpMap.put(_Fields.AGGREGATION_INFO, new org.apache.thrift.meta_data.FieldMetaData("aggregationInfo", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.AGGREGATION_INFO, new org.apache.thrift.meta_data.FieldMetaData("aggregationInfo", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT , "AggregationInfo")));
- tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
- tmpMap.put(_Fields.OPERATOR, new org.apache.thrift.meta_data.FieldMetaData("operator", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.OPERATOR, new org.apache.thrift.meta_data.FieldMetaData("operator", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, FilterOperator.class)));
- tmpMap.put(_Fields.NESTED_FILTER_QUERY_IDS, new org.apache.thrift.meta_data.FieldMetaData("nestedFilterQueryIds", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ tmpMap.put(_Fields.NESTED_FILTER_QUERY_IDS, new org.apache.thrift.meta_data.FieldMetaData("nestedFilterQueryIds", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HavingFilterQuery.class, metaDataMap);
@@ -320,7 +309,7 @@ public class HavingFilterQuery implements org.apache.thrift.TBase<HavingFilterQu
}
/**
- *
+ *
* @see FilterOperator
*/
public FilterOperator getOperator() {
@@ -328,7 +317,7 @@ public class HavingFilterQuery implements org.apache.thrift.TBase<HavingFilterQu
}
/**
- *
+ *
* @see FilterOperator
*/
public void setOperator(FilterOperator operator) {
@@ -730,7 +719,7 @@ public class HavingFilterQuery implements org.apache.thrift.TBase<HavingFilterQu
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -738,7 +727,7 @@ public class HavingFilterQuery implements org.apache.thrift.TBase<HavingFilterQu
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.id = iprot.readI32();
struct.setIdIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -747,7 +736,7 @@ public class HavingFilterQuery implements org.apache.thrift.TBase<HavingFilterQu
struct.aggregationInfo = new AggregationInfo();
struct.aggregationInfo.read(iprot);
struct.setAggregationInfoIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -765,7 +754,7 @@ public class HavingFilterQuery implements org.apache.thrift.TBase<HavingFilterQu
iprot.readListEnd();
}
struct.setValueIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -773,7 +762,7 @@ public class HavingFilterQuery implements org.apache.thrift.TBase<HavingFilterQu
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.operator = org.apache.pinot.common.request.FilterOperator.findByValue(iprot.readI32());
struct.setOperatorIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -791,7 +780,7 @@ public class HavingFilterQuery implements org.apache.thrift.TBase<HavingFilterQu
iprot.readListEnd();
}
struct.setNestedFilterQueryIdsIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/HavingFilterQueryMap.java b/pinot-common/src/main/java/org/apache/pinot/common/request/HavingFilterQueryMap.java
index cb0f061..bcc0c59 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/HavingFilterQueryMap.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/HavingFilterQueryMap.java
@@ -24,32 +24,20 @@
*/
package org.apache.pinot.common.request;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+import java.util.BitSet;
+import java.util.Collections;
import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+import org.apache.thrift.scheme.TupleScheme;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2017-8-24")
@@ -129,9 +117,9 @@ public class HavingFilterQueryMap implements org.apache.thrift.TBase<HavingFilte
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.FILTER_QUERY_MAP, new org.apache.thrift.meta_data.FieldMetaData("filterQueryMap", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32),
+ tmpMap.put(_Fields.FILTER_QUERY_MAP, new org.apache.thrift.meta_data.FieldMetaData("filterQueryMap", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32),
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, HavingFilterQuery.class))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HavingFilterQueryMap.class, metaDataMap);
@@ -362,7 +350,7 @@ public class HavingFilterQueryMap implements org.apache.thrift.TBase<HavingFilte
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -383,7 +371,7 @@ public class HavingFilterQueryMap implements org.apache.thrift.TBase<HavingFilte
iprot.readMapEnd();
}
struct.setFilterQueryMapIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/InstanceRequest.java b/pinot-common/src/main/java/org/apache/pinot/common/request/InstanceRequest.java
index a6bb5e8..b0fd5fa 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/InstanceRequest.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/InstanceRequest.java
@@ -24,38 +24,27 @@
*/
package org.apache.pinot.common.request;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+import java.util.BitSet;
+import java.util.Collections;
import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+import org.apache.thrift.scheme.TupleScheme;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* AUTO GENERATED: DO NOT EDIT
* Instance Request
- *
+ *
*/
@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2017-5-24")
public class InstanceRequest implements org.apache.thrift.TBase<InstanceRequest, InstanceRequest._Fields>, java.io.Serializable, Cloneable, Comparable<InstanceRequest> {
@@ -157,16 +146,16 @@ public class InstanceRequest implements org.apache.thrift.TBase<InstanceRequest,
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.REQUEST_ID, new org.apache.thrift.meta_data.FieldMetaData("requestId", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.REQUEST_ID, new org.apache.thrift.meta_data.FieldMetaData("requestId", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
- tmpMap.put(_Fields.QUERY, new org.apache.thrift.meta_data.FieldMetaData("query", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.QUERY, new org.apache.thrift.meta_data.FieldMetaData("query", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, BrokerRequest.class)));
- tmpMap.put(_Fields.SEARCH_SEGMENTS, new org.apache.thrift.meta_data.FieldMetaData("searchSegments", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ tmpMap.put(_Fields.SEARCH_SEGMENTS, new org.apache.thrift.meta_data.FieldMetaData("searchSegments", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
- tmpMap.put(_Fields.ENABLE_TRACE, new org.apache.thrift.meta_data.FieldMetaData("enableTrace", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.ENABLE_TRACE, new org.apache.thrift.meta_data.FieldMetaData("enableTrace", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
- tmpMap.put(_Fields.BROKER_ID, new org.apache.thrift.meta_data.FieldMetaData("brokerId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.BROKER_ID, new org.apache.thrift.meta_data.FieldMetaData("brokerId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(InstanceRequest.class, metaDataMap);
@@ -694,7 +683,7 @@ public class InstanceRequest implements org.apache.thrift.TBase<InstanceRequest,
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -702,7 +691,7 @@ public class InstanceRequest implements org.apache.thrift.TBase<InstanceRequest,
if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
struct.requestId = iprot.readI64();
struct.setRequestIdIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -711,7 +700,7 @@ public class InstanceRequest implements org.apache.thrift.TBase<InstanceRequest,
struct.query = new BrokerRequest();
struct.query.read(iprot);
struct.setQueryIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -729,7 +718,7 @@ public class InstanceRequest implements org.apache.thrift.TBase<InstanceRequest,
iprot.readListEnd();
}
struct.setSearchSegmentsIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -737,7 +726,7 @@ public class InstanceRequest implements org.apache.thrift.TBase<InstanceRequest,
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.enableTrace = iprot.readBool();
struct.setEnableTraceIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -745,7 +734,7 @@ public class InstanceRequest implements org.apache.thrift.TBase<InstanceRequest,
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.brokerId = iprot.readString();
struct.setBrokerIdIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/QuerySource.java b/pinot-common/src/main/java/org/apache/pinot/common/request/QuerySource.java
index 1a984c7..b4d4e3b 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/QuerySource.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/QuerySource.java
@@ -24,38 +24,26 @@
*/
package org.apache.pinot.common.request;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+import java.util.BitSet;
+import java.util.Collections;
import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+import org.apache.thrift.scheme.TupleScheme;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* AUTO GENERATED: DO NOT EDIT
* Query source
- *
+ *
*/
@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2017-5-24")
public class QuerySource implements org.apache.thrift.TBase<QuerySource, QuerySource._Fields>, java.io.Serializable, Cloneable, Comparable<QuerySource> {
@@ -134,7 +122,7 @@ public class QuerySource implements org.apache.thrift.TBase<QuerySource, QuerySo
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(QuerySource.class, metaDataMap);
@@ -342,7 +330,7 @@ public class QuerySource implements org.apache.thrift.TBase<QuerySource, QuerySo
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -350,7 +338,7 @@ public class QuerySource implements org.apache.thrift.TBase<QuerySource, QuerySo
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.tableName = iprot.readString();
struct.setTableNameIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/QueryType.java b/pinot-common/src/main/java/org/apache/pinot/common/request/QueryType.java
index 02a605f..d0b1208 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/QueryType.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/QueryType.java
@@ -24,38 +24,27 @@
*/
package org.apache.pinot.common.request;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+import java.util.BitSet;
+import java.util.Collections;
import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+import org.apache.thrift.scheme.TupleScheme;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* AUTO GENERATED: DO NOT EDIT
* Query type
- *
+ *
*/
@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2017-8-24")
public class QueryType implements org.apache.thrift.TBase<QueryType, QueryType._Fields>, java.io.Serializable, Cloneable, Comparable<QueryType> {
@@ -160,15 +149,15 @@ public class QueryType implements org.apache.thrift.TBase<QueryType, QueryType._
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.HAS_SELECTION, new org.apache.thrift.meta_data.FieldMetaData("hasSelection", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.HAS_SELECTION, new org.apache.thrift.meta_data.FieldMetaData("hasSelection", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
- tmpMap.put(_Fields.HAS_FILTER, new org.apache.thrift.meta_data.FieldMetaData("hasFilter", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.HAS_FILTER, new org.apache.thrift.meta_data.FieldMetaData("hasFilter", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
- tmpMap.put(_Fields.HAS_AGGREGATION, new org.apache.thrift.meta_data.FieldMetaData("hasAggregation", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.HAS_AGGREGATION, new org.apache.thrift.meta_data.FieldMetaData("hasAggregation", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
- tmpMap.put(_Fields.HAS_GROUP_BY, new org.apache.thrift.meta_data.FieldMetaData("hasGroup_by", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.HAS_GROUP_BY, new org.apache.thrift.meta_data.FieldMetaData("hasGroup_by", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
- tmpMap.put(_Fields.HAS_HAVING, new org.apache.thrift.meta_data.FieldMetaData("hasHaving", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.HAS_HAVING, new org.apache.thrift.meta_data.FieldMetaData("hasHaving", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(QueryType.class, metaDataMap);
@@ -645,7 +634,7 @@ public class QueryType implements org.apache.thrift.TBase<QueryType, QueryType._
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -653,7 +642,7 @@ public class QueryType implements org.apache.thrift.TBase<QueryType, QueryType._
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.hasSelection = iprot.readBool();
struct.setHasSelectionIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -661,7 +650,7 @@ public class QueryType implements org.apache.thrift.TBase<QueryType, QueryType._
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.hasFilter = iprot.readBool();
struct.setHasFilterIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -669,7 +658,7 @@ public class QueryType implements org.apache.thrift.TBase<QueryType, QueryType._
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.hasAggregation = iprot.readBool();
struct.setHasAggregationIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -677,7 +666,7 @@ public class QueryType implements org.apache.thrift.TBase<QueryType, QueryType._
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.hasGroup_by = iprot.readBool();
struct.setHasGroup_byIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -685,7 +674,7 @@ public class QueryType implements org.apache.thrift.TBase<QueryType, QueryType._
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.hasHaving = iprot.readBool();
struct.setHasHavingIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/Selection.java b/pinot-common/src/main/java/org/apache/pinot/common/request/Selection.java
index 16cbfd5..92a2b2c 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/Selection.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/Selection.java
@@ -24,38 +24,27 @@
*/
package org.apache.pinot.common.request;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+import java.util.BitSet;
+import java.util.Collections;
import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+import org.apache.thrift.scheme.TupleScheme;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* AUTO GENERATED: DO NOT EDIT
* Selection
- *
+ *
*/
@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2017-5-24")
public class Selection implements org.apache.thrift.TBase<Selection, Selection._Fields>, java.io.Serializable, Cloneable, Comparable<Selection> {
@@ -152,15 +141,15 @@ public class Selection implements org.apache.thrift.TBase<Selection, Selection._
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.SELECTION_COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("selectionColumns", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ tmpMap.put(_Fields.SELECTION_COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("selectionColumns", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
- tmpMap.put(_Fields.SELECTION_SORT_SEQUENCE, new org.apache.thrift.meta_data.FieldMetaData("selectionSortSequence", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ tmpMap.put(_Fields.SELECTION_SORT_SEQUENCE, new org.apache.thrift.meta_data.FieldMetaData("selectionSortSequence", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SelectionSort.class))));
- tmpMap.put(_Fields.OFFSET, new org.apache.thrift.meta_data.FieldMetaData("offset", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.OFFSET, new org.apache.thrift.meta_data.FieldMetaData("offset", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
- tmpMap.put(_Fields.SIZE, new org.apache.thrift.meta_data.FieldMetaData("size", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.SIZE, new org.apache.thrift.meta_data.FieldMetaData("size", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Selection.class, metaDataMap);
@@ -620,7 +609,7 @@ public class Selection implements org.apache.thrift.TBase<Selection, Selection._
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -638,7 +627,7 @@ public class Selection implements org.apache.thrift.TBase<Selection, Selection._
iprot.readListEnd();
}
struct.setSelectionColumnsIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -657,7 +646,7 @@ public class Selection implements org.apache.thrift.TBase<Selection, Selection._
iprot.readListEnd();
}
struct.setSelectionSortSequenceIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -665,7 +654,7 @@ public class Selection implements org.apache.thrift.TBase<Selection, Selection._
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.offset = iprot.readI32();
struct.setOffsetIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -673,7 +662,7 @@ public class Selection implements org.apache.thrift.TBase<Selection, Selection._
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.size = iprot.readI32();
struct.setSizeIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/SelectionSort.java b/pinot-common/src/main/java/org/apache/pinot/common/request/SelectionSort.java
index b0ca792..aef39a2 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/SelectionSort.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/SelectionSort.java
@@ -24,39 +24,28 @@
*/
package org.apache.pinot.common.request;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+import java.util.BitSet;
+import java.util.Collections;
import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+import org.apache.thrift.scheme.TupleScheme;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* AUTO GENERATED: DO NOT EDIT
* selection-sort : specifies how the search results should be sorted.
* The results can be sorted based on one or multiple columns
- *
+ *
*/
@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2017-5-24")
public class SelectionSort implements org.apache.thrift.TBase<SelectionSort, SelectionSort._Fields>, java.io.Serializable, Cloneable, Comparable<SelectionSort> {
@@ -142,9 +131,9 @@ public class SelectionSort implements org.apache.thrift.TBase<SelectionSort, Sel
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.COLUMN, new org.apache.thrift.meta_data.FieldMetaData("column", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.COLUMN, new org.apache.thrift.meta_data.FieldMetaData("column", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.IS_ASC, new org.apache.thrift.meta_data.FieldMetaData("isAsc", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.IS_ASC, new org.apache.thrift.meta_data.FieldMetaData("isAsc", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SelectionSort.class, metaDataMap);
@@ -423,7 +412,7 @@ public class SelectionSort implements org.apache.thrift.TBase<SelectionSort, Sel
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -431,7 +420,7 @@ public class SelectionSort implements org.apache.thrift.TBase<SelectionSort, Sel
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.column = iprot.readString();
struct.setColumnIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -439,7 +428,7 @@ public class SelectionSort implements org.apache.thrift.TBase<SelectionSort, Sel
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.isAsc = iprot.readBool();
struct.setIsAscIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/transform/TransformExpressionTree.java b/pinot-common/src/main/java/org/apache/pinot/common/request/transform/TransformExpressionTree.java
index b50d91c..3a2d8df 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/transform/TransformExpressionTree.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/transform/TransformExpressionTree.java
@@ -18,19 +18,18 @@
*/
package org.apache.pinot.common.request.transform;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import javax.annotation.Nonnull;
import org.apache.pinot.common.utils.EqualityUtils;
-import org.apache.pinot.pql.parsers.Pql2CompilationException;
import org.apache.pinot.pql.parsers.Pql2Compiler;
import org.apache.pinot.pql.parsers.pql2.ast.AstNode;
import org.apache.pinot.pql.parsers.pql2.ast.FunctionCallAstNode;
import org.apache.pinot.pql.parsers.pql2.ast.IdentifierAstNode;
import org.apache.pinot.pql.parsers.pql2.ast.LiteralAstNode;
import org.apache.pinot.pql.parsers.pql2.ast.StringLiteralAstNode;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import javax.annotation.Nonnull;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/response/BrokerResponse.java b/pinot-common/src/main/java/org/apache/pinot/common/response/BrokerResponse.java
index e9967f8..eef7b43 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/response/BrokerResponse.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/response/BrokerResponse.java
@@ -18,8 +18,8 @@
*/
package org.apache.pinot.common.response;
-import org.apache.pinot.common.response.broker.QueryProcessingException;
import java.util.List;
+import org.apache.pinot.common.response.broker.QueryProcessingException;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/response/BrokerResponseFactory.java b/pinot-common/src/main/java/org/apache/pinot/common/response/BrokerResponseFactory.java
index ddd5607..847b1da 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/response/BrokerResponseFactory.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/response/BrokerResponseFactory.java
@@ -18,10 +18,10 @@
*/
package org.apache.pinot.common.response;
-import org.apache.pinot.common.response.broker.BrokerResponseNative;
import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.apache.pinot.common.response.broker.BrokerResponseNative;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/response/ProcessingException.java b/pinot-common/src/main/java/org/apache/pinot/common/response/ProcessingException.java
index f9f8518..f0463ac 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/response/ProcessingException.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/response/ProcessingException.java
@@ -24,37 +24,27 @@
*/
package org.apache.pinot.common.response;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+import java.util.BitSet;
+import java.util.Collections;
import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+import org.apache.thrift.scheme.TupleScheme;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* Processing exception
- *
+ *
*/
@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2017-5-24")
public class ProcessingException extends TException implements org.apache.thrift.TBase<ProcessingException, ProcessingException._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessingException> {
@@ -140,9 +130,9 @@ public class ProcessingException extends TException implements org.apache.thrift
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.ERROR_CODE, new org.apache.thrift.meta_data.FieldMetaData("errorCode", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.ERROR_CODE, new org.apache.thrift.meta_data.FieldMetaData("errorCode", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
- tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ProcessingException.class, metaDataMap);
@@ -431,7 +421,7 @@ public class ProcessingException extends TException implements org.apache.thrift
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -439,7 +429,7 @@ public class ProcessingException extends TException implements org.apache.thrift
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.errorCode = iprot.readI32();
struct.setErrorCodeIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -447,7 +437,7 @@ public class ProcessingException extends TException implements org.apache.thrift
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.message = iprot.readString();
struct.setMessageIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/response/ServerInstance.java b/pinot-common/src/main/java/org/apache/pinot/common/response/ServerInstance.java
index acb53f1..effb144 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/response/ServerInstance.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/response/ServerInstance.java
@@ -18,14 +18,14 @@
*/
package org.apache.pinot.common.response;
+import com.google.common.net.InternetDomainName;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.commons.lang3.tuple.Triple;
+import org.apache.pinot.common.utils.CommonConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.net.InternetDomainName;
-import org.apache.pinot.common.utils.CommonConstants;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/response/broker/BrokerResponseNative.java b/pinot-common/src/main/java/org/apache/pinot/common/response/broker/BrokerResponseNative.java
index b7b3839..949e919 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/response/broker/BrokerResponseNative.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/response/broker/BrokerResponseNative.java
@@ -22,15 +22,15 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.pinot.common.exception.QueryException;
-import org.apache.pinot.common.response.BrokerResponse;
-import org.apache.pinot.common.response.ProcessingException;
-import org.apache.pinot.common.utils.JsonUtils;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.pinot.common.exception.QueryException;
+import org.apache.pinot.common.response.BrokerResponse;
+import org.apache.pinot.common.response.ProcessingException;
+import org.apache.pinot.common.utils.JsonUtils;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/RebalanceResult.java b/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/RebalanceResult.java
index 1151350..29b613d 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/RebalanceResult.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/RebalanceResult.java
@@ -20,8 +20,8 @@ package org.apache.pinot.common.restlet.resources;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.pinot.common.partition.PartitionAssignment;
import java.util.Map;
+import org.apache.pinot.common.partition.PartitionAssignment;
@JsonIgnoreProperties(ignoreUnknown = true)
public class RebalanceResult {
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/ResourceUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/ResourceUtils.java
index e74d5b7..e3593f1 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/ResourceUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/ResourceUtils.java
@@ -18,10 +18,10 @@
*/
package org.apache.pinot.common.restlet.resources;
-import org.apache.pinot.common.utils.JsonUtils;
import java.io.IOException;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
+import org.apache.pinot.common.utils.JsonUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/segment/SegmentMetadata.java b/pinot-common/src/main/java/org/apache/pinot/common/segment/SegmentMetadata.java
index fe43091..68d6ffb 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/segment/SegmentMetadata.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/segment/SegmentMetadata.java
@@ -18,10 +18,10 @@
*/
package org.apache.pinot.common.segment;
-import org.apache.pinot.common.data.MetricFieldSpec;
-import org.apache.pinot.common.data.Schema;
import java.io.File;
import java.util.concurrent.TimeUnit;
+import org.apache.pinot.common.data.MetricFieldSpec;
+import org.apache.pinot.common.data.Schema;
import org.joda.time.Duration;
import org.joda.time.Interval;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/HdfsSegmentFetcher.java b/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/HdfsSegmentFetcher.java
index a6e2217..5d695ec 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/HdfsSegmentFetcher.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/HdfsSegmentFetcher.java
@@ -19,8 +19,6 @@
package org.apache.pinot.common.segment.fetcher;
import com.google.common.base.Strings;
-import org.apache.pinot.common.utils.retry.RetryPolicies;
-import org.apache.pinot.common.utils.retry.RetryPolicy;
import java.io.File;
import java.io.IOException;
import java.util.Collections;
@@ -29,6 +27,8 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.pinot.common.utils.retry.RetryPolicies;
+import org.apache.pinot.common.utils.retry.RetryPolicy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/HttpSegmentFetcher.java b/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/HttpSegmentFetcher.java
index bb942c1..3a63698 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/HttpSegmentFetcher.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/HttpSegmentFetcher.java
@@ -18,14 +18,14 @@
*/
package org.apache.pinot.common.segment.fetcher;
-import org.apache.pinot.common.exception.HttpErrorStatusException;
-import org.apache.pinot.common.utils.FileUploadDownloadClient;
-import org.apache.pinot.common.utils.retry.RetryPolicies;
import java.io.File;
import java.net.URI;
import java.util.Collections;
import java.util.Set;
import org.apache.commons.configuration.Configuration;
+import org.apache.pinot.common.exception.HttpErrorStatusException;
+import org.apache.pinot.common.utils.FileUploadDownloadClient;
+import org.apache.pinot.common.utils.retry.RetryPolicies;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/HttpsSegmentFetcher.java b/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/HttpsSegmentFetcher.java
index 6ae5737..dd2e8c2 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/HttpsSegmentFetcher.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/HttpsSegmentFetcher.java
@@ -18,13 +18,13 @@
*/
package org.apache.pinot.common.segment.fetcher;
-import org.apache.pinot.common.utils.ClientSSLContextGenerator;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.FileUploadDownloadClient;
import java.util.Set;
import java.util.stream.Collectors;
import javax.net.ssl.SSLContext;
import org.apache.commons.configuration.Configuration;
+import org.apache.pinot.common.utils.ClientSSLContextGenerator;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.FileUploadDownloadClient;
/*
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/PinotFSSegmentFetcher.java b/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/PinotFSSegmentFetcher.java
index f408182..c45073d 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/PinotFSSegmentFetcher.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/PinotFSSegmentFetcher.java
@@ -18,13 +18,13 @@
*/
package org.apache.pinot.common.segment.fetcher;
-import org.apache.pinot.filesystem.PinotFS;
-import org.apache.pinot.filesystem.PinotFSFactory;
import java.io.File;
import java.net.URI;
import java.util.Collections;
import java.util.Set;
import org.apache.commons.configuration.Configuration;
+import org.apache.pinot.filesystem.PinotFS;
+import org.apache.pinot.filesystem.PinotFSFactory;
public class PinotFSSegmentFetcher implements SegmentFetcher {
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/ClientSSLContextGenerator.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/ClientSSLContextGenerator.java
index 48b676f..f05517d 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/ClientSSLContextGenerator.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/ClientSSLContextGenerator.java
@@ -18,7 +18,6 @@
*/
package org.apache.pinot.common.utils;
-import org.apache.pinot.common.Utils;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -37,6 +36,7 @@ import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
import org.apache.commons.configuration.Configuration;
+import org.apache.pinot.common.Utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/CommonConstants.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/CommonConstants.java
index 2096f09..b6a8377 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/CommonConstants.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/CommonConstants.java
@@ -18,8 +18,8 @@
*/
package org.apache.pinot.common.utils;
-import org.apache.pinot.common.response.BrokerResponseFactory;
import java.io.File;
+import org.apache.pinot.common.response.BrokerResponseFactory;
public class CommonConstants {
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/DataSchema.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/DataSchema.java
index 2cf1014..257f0cf 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/DataSchema.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/DataSchema.java
@@ -18,7 +18,6 @@
*/
package org.apache.pinot.common.utils;
-import org.apache.pinot.common.data.FieldSpec;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
@@ -26,6 +25,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.util.Arrays;
import javax.annotation.Nonnull;
+import org.apache.pinot.common.data.FieldSpec;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/DataTable.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/DataTable.java
index dd5c434..e6697e3 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/DataTable.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/DataTable.java
@@ -18,10 +18,10 @@
*/
package org.apache.pinot.common.utils;
-import org.apache.pinot.common.response.ProcessingException;
import java.io.IOException;
import java.util.Map;
import javax.annotation.Nonnull;
+import org.apache.pinot.common.response.ProcessingException;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/FileUploadDownloadClient.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/FileUploadDownloadClient.java
index cc6a130..975b088 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/FileUploadDownloadClient.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/FileUploadDownloadClient.java
@@ -19,7 +19,6 @@
package org.apache.pinot.common.utils;
import com.google.common.base.Preconditions;
-import org.apache.pinot.common.exception.HttpErrorStatusException;
import java.io.BufferedOutputStream;
import java.io.Closeable;
import java.io.File;
@@ -55,6 +54,7 @@ import org.apache.http.entity.mime.content.InputStreamBody;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
+import org.apache.pinot.common.exception.HttpErrorStatusException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/HLCSegmentName.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/HLCSegmentName.java
index dc51681..6f14c5e 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/HLCSegmentName.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/HLCSegmentName.java
@@ -37,8 +37,8 @@ package org.apache.pinot.common.utils;
// sequenceNumber: 1465314044238
// see org.apache.pinot.controller.helix.core.PinotTableIdealStateBuilder#getGroupIdFromRealtimeDataTable for details on the groupId
-import org.apache.commons.lang.StringUtils;
import com.google.common.collect.Lists;
+import org.apache.commons.lang.StringUtils;
public class HLCSegmentName extends SegmentName {
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/JsonUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/JsonUtils.java
index a307856..7703e30 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/JsonUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/JsonUtils.java
@@ -27,13 +27,13 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Preconditions;
-import org.apache.pinot.common.data.FieldSpec;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import javax.annotation.Nullable;
+import org.apache.pinot.common.data.FieldSpec;
public class JsonUtils {
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/KafkaStarterUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/KafkaStarterUtils.java
index 6c23ffc..7a68ede 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/KafkaStarterUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/KafkaStarterUtils.java
@@ -23,11 +23,11 @@ import java.security.Permission;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import org.I0Itec.zkclient.ZkClient;
-import org.apache.commons.io.FileUtils;
import kafka.admin.TopicCommand;
import kafka.server.KafkaConfig;
import kafka.server.KafkaServerStartable;
+import org.I0Itec.zkclient.ZkClient;
+import org.apache.commons.io.FileUtils;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/SchemaUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/SchemaUtils.java
index 8c6baa9..0ffe588 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/SchemaUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/SchemaUtils.java
@@ -19,8 +19,6 @@
package org.apache.pinot.common.utils;
import com.google.common.base.Preconditions;
-import org.apache.pinot.common.data.FieldSpec;
-import org.apache.pinot.common.data.Schema;
import java.io.IOException;
import java.net.URL;
import java.util.concurrent.TimeUnit;
@@ -35,6 +33,8 @@ import org.apache.commons.httpclient.methods.multipart.Part;
import org.apache.commons.httpclient.methods.multipart.StringPart;
import org.apache.commons.httpclient.params.HttpMethodParams;
import org.apache.helix.ZNRecord;
+import org.apache.pinot.common.data.FieldSpec;
+import org.apache.pinot.common.data.Schema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/ServiceStatus.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/ServiceStatus.java
index 3e2486c..7d47060 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/ServiceStatus.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/ServiceStatus.java
@@ -18,7 +18,6 @@
*/
package org.apache.pinot.common.utils;
-import org.apache.pinot.common.config.TableNameBuilder;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -33,6 +32,7 @@ import org.apache.helix.model.CurrentState;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.IdealState;
import org.apache.helix.model.LiveInstance;
+import org.apache.pinot.common.config.TableNameBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/TarGzCompressionUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/TarGzCompressionUtils.java
index 4b4e884..98589b5 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/TarGzCompressionUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/TarGzCompressionUtils.java
@@ -18,7 +18,6 @@
*/
package org.apache.pinot.common.utils;
-import org.apache.pinot.common.Utils;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
@@ -32,7 +31,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.LinkedList;
import java.util.List;
-
import org.apache.commons.compress.archivers.ArchiveException;
import org.apache.commons.compress.archivers.ArchiveStreamFactory;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
@@ -42,6 +40,7 @@ import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
+import org.apache.pinot.common.Utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/ZkStarter.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/ZkStarter.java
index 2e41f70..059c848 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/ZkStarter.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/ZkStarter.java
@@ -22,7 +22,6 @@ import java.io.File;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.util.concurrent.TimeUnit;
-
import org.I0Itec.zkclient.ZkClient;
import org.apache.zookeeper.server.ServerConfig;
import org.apache.zookeeper.server.ZooKeeperServerMain;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/helix/HelixHelper.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/helix/HelixHelper.java
index 92b63da..ac0e754 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/helix/HelixHelper.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/helix/HelixHelper.java
@@ -19,11 +19,6 @@
package org.apache.pinot.common.utils.helix;
import com.google.common.base.Function;
-import org.apache.pinot.common.config.TagNameUtils;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.EqualityUtils;
-import org.apache.pinot.common.utils.retry.RetryPolicies;
-import org.apache.pinot.common.utils.retry.RetryPolicy;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -46,6 +41,11 @@ import org.apache.helix.model.HelixConfigScope.ConfigScopeProperty;
import org.apache.helix.model.IdealState;
import org.apache.helix.model.InstanceConfig;
import org.apache.helix.model.builder.HelixConfigScopeBuilder;
+import org.apache.pinot.common.config.TagNameUtils;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.retry.RetryPolicies;
+import org.apache.pinot.common.utils.retry.RetryPolicy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/request/FilterQueryTree.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/request/FilterQueryTree.java
index 7a3e8d8..7b6ee9d 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/request/FilterQueryTree.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/request/FilterQueryTree.java
@@ -19,11 +19,11 @@
package org.apache.pinot.common.utils.request;
import com.google.common.collect.Lists;
-import org.apache.pinot.common.request.FilterOperator;
-import org.apache.pinot.common.utils.StringUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.apache.pinot.common.request.FilterOperator;
+import org.apache.pinot.common.utils.StringUtil;
public class FilterQueryTree {
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/request/HavingQueryTree.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/request/HavingQueryTree.java
index 1f85949..7d953b1 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/request/HavingQueryTree.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/request/HavingQueryTree.java
@@ -18,9 +18,9 @@
*/
package org.apache.pinot.common.utils.request;
+import java.util.List;
import org.apache.pinot.common.request.AggregationInfo;
import org.apache.pinot.common.request.FilterOperator;
-import java.util.List;
public class HavingQueryTree extends QueryTree {
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/request/QueryTree.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/request/QueryTree.java
index c0be718..507b829 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/request/QueryTree.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/request/QueryTree.java
@@ -18,8 +18,8 @@
*/
package org.apache.pinot.common.utils.request;
-import org.apache.pinot.common.request.FilterOperator;
import java.util.List;
+import org.apache.pinot.common.request.FilterOperator;
public abstract class QueryTree {
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/request/RequestUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/request/RequestUtils.java
index 2b93f4c..f914714 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/request/RequestUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/request/RequestUtils.java
@@ -18,14 +18,6 @@
*/
package org.apache.pinot.common.utils.request;
-import org.apache.pinot.common.request.BrokerRequest;
-import org.apache.pinot.common.request.FilterQuery;
-import org.apache.pinot.common.request.FilterQueryMap;
-import org.apache.pinot.common.request.HavingFilterQuery;
-import org.apache.pinot.common.request.HavingFilterQueryMap;
-import org.apache.pinot.common.request.Selection;
-import org.apache.pinot.common.request.SelectionSort;
-import org.apache.pinot.common.request.transform.TransformExpressionTree;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -34,6 +26,14 @@ import java.util.Map;
import java.util.Set;
import java.util.Stack;
import org.apache.commons.lang.mutable.MutableInt;
+import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.FilterQuery;
+import org.apache.pinot.common.request.FilterQueryMap;
+import org.apache.pinot.common.request.HavingFilterQuery;
+import org.apache.pinot.common.request.HavingFilterQueryMap;
+import org.apache.pinot.common.request.Selection;
+import org.apache.pinot.common.request.SelectionSort;
+import org.apache.pinot.common.request.transform.TransformExpressionTree;
public class RequestUtils {
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/time/TimeConverter.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/time/TimeConverter.java
index 5930532..6b3ed3c 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/time/TimeConverter.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/time/TimeConverter.java
@@ -19,8 +19,8 @@
package org.apache.pinot.common.utils.time;
import com.google.common.base.Preconditions;
-import org.apache.pinot.common.data.TimeGranularitySpec;
import java.util.concurrent.TimeUnit;
+import org.apache.pinot.common.data.TimeGranularitySpec;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/webhdfs/WebHdfsV1Client.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/webhdfs/WebHdfsV1Client.java
index 434a858..c9ace03 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/webhdfs/WebHdfsV1Client.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/webhdfs/WebHdfsV1Client.java
@@ -20,7 +20,6 @@ package org.apache.pinot.common.utils.webhdfs;
import java.io.File;
import java.io.IOException;
-
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.methods.FileRequestEntity;
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/Pql2AstListener.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/Pql2AstListener.java
index 741fa3f..7de7a26 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/Pql2AstListener.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/Pql2AstListener.java
@@ -18,6 +18,8 @@
*/
package org.apache.pinot.pql.parsers;
+import java.util.Stack;
+import org.antlr.v4.runtime.misc.NotNull;
import org.apache.pinot.pql.parsers.pql2.ast.AstNode;
import org.apache.pinot.pql.parsers.pql2.ast.BetweenPredicateAstNode;
import org.apache.pinot.pql.parsers.pql2.ast.BinaryMathOpAstNode;
@@ -49,8 +51,6 @@ import org.apache.pinot.pql.parsers.pql2.ast.StringLiteralAstNode;
import org.apache.pinot.pql.parsers.pql2.ast.TableNameAstNode;
import org.apache.pinot.pql.parsers.pql2.ast.TopAstNode;
import org.apache.pinot.pql.parsers.pql2.ast.WhereAstNode;
-import java.util.Stack;
-import org.antlr.v4.runtime.misc.NotNull;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/Pql2Compiler.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/Pql2Compiler.java
index 5c1fb60..5b182f7 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/Pql2Compiler.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/Pql2Compiler.java
@@ -18,21 +18,9 @@
*/
package org.apache.pinot.pql.parsers;
-import org.apache.pinot.common.request.BrokerRequest;
-import org.apache.pinot.common.request.transform.TransformExpressionTree;
-import org.apache.pinot.pql.parsers.pql2.ast.AstNode;
-import org.apache.pinot.pql.parsers.pql2.ast.BaseAstNode;
-import org.apache.pinot.pql.parsers.pql2.ast.BetweenPredicateAstNode;
-import org.apache.pinot.pql.parsers.pql2.ast.ComparisonPredicateAstNode;
-import org.apache.pinot.pql.parsers.pql2.ast.FunctionCallAstNode;
-import org.apache.pinot.pql.parsers.pql2.ast.HavingAstNode;
-import org.apache.pinot.pql.parsers.pql2.ast.InPredicateAstNode;
-import org.apache.pinot.pql.parsers.pql2.ast.OutputColumnAstNode;
-import org.apache.pinot.pql.parsers.pql2.ast.RegexpLikePredicateAstNode;
import java.util.ArrayList;
import java.util.List;
import java.util.Stack;
-
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
@@ -50,6 +38,17 @@ import org.antlr.v4.runtime.tree.ParseTree;
import org.antlr.v4.runtime.tree.ParseTreeWalker;
import org.apache.commons.lang.math.NumberUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.transform.TransformExpressionTree;
+import org.apache.pinot.pql.parsers.pql2.ast.AstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.BaseAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.BetweenPredicateAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.ComparisonPredicateAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.FunctionCallAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.HavingAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.InPredicateAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.OutputColumnAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.RegexpLikePredicateAstNode;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/AstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/AstNode.java
index 9cdd550..f721c54 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/AstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/AstNode.java
@@ -18,8 +18,8 @@
*/
package org.apache.pinot.pql.parsers.pql2.ast;
-import org.apache.pinot.common.request.BrokerRequest;
import java.util.List;
+import org.apache.pinot.common.request.BrokerRequest;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/BaseAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/BaseAstNode.java
index 1cbaa92..522f5eb 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/BaseAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/BaseAstNode.java
@@ -18,9 +18,9 @@
*/
package org.apache.pinot.pql.parsers.pql2.ast;
-import org.apache.pinot.common.request.BrokerRequest;
import java.util.ArrayList;
import java.util.List;
+import org.apache.pinot.common.request.BrokerRequest;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/BetweenPredicateAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/BetweenPredicateAstNode.java
index ed5d1ba..77e820cb 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/BetweenPredicateAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/BetweenPredicateAstNode.java
@@ -18,11 +18,11 @@
*/
package org.apache.pinot.pql.parsers.pql2.ast;
+import java.util.Collections;
import org.apache.pinot.common.request.FilterOperator;
import org.apache.pinot.common.utils.request.FilterQueryTree;
import org.apache.pinot.common.utils.request.HavingQueryTree;
import org.apache.pinot.pql.parsers.Pql2CompilationException;
-import java.util.Collections;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/BooleanOperatorAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/BooleanOperatorAstNode.java
index 9f02d64..0d406a2 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/BooleanOperatorAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/BooleanOperatorAstNode.java
@@ -18,8 +18,8 @@
*/
package org.apache.pinot.pql.parsers.pql2.ast;
-import org.apache.pinot.common.request.BrokerRequest;
import java.util.List;
+import org.apache.pinot.common.request.BrokerRequest;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/ComparisonPredicateAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/ComparisonPredicateAstNode.java
index ff8991a..e5dac8d 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/ComparisonPredicateAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/ComparisonPredicateAstNode.java
@@ -18,11 +18,11 @@
*/
package org.apache.pinot.pql.parsers.pql2.ast;
+import java.util.Collections;
import org.apache.pinot.common.request.FilterOperator;
import org.apache.pinot.common.utils.request.FilterQueryTree;
import org.apache.pinot.common.utils.request.HavingQueryTree;
import org.apache.pinot.pql.parsers.Pql2CompilationException;
-import java.util.Collections;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/FunctionCallAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/FunctionCallAstNode.java
index fbccf00..d68840c 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/FunctionCallAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/FunctionCallAstNode.java
@@ -18,11 +18,11 @@
*/
package org.apache.pinot.pql.parsers.pql2.ast;
+import java.util.List;
import org.apache.pinot.common.request.AggregationInfo;
import org.apache.pinot.common.request.transform.TransformExpressionTree;
import org.apache.pinot.common.utils.EqualityUtils;
import org.apache.pinot.pql.parsers.Pql2CompilationException;
-import java.util.List;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/InPredicateAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/InPredicateAstNode.java
index aa636c4..6be33f3 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/InPredicateAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/InPredicateAstNode.java
@@ -18,16 +18,16 @@
*/
package org.apache.pinot.pql.parsers.pql2.ast;
-import org.apache.pinot.common.request.FilterOperator;
-import org.apache.pinot.common.utils.StringUtil;
-import org.apache.pinot.common.utils.request.FilterQueryTree;
-import org.apache.pinot.common.utils.request.HavingQueryTree;
-import org.apache.pinot.pql.parsers.Pql2CompilationException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.TreeSet;
+import org.apache.pinot.common.request.FilterOperator;
+import org.apache.pinot.common.utils.StringUtil;
+import org.apache.pinot.common.utils.request.FilterQueryTree;
+import org.apache.pinot.common.utils.request.HavingQueryTree;
+import org.apache.pinot.pql.parsers.Pql2CompilationException;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OptionsAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OptionsAstNode.java
index c5d54ef..5f2cb73 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OptionsAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OptionsAstNode.java
@@ -18,8 +18,8 @@
*/
package org.apache.pinot.pql.parsers.pql2.ast;
-import org.apache.pinot.common.request.BrokerRequest;
import java.util.HashMap;
+import org.apache.pinot.common.request.BrokerRequest;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/PredicateListAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/PredicateListAstNode.java
index ac4354f..3225cd3 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/PredicateListAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/PredicateListAstNode.java
@@ -18,11 +18,11 @@
*/
package org.apache.pinot.pql.parsers.pql2.ast;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.pinot.common.request.FilterOperator;
import org.apache.pinot.common.utils.request.FilterQueryTree;
import org.apache.pinot.common.utils.request.HavingQueryTree;
-import java.util.ArrayList;
-import java.util.List;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/RegexpLikePredicateAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/RegexpLikePredicateAstNode.java
index 5eb5df7..bd481e1 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/RegexpLikePredicateAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/RegexpLikePredicateAstNode.java
@@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
import org.apache.pinot.common.request.FilterOperator;
import org.apache.pinot.common.utils.StringUtil;
import org.apache.pinot.common.utils.request.FilterQueryTree;
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/StarColumnListAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/StarColumnListAstNode.java
index 5a05378..61142a0 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/StarColumnListAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/StarColumnListAstNode.java
@@ -18,10 +18,10 @@
*/
package org.apache.pinot.pql.parsers.pql2.ast;
-import org.apache.pinot.common.request.BrokerRequest;
-import org.apache.pinot.common.request.Selection;
import java.util.ArrayList;
import java.util.List;
+import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.Selection;
/**
diff --git a/pinot-common/src/main/java/org/apache/pinot/startree/hll/HllConfig.java b/pinot-common/src/main/java/org/apache/pinot/startree/hll/HllConfig.java
index 7b9be85..b7413c4 100644
--- a/pinot-common/src/main/java/org/apache/pinot/startree/hll/HllConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/startree/hll/HllConfig.java
@@ -21,8 +21,6 @@ package org.apache.pinot.startree.hll;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.google.common.base.Preconditions;
-import org.apache.pinot.common.config.ConfigKey;
-import org.apache.pinot.common.utils.JsonUtils;
import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet;
@@ -30,6 +28,8 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
+import org.apache.pinot.common.config.ConfigKey;
+import org.apache.pinot.common.utils.JsonUtils;
import static org.apache.pinot.common.utils.EqualityUtils.*;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/config/IndexingConfigTest.java b/pinot-common/src/test/java/org/apache/pinot/common/config/IndexingConfigTest.java
index 723f1b2..054f0ae 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/config/IndexingConfigTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/config/IndexingConfigTest.java
@@ -18,8 +18,6 @@
*/
package org.apache.pinot.common.config;
-import org.apache.pinot.common.data.StarTreeIndexSpec;
-import org.apache.pinot.common.utils.JsonUtils;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
@@ -28,6 +26,8 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Set;
+import org.apache.pinot.common.data.StarTreeIndexSpec;
+import org.apache.pinot.common.utils.JsonUtils;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/config/QuotaConfigTest.java b/pinot-common/src/test/java/org/apache/pinot/common/config/QuotaConfigTest.java
index a692ad0..5f53319 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/config/QuotaConfigTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/config/QuotaConfigTest.java
@@ -18,9 +18,9 @@
*/
package org.apache.pinot.common.config;
-import org.apache.pinot.common.utils.JsonUtils;
import java.io.IOException;
import org.apache.commons.configuration.ConfigurationRuntimeException;
+import org.apache.pinot.common.utils.JsonUtils;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/config/TableConfigTest.java b/pinot-common/src/test/java/org/apache/pinot/common/config/TableConfigTest.java
index 19c4dc3..eef3cf1 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/config/TableConfigTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/config/TableConfigTest.java
@@ -18,13 +18,13 @@
*/
package org.apache.pinot.common.config;
-import org.apache.pinot.common.data.StarTreeIndexSpec;
-import org.apache.pinot.common.utils.CommonConstants.Helix.TableType;
-import org.apache.pinot.startree.hll.HllConfig;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import org.apache.helix.ZNRecord;
+import org.apache.pinot.common.data.StarTreeIndexSpec;
+import org.apache.pinot.common.utils.CommonConstants.Helix.TableType;
+import org.apache.pinot.startree.hll.HllConfig;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/config/TagOverrideConfigTest.java b/pinot-common/src/test/java/org/apache/pinot/common/config/TagOverrideConfigTest.java
index a96f29e..e0f0d1e 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/config/TagOverrideConfigTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/config/TagOverrideConfigTest.java
@@ -18,9 +18,9 @@
*/
package org.apache.pinot.common.config;
-import org.apache.pinot.common.utils.CommonConstants;
import java.util.ArrayList;
import java.util.List;
+import org.apache.pinot.common.utils.CommonConstants;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/config/TenantTest.java b/pinot-common/src/test/java/org/apache/pinot/common/config/TenantTest.java
index c8467ee..dad4aca 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/config/TenantTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/config/TenantTest.java
@@ -18,9 +18,9 @@
*/
package org.apache.pinot.common.config;
+import java.io.IOException;
import org.apache.pinot.common.utils.JsonUtils;
import org.apache.pinot.common.utils.TenantRole;
-import java.io.IOException;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/config/TestConfigSerialization.java b/pinot-common/src/test/java/org/apache/pinot/common/config/TestConfigSerialization.java
index 4c670a2..e942a2d 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/config/TestConfigSerialization.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/config/TestConfigSerialization.java
@@ -19,11 +19,6 @@
package org.apache.pinot.common.config;
import com.google.common.collect.Lists;
-import org.apache.pinot.common.config.CombinedConfig;
-import org.apache.pinot.common.config.CombinedConfigLoader;
-import org.apache.pinot.common.config.Deserializer;
-import org.apache.pinot.common.config.Serializer;
-import org.apache.pinot.common.config.TableConfig;
import io.vavr.collection.Map;
import java.io.File;
import org.testng.Assert;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/data/DateTimeFormatSpecTest.java b/pinot-common/src/test/java/org/apache/pinot/common/data/DateTimeFormatSpecTest.java
index 65768cb..9660d56 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/data/DateTimeFormatSpecTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/data/DateTimeFormatSpecTest.java
@@ -18,11 +18,11 @@
*/
package org.apache.pinot.common.data;
-import org.apache.pinot.common.data.DateTimeFieldSpec.TimeFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.TimeZone;
import java.util.concurrent.TimeUnit;
+import org.apache.pinot.common.data.DateTimeFieldSpec.TimeFormat;
import org.joda.time.DateTimeZone;
import org.joda.time.format.DateTimeFormat;
import org.testng.Assert;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/data/DateTimeGranularitySpecTest.java b/pinot-common/src/test/java/org/apache/pinot/common/data/DateTimeGranularitySpecTest.java
index f9146d6..2ddff7c 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/data/DateTimeGranularitySpecTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/data/DateTimeGranularitySpecTest.java
@@ -17,10 +17,10 @@
* under the License.
*/
package org.apache.pinot.common.data;
+
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
-
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/data/FieldSpecTest.java b/pinot-common/src/test/java/org/apache/pinot/common/data/FieldSpecTest.java
index 44dd161..c43f870 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/data/FieldSpecTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/data/FieldSpecTest.java
@@ -18,13 +18,13 @@
*/
package org.apache.pinot.common.data;
-import org.apache.pinot.common.utils.JsonUtils;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Random;
import java.util.concurrent.TimeUnit;
import org.apache.avro.Schema;
+import org.apache.pinot.common.utils.JsonUtils;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/data/SchemaTest.java b/pinot-common/src/test/java/org/apache/pinot/common/data/SchemaTest.java
index 027ce32..ec2572c 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/data/SchemaTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/data/SchemaTest.java
@@ -18,14 +18,14 @@
*/
package org.apache.pinot.common.data;
-import org.apache.pinot.common.data.TimeGranularitySpec.TimeFormat;
-import org.apache.pinot.common.utils.SchemaUtils;
import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.concurrent.TimeUnit;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Hex;
+import org.apache.pinot.common.data.TimeGranularitySpec.TimeFormat;
+import org.apache.pinot.common.utils.SchemaUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/lineage/SegmentMergeLineageTest.java b/pinot-common/src/test/java/org/apache/pinot/common/lineage/SegmentMergeLineageTest.java
index 780e5b4..f9ec814 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/lineage/SegmentMergeLineageTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/lineage/SegmentMergeLineageTest.java
@@ -18,11 +18,11 @@
*/
package org.apache.pinot.common.lineage;
-import org.apache.pinot.common.exception.InvalidConfigException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
+import org.apache.pinot.common.exception.InvalidConfigException;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/metadata/InstanceZKMetadataTest.java b/pinot-common/src/test/java/org/apache/pinot/common/metadata/InstanceZKMetadataTest.java
index 9771a1b..9d256d4 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/metadata/InstanceZKMetadataTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/metadata/InstanceZKMetadataTest.java
@@ -20,13 +20,11 @@ package org.apache.pinot.common.metadata;
import java.util.HashMap;
import java.util.Map;
-
import org.apache.helix.ZNRecord;
+import org.apache.pinot.common.metadata.instance.InstanceZKMetadata;
import org.testng.Assert;
import org.testng.annotations.Test;
-import org.apache.pinot.common.metadata.instance.InstanceZKMetadata;
-
public class InstanceZKMetadataTest {
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/metadata/MetadataEqualsHashCodeTest.java b/pinot-common/src/test/java/org/apache/pinot/common/metadata/MetadataEqualsHashCodeTest.java
index 17c2692..7cc1449 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/metadata/MetadataEqualsHashCodeTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/metadata/MetadataEqualsHashCodeTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.pinot.common.metadata;
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
import org.apache.pinot.common.data.DateTimeFieldSpec;
import org.apache.pinot.common.data.DimensionFieldSpec;
import org.apache.pinot.common.data.MetricFieldSpec;
@@ -27,8 +29,6 @@ import org.apache.pinot.common.metadata.instance.InstanceZKMetadata;
import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
import org.apache.pinot.common.metadata.segment.RealtimeSegmentZKMetadata;
import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
-import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
import org.testng.annotations.Test;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/metadata/MetadataUtils.java b/pinot-common/src/test/java/org/apache/pinot/common/metadata/MetadataUtils.java
index 2ffacdb..35f1499 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/metadata/MetadataUtils.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/metadata/MetadataUtils.java
@@ -21,7 +21,6 @@ package org.apache.pinot.common.metadata;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
-
import org.apache.helix.ZNRecord;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/metadata/SegmentZKMetadataTest.java b/pinot-common/src/test/java/org/apache/pinot/common/metadata/SegmentZKMetadataTest.java
index f9b51d9..1df2e5f 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/metadata/SegmentZKMetadataTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/metadata/SegmentZKMetadataTest.java
@@ -18,6 +18,13 @@
*/
package org.apache.pinot.common.metadata;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import org.apache.commons.lang.math.IntRange;
+import org.apache.helix.ZNRecord;
import org.apache.pinot.common.metadata.segment.ColumnPartitionMetadata;
import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
import org.apache.pinot.common.metadata.segment.RealtimeSegmentZKMetadata;
@@ -26,13 +33,6 @@ import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.common.utils.CommonConstants.Segment.Realtime.Status;
import org.apache.pinot.common.utils.CommonConstants.Segment.SegmentType;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import org.apache.commons.lang.math.IntRange;
-import org.apache.helix.ZNRecord;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/metrics/MetricsHelperTest.java b/pinot-common/src/test/java/org/apache/pinot/common/metrics/MetricsHelperTest.java
index 7362ef8..980dbb6 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/metrics/MetricsHelperTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/metrics/MetricsHelperTest.java
@@ -27,7 +27,7 @@ import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.MapConfiguration;
import org.testng.annotations.Test;
-import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.*;
/**
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/partition/IdealStateBuilderUtil.java b/pinot-common/src/test/java/org/apache/pinot/common/partition/IdealStateBuilderUtil.java
index dc659ef..fbd6459 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/partition/IdealStateBuilderUtil.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/partition/IdealStateBuilderUtil.java
@@ -19,13 +19,13 @@
package org.apache.pinot.common.partition;
import com.google.common.collect.Lists;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.utils.LLCSegmentName;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.helix.model.IdealState;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.utils.LLCSegmentName;
import static org.apache.pinot.common.utils.CommonConstants.Helix.StateModel.RealtimeSegmentOnlineOfflineStateModel.*;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/partition/StreamPartitionAssignmentGeneratorTest.java b/pinot-common/src/test/java/org/apache/pinot/common/partition/StreamPartitionAssignmentGeneratorTest.java
index d1f72ca..a41764c 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/partition/StreamPartitionAssignmentGeneratorTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/partition/StreamPartitionAssignmentGeneratorTest.java
@@ -19,10 +19,6 @@
package org.apache.pinot.common.partition;
import com.google.common.collect.Lists;
-import org.apache.pinot.common.config.SegmentsValidationAndRetentionConfig;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.config.TenantConfig;
-import org.apache.pinot.common.utils.LLCSegmentName;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -32,6 +28,10 @@ import java.util.Set;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.helix.HelixManager;
import org.apache.helix.model.IdealState;
+import org.apache.pinot.common.config.SegmentsValidationAndRetentionConfig;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.config.TenantConfig;
+import org.apache.pinot.common.utils.LLCSegmentName;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/query/gen/AvroQueryGenerator.java b/pinot-common/src/test/java/org/apache/pinot/common/query/gen/AvroQueryGenerator.java
index 801132a..e8d3a34 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/query/gen/AvroQueryGenerator.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/query/gen/AvroQueryGenerator.java
@@ -29,7 +29,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Random;
-
import org.apache.avro.Schema;
import org.apache.avro.Schema.Field;
import org.apache.avro.Schema.Type;
@@ -41,7 +40,6 @@ import org.apache.avro.generic.GenericRecord;
import org.apache.avro.util.Utf8;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Predicate;
-
import org.apache.pinot.common.data.FieldSpec.DataType;
public class AvroQueryGenerator {
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/DataSchemaTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/DataSchemaTest.java
index ce25a70..6b505be 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/utils/DataSchemaTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/DataSchemaTest.java
@@ -18,8 +18,8 @@
*/
package org.apache.pinot.common.utils;
-import org.apache.pinot.common.data.FieldSpec;
import java.util.Arrays;
+import org.apache.pinot.common.data.FieldSpec;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/FileUploadDownloadClientTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/FileUploadDownloadClientTest.java
index 3e5fe2f..fd43516 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/utils/FileUploadDownloadClientTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/FileUploadDownloadClientTest.java
@@ -19,7 +19,6 @@
package org.apache.pinot.common.utils;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.pinot.common.utils.FileUploadDownloadClient.FileUploadType;
import com.sun.net.httpserver.Headers;
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
@@ -36,6 +35,7 @@ import org.apache.http.Header;
import org.apache.http.HttpStatus;
import org.apache.http.NameValuePair;
import org.apache.http.message.BasicHeader;
+import org.apache.pinot.common.utils.FileUploadDownloadClient.FileUploadType;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/SegmentNameBuilderTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/SegmentNameBuilderTest.java
index 8e5ae73..60569a6 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/utils/SegmentNameBuilderTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/SegmentNameBuilderTest.java
@@ -21,8 +21,8 @@ package org.apache.pinot.common.utils;
import java.util.Arrays;
import org.testng.Assert;
import org.testng.annotations.Test;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+
+import static org.testng.Assert.*;
/**
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/UtilsTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/UtilsTest.java
index 254b073..2ca5113 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/utils/UtilsTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/UtilsTest.java
@@ -18,9 +18,9 @@
*/
package org.apache.pinot.common.utils;
+import java.util.concurrent.TimeUnit;
import org.apache.pinot.common.Utils;
import org.apache.pinot.common.utils.time.TimeUtils;
-import java.util.concurrent.TimeUnit;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/time/TimeConverterTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/time/TimeConverterTest.java
index a6db55c..2541c66 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/utils/time/TimeConverterTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/time/TimeConverterTest.java
@@ -18,9 +18,9 @@
*/
package org.apache.pinot.common.utils.time;
+import java.util.concurrent.TimeUnit;
import org.apache.pinot.common.data.FieldSpec;
import org.apache.pinot.common.data.TimeGranularitySpec;
-import java.util.concurrent.TimeUnit;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
diff --git a/pinot-common/src/test/java/org/apache/pinot/pql/parsers/Pql2CompilerTest.java b/pinot-common/src/test/java/org/apache/pinot/pql/parsers/Pql2CompilerTest.java
index d01ae6f..496e58e 100644
--- a/pinot-common/src/test/java/org/apache/pinot/pql/parsers/Pql2CompilerTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/pql/parsers/Pql2CompilerTest.java
@@ -18,14 +18,14 @@
*/
package org.apache.pinot.pql.parsers;
+import java.util.Collections;
+import java.util.List;
import org.apache.pinot.common.request.AggregationInfo;
import org.apache.pinot.common.request.BrokerRequest;
import org.apache.pinot.common.request.FilterOperator;
import org.apache.pinot.common.request.GroupBy;
import org.apache.pinot.common.request.transform.TransformExpressionTree;
import org.apache.pinot.pql.parsers.pql2.ast.TopAstNode;
-import java.util.Collections;
-import java.util.List;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/pinot-common/src/test/java/org/apache/pinot/request/BrokerRequestSerializationTest.java b/pinot-common/src/test/java/org/apache/pinot/request/BrokerRequestSerializationTest.java
index a5db9d6..f8864fe 100644
--- a/pinot-common/src/test/java/org/apache/pinot/request/BrokerRequestSerializationTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/request/BrokerRequestSerializationTest.java
@@ -20,14 +20,6 @@ package org.apache.pinot.request;
import java.util.ArrayList;
import java.util.List;
-
-import org.apache.thrift.TException;
-import org.apache.thrift.TSerializer;
-import org.apache.thrift.protocol.TCompactProtocol;
-import org.testng.annotations.Test;
-
-import org.apache.pinot.common.metrics.MetricsHelper;
-import org.apache.pinot.common.metrics.MetricsHelper.TimerContext;
import org.apache.pinot.common.request.AggregationInfo;
import org.apache.pinot.common.request.BrokerRequest;
import org.apache.pinot.common.request.FilterOperator;
@@ -38,6 +30,10 @@ import org.apache.pinot.common.request.QuerySource;
import org.apache.pinot.common.request.QueryType;
import org.apache.pinot.common.request.Selection;
import org.apache.pinot.common.request.SelectionSort;
+import org.apache.thrift.TException;
+import org.apache.thrift.TSerializer;
+import org.apache.thrift.protocol.TCompactProtocol;
+import org.testng.annotations.Test;
public class BrokerRequestSerializationTest {
diff --git a/pinot-common/src/test/java/org/apache/pinot/request/BrokerResponseNativeTest.java b/pinot-common/src/test/java/org/apache/pinot/request/BrokerResponseNativeTest.java
index 256bcc4..264b2d3 100644
--- a/pinot-common/src/test/java/org/apache/pinot/request/BrokerResponseNativeTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/request/BrokerResponseNativeTest.java
@@ -18,10 +18,10 @@
*/
package org.apache.pinot.request;
+import java.io.IOException;
import org.apache.pinot.common.exception.QueryException;
import org.apache.pinot.common.response.broker.BrokerResponseNative;
import org.apache.pinot.common.response.broker.QueryProcessingException;
-import java.io.IOException;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java
index 0651e4d..31f8abf 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java
@@ -18,10 +18,6 @@
*/
package org.apache.pinot.controller;
-import org.apache.pinot.common.protocols.SegmentCompletionProtocol;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.StringUtil;
-import org.apache.pinot.filesystem.LocalPinotFS;
import java.io.File;
import java.io.UnsupportedEncodingException;
import java.net.URI;
@@ -32,6 +28,10 @@ import java.util.List;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.pinot.common.protocols.SegmentCompletionProtocol;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.StringUtil;
+import org.apache.pinot.filesystem.LocalPinotFS;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerStarter.java b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerStarter.java
index 0dd7dfa..370a13c 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerStarter.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerStarter.java
@@ -20,6 +20,22 @@ package org.apache.pinot.controller;
import com.google.common.primitives.Longs;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yammer.metrics.core.MetricsRegistry;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.httpclient.HttpConnectionManager;
+import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
+import org.apache.commons.io.FileUtils;
+import org.apache.helix.HelixManager;
+import org.apache.helix.task.TaskDriver;
import org.apache.pinot.common.Utils;
import org.apache.pinot.common.metrics.ControllerMeter;
import org.apache.pinot.common.metrics.ControllerMetrics;
@@ -47,22 +63,6 @@ import org.apache.pinot.controller.validation.RealtimeSegmentValidationManager;
import org.apache.pinot.core.crypt.PinotCrypterFactory;
import org.apache.pinot.core.periodictask.PeriodicTask;
import org.apache.pinot.filesystem.PinotFSFactory;
-import com.yammer.metrics.core.MetricsRegistry;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.httpclient.HttpConnectionManager;
-import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
-import org.apache.commons.io.FileUtils;
-import org.apache.helix.HelixManager;
-import org.apache.helix.task.TaskDriver;
import org.glassfish.hk2.utilities.binding.AbstractBinder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/ControllerAdminApiApplication.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/ControllerAdminApiApplication.java
index 48fcc03..f282815 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/ControllerAdminApiApplication.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/ControllerAdminApiApplication.java
@@ -18,10 +18,15 @@
*/
package org.apache.pinot.controller.api;
+import com.google.common.base.Preconditions;
+import io.swagger.jaxrs.config.BeanConfig;
import java.io.IOException;
import java.net.URI;
import java.net.URL;
import java.net.URLClassLoader;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
import org.glassfish.grizzly.http.server.CLStaticHttpHandler;
import org.glassfish.grizzly.http.server.HttpServer;
import org.glassfish.hk2.utilities.binding.AbstractBinder;
@@ -31,11 +36,6 @@ import org.glassfish.jersey.media.multipart.MultiPartFeature;
import org.glassfish.jersey.server.ResourceConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Preconditions;
-import io.swagger.jaxrs.config.BeanConfig;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
public class ControllerAdminApiApplication extends ResourceConfig {
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/pojos/Instance.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/pojos/Instance.java
index 315bf18..c27a3b7 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/pojos/Instance.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/pojos/Instance.java
@@ -20,8 +20,8 @@ package org.apache.pinot.controller.api.pojos;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.pinot.common.utils.CommonConstants;
import org.apache.helix.model.InstanceConfig;
+import org.apache.pinot.common.utils.CommonConstants;
/**
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/Constants.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/Constants.java
index 1fa232a..5879a3c 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/Constants.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/Constants.java
@@ -18,10 +18,10 @@
*/
package org.apache.pinot.controller.api.resources;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-import org.apache.pinot.common.utils.CommonConstants;
import javax.ws.rs.WebApplicationException;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class Constants {
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ControllerResponseFilter.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ControllerResponseFilter.java
index 4021b6a..c76976d 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ControllerResponseFilter.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ControllerResponseFilter.java
@@ -19,14 +19,14 @@
package org.apache.pinot.controller.api.resources;
import java.io.IOException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerResponseContext;
import javax.ws.rs.container.ContainerResponseFilter;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.ext.Provider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
// TODO Remove this class and find out how to use LoggingFeature as described in
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/FileUploadPathProvider.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/FileUploadPathProvider.java
index 965e912..5629354 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/FileUploadPathProvider.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/FileUploadPathProvider.java
@@ -18,15 +18,15 @@
*/
package org.apache.pinot.controller.api.resources;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import org.apache.commons.lang.StringUtils;
import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.controller.ControllerConf;
import org.apache.pinot.filesystem.LocalPinotFS;
import org.apache.pinot.filesystem.PinotFS;
import org.apache.pinot.filesystem.PinotFSFactory;
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/HeaderAdder.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/HeaderAdder.java
index dac534c..63da9d1 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/HeaderAdder.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/HeaderAdder.java
@@ -21,14 +21,14 @@ package org.apache.pinot.controller.api.resources;
import java.io.IOException;
import java.net.URI;
import javax.annotation.Priority;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
import javax.ws.rs.container.PreMatching;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.ext.Provider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
// A class to add the headers that we expect from clients. Pre-jersey API, the clients have been lax in specifying the
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/LLCSegmentCompletionHandlers.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/LLCSegmentCompletionHandlers.java
index 62768d9..b878286 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/LLCSegmentCompletionHandlers.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/LLCSegmentCompletionHandlers.java
@@ -19,14 +19,6 @@
package org.apache.pinot.controller.api.resources;
import com.google.common.annotations.VisibleForTesting;
-import org.apache.pinot.common.protocols.SegmentCompletionProtocol;
-import org.apache.pinot.common.utils.LLCSegmentName;
-import org.apache.pinot.common.utils.StringUtil;
-import org.apache.pinot.controller.ControllerConf;
-import org.apache.pinot.controller.helix.core.realtime.SegmentCompletionManager;
-import org.apache.pinot.controller.util.SegmentCompletionUtils;
-import org.apache.pinot.filesystem.PinotFS;
-import org.apache.pinot.filesystem.PinotFSFactory;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -47,6 +39,14 @@ import javax.ws.rs.core.MediaType;
import org.apache.commons.httpclient.URI;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
+import org.apache.pinot.common.protocols.SegmentCompletionProtocol;
+import org.apache.pinot.common.utils.LLCSegmentName;
+import org.apache.pinot.common.utils.StringUtil;
+import org.apache.pinot.controller.ControllerConf;
+import org.apache.pinot.controller.helix.core.realtime.SegmentCompletionManager;
+import org.apache.pinot.controller.util.SegmentCompletionUtils;
+import org.apache.pinot.filesystem.PinotFS;
+import org.apache.pinot.filesystem.PinotFSFactory;
import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.slf4j.Logger;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/LandingPageHandler.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/LandingPageHandler.java
index b3ea977..e9bfe45 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/LandingPageHandler.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/LandingPageHandler.java
@@ -19,12 +19,12 @@
package org.apache.pinot.controller.api.resources;
import java.io.InputStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Path("/")
public class LandingPageHandler {
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotControllerHealthCheck.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotControllerHealthCheck.java
index 39e4b62..4feb8d7 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotControllerHealthCheck.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotControllerHealthCheck.java
@@ -18,10 +18,6 @@
*/
package org.apache.pinot.controller.api.resources;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import org.apache.commons.lang.StringUtils;
-import org.apache.pinot.controller.ControllerConf;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -29,6 +25,10 @@ import io.swagger.annotations.ApiResponses;
import javax.inject.Inject;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import org.apache.commons.lang.StringUtils;
+import org.apache.pinot.controller.ControllerConf;
@Api(tags = Constants.HEALTH_TAG)
@Path("/pinot-controller/admin")
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotControllerResponseFilter.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotControllerResponseFilter.java
index 8500bf6..2d01c85 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotControllerResponseFilter.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotControllerResponseFilter.java
@@ -18,15 +18,15 @@
*/
package org.apache.pinot.controller.api.resources;
-import org.apache.pinot.common.Utils;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.NetUtil;
import java.io.IOException;
import javax.inject.Singleton;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerResponseContext;
import javax.ws.rs.container.ContainerResponseFilter;
import javax.ws.rs.ext.Provider;
+import org.apache.pinot.common.Utils;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.NetUtil;
// A class to add the controller host and version in the response headers for all APIs.
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResource.java
index a4e7878..b6f9bac 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResource.java
@@ -20,10 +20,6 @@ package org.apache.pinot.controller.api.resources;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.pinot.common.utils.JsonUtils;
-import org.apache.pinot.controller.api.pojos.Instance;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
-import org.apache.pinot.controller.helix.core.PinotResourceManagerResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -41,6 +37,10 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.helix.model.InstanceConfig;
+import org.apache.pinot.common.utils.JsonUtils;
+import org.apache.pinot.controller.api.pojos.Instance;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
+import org.apache.pinot.controller.helix.core.PinotResourceManagerResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSchemaRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSchemaRestletResource.java
index c155d2d..ec743bb 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSchemaRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSchemaRestletResource.java
@@ -19,14 +19,6 @@
package org.apache.pinot.controller.api.resources;
import com.fasterxml.jackson.databind.node.ArrayNode;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.data.Schema;
-import org.apache.pinot.common.metrics.ControllerMeter;
-import org.apache.pinot.common.metrics.ControllerMetrics;
-import org.apache.pinot.common.utils.JsonUtils;
-import org.apache.pinot.controller.api.events.MetadataEventNotifierFactory;
-import org.apache.pinot.controller.api.events.SchemaEventType;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -47,6 +39,14 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.data.Schema;
+import org.apache.pinot.common.metrics.ControllerMeter;
+import org.apache.pinot.common.metrics.ControllerMetrics;
+import org.apache.pinot.common.utils.JsonUtils;
+import org.apache.pinot.controller.api.events.MetadataEventNotifierFactory;
+import org.apache.pinot.controller.api.events.SchemaEventType;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.slf4j.Logger;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentRestletResource.java
index 6a32b73..6a977b0 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentRestletResource.java
@@ -21,14 +21,6 @@ package org.apache.pinot.controller.api.resources;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.metadata.ZKMetadataProvider;
-import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
-import org.apache.pinot.common.metadata.segment.RealtimeSegmentZKMetadata;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.JsonUtils;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
-import org.apache.pinot.controller.helix.core.PinotResourceManagerResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -54,6 +46,14 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.helix.ZNRecord;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
+import org.apache.pinot.common.metadata.segment.RealtimeSegmentZKMetadata;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.JsonUtils;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
+import org.apache.pinot.controller.helix.core.PinotResourceManagerResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentUploadRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentUploadRestletResource.java
index 2f85867..c9bf7cf 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentUploadRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentUploadRestletResource.java
@@ -20,28 +20,6 @@ package org.apache.pinot.controller.api.resources;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.metrics.ControllerMeter;
-import org.apache.pinot.common.metrics.ControllerMetrics;
-import org.apache.pinot.common.segment.SegmentMetadata;
-import org.apache.pinot.common.segment.fetcher.SegmentFetcherFactory;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.FileUploadDownloadClient;
-import org.apache.pinot.common.utils.JsonUtils;
-import org.apache.pinot.common.utils.StringUtil;
-import org.apache.pinot.common.utils.helix.HelixHelper;
-import org.apache.pinot.controller.ControllerConf;
-import org.apache.pinot.controller.api.access.AccessControl;
-import org.apache.pinot.controller.api.access.AccessControlFactory;
-import org.apache.pinot.controller.api.upload.SegmentValidator;
-import org.apache.pinot.controller.api.upload.ZKOperator;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
-import org.apache.pinot.controller.helix.core.PinotHelixSegmentOnlineOfflineStateModelGenerator;
-import org.apache.pinot.core.crypt.NoOpPinotCrypter;
-import org.apache.pinot.core.crypt.PinotCrypter;
-import org.apache.pinot.core.crypt.PinotCrypterFactory;
-import org.apache.pinot.core.metadata.DefaultMetadataExtractor;
-import org.apache.pinot.core.metadata.MetadataExtractorFactory;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -80,6 +58,28 @@ import org.apache.commons.httpclient.HttpConnectionManager;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.helix.model.IdealState;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.metrics.ControllerMeter;
+import org.apache.pinot.common.metrics.ControllerMetrics;
+import org.apache.pinot.common.segment.SegmentMetadata;
+import org.apache.pinot.common.segment.fetcher.SegmentFetcherFactory;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.FileUploadDownloadClient;
+import org.apache.pinot.common.utils.JsonUtils;
+import org.apache.pinot.common.utils.StringUtil;
+import org.apache.pinot.common.utils.helix.HelixHelper;
+import org.apache.pinot.controller.ControllerConf;
+import org.apache.pinot.controller.api.access.AccessControl;
+import org.apache.pinot.controller.api.access.AccessControlFactory;
+import org.apache.pinot.controller.api.upload.SegmentValidator;
+import org.apache.pinot.controller.api.upload.ZKOperator;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
+import org.apache.pinot.controller.helix.core.PinotHelixSegmentOnlineOfflineStateModelGenerator;
+import org.apache.pinot.core.crypt.NoOpPinotCrypter;
+import org.apache.pinot.core.crypt.PinotCrypter;
+import org.apache.pinot.core.crypt.PinotCrypterFactory;
+import org.apache.pinot.core.metadata.DefaultMetadataExtractor;
+import org.apache.pinot.core.metadata.MetadataExtractorFactory;
import org.glassfish.grizzly.http.server.Request;
import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableConfigRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableConfigRestletResource.java
index c3cf687..db376ef 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableConfigRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableConfigRestletResource.java
@@ -18,13 +18,6 @@
*/
package org.apache.pinot.controller.api.resources;
-import org.apache.pinot.common.config.CombinedConfig;
-import org.apache.pinot.common.config.Deserializer;
-import org.apache.pinot.common.config.Serializer;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.data.Schema;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import io.swagger.annotations.ApiOperation;
import java.io.IOException;
import java.util.List;
@@ -40,6 +33,13 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Request;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Variant;
+import org.apache.pinot.common.config.CombinedConfig;
+import org.apache.pinot.common.config.Deserializer;
+import org.apache.pinot.common.config.Serializer;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.data.Schema;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableIndexingConfigs.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableIndexingConfigs.java
index ffaf471..7ea8493 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableIndexingConfigs.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableIndexingConfigs.java
@@ -18,8 +18,6 @@
*/
package org.apache.pinot.controller.api.resources;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -33,6 +31,8 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableInstances.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableInstances.java
index 2f62422..92237e9 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableInstances.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableInstances.java
@@ -20,9 +20,6 @@ package org.apache.pinot.controller.api.resources;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.pinot.common.utils.CommonConstants.Helix.TableType;
-import org.apache.pinot.common.utils.JsonUtils;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -36,6 +33,9 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
+import org.apache.pinot.common.utils.CommonConstants.Helix.TableType;
+import org.apache.pinot.common.utils.JsonUtils;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
@Api(tags = Constants.TABLE_TAG)
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableMetadataConfigs.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableMetadataConfigs.java
index 950c6e9..c6d1e0b 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableMetadataConfigs.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableMetadataConfigs.java
@@ -18,8 +18,6 @@
*/
package org.apache.pinot.controller.api.resources;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -31,6 +29,8 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableRestletResource.java
index e0dec16..c10144c 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableRestletResource.java
@@ -21,23 +21,6 @@ package org.apache.pinot.controller.api.resources;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Preconditions;
-import org.apache.pinot.common.config.SegmentsValidationAndRetentionConfig;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.exception.InvalidConfigException;
-import org.apache.pinot.common.exception.TableNotFoundException;
-import org.apache.pinot.common.metrics.ControllerMeter;
-import org.apache.pinot.common.metrics.ControllerMetrics;
-import org.apache.pinot.common.restlet.resources.RebalanceResult;
-import org.apache.pinot.common.restlet.resources.ResourceUtils;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.CommonConstants.Helix.TableType;
-import org.apache.pinot.common.utils.JsonUtils;
-import org.apache.pinot.controller.ControllerConf;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
-import org.apache.pinot.controller.helix.core.PinotResourceManagerResponse;
-import org.apache.pinot.controller.helix.core.rebalance.RebalanceUserConfigConstants;
-import org.apache.pinot.core.realtime.stream.StreamConfig;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -62,6 +45,23 @@ import javax.ws.rs.core.Response;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.lang3.EnumUtils;
+import org.apache.pinot.common.config.SegmentsValidationAndRetentionConfig;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.exception.InvalidConfigException;
+import org.apache.pinot.common.exception.TableNotFoundException;
+import org.apache.pinot.common.metrics.ControllerMeter;
+import org.apache.pinot.common.metrics.ControllerMetrics;
+import org.apache.pinot.common.restlet.resources.RebalanceResult;
+import org.apache.pinot.common.restlet.resources.ResourceUtils;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.CommonConstants.Helix.TableType;
+import org.apache.pinot.common.utils.JsonUtils;
+import org.apache.pinot.controller.ControllerConf;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
+import org.apache.pinot.controller.helix.core.PinotResourceManagerResponse;
+import org.apache.pinot.controller.helix.core.rebalance.RebalanceUserConfigConstants;
+import org.apache.pinot.core.realtime.stream.StreamConfig;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableSchema.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableSchema.java
index 4721b5b..cb41ab5 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableSchema.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableSchema.java
@@ -18,8 +18,6 @@
*/
package org.apache.pinot.controller.api.resources;
-import org.apache.pinot.common.data.Schema;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -32,6 +30,8 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.pinot.common.data.Schema;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableSegmentConfigs.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableSegmentConfigs.java
index e33e0ae..5e66a19 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableSegmentConfigs.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableSegmentConfigs.java
@@ -18,10 +18,6 @@
*/
package org.apache.pinot.controller.api.resources;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.metrics.ControllerMeter;
-import org.apache.pinot.common.metrics.ControllerMetrics;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -35,6 +31,10 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.metrics.ControllerMeter;
+import org.apache.pinot.common.metrics.ControllerMetrics;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableTenantConfigs.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableTenantConfigs.java
index b743ab5..219320c 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableTenantConfigs.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableTenantConfigs.java
@@ -18,10 +18,6 @@
*/
package org.apache.pinot.controller.api.resources;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.exception.InvalidConfigException;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
-import org.apache.pinot.controller.helix.core.PinotResourceManagerResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -34,6 +30,9 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.pinot.common.exception.InvalidConfigException;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
+import org.apache.pinot.controller.helix.core.PinotResourceManagerResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTaskRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTaskRestletResource.java
index 4ee835d..e776a11 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTaskRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTaskRestletResource.java
@@ -18,9 +18,6 @@
*/
package org.apache.pinot.controller.api.resources;
-import org.apache.pinot.common.config.PinotTaskConfig;
-import org.apache.pinot.controller.helix.core.minion.PinotHelixTaskResourceManager;
-import org.apache.pinot.controller.helix.core.minion.PinotTaskManager;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -36,6 +33,9 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.QueryParam;
import javax.ws.rs.WebApplicationException;
import org.apache.helix.task.TaskState;
+import org.apache.pinot.common.config.PinotTaskConfig;
+import org.apache.pinot.controller.helix.core.minion.PinotHelixTaskResourceManager;
+import org.apache.pinot.controller.helix.core.minion.PinotTaskManager;
@Api(tags = Constants.TASK_TAG)
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTenantRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTenantRestletResource.java
index be1969a..70c4402 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTenantRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTenantRestletResource.java
@@ -21,14 +21,6 @@ package org.apache.pinot.controller.api.resources;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.config.Tenant;
-import org.apache.pinot.common.metrics.ControllerMeter;
-import org.apache.pinot.common.metrics.ControllerMetrics;
-import org.apache.pinot.common.utils.JsonUtils;
-import org.apache.pinot.common.utils.TenantRole;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
-import org.apache.pinot.controller.helix.core.PinotResourceManagerResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -50,6 +42,14 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.config.Tenant;
+import org.apache.pinot.common.metrics.ControllerMeter;
+import org.apache.pinot.common.metrics.ControllerMetrics;
+import org.apache.pinot.common.utils.JsonUtils;
+import org.apache.pinot.common.utils.TenantRole;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
+import org.apache.pinot.controller.helix.core.PinotResourceManagerResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotVersionRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotVersionRestletResource.java
index 1d41044..d490754 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotVersionRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotVersionRestletResource.java
@@ -19,8 +19,6 @@
package org.apache.pinot.controller.api.resources;
import com.fasterxml.jackson.core.JsonProcessingException;
-import org.apache.pinot.common.Utils;
-import org.apache.pinot.common.utils.JsonUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -29,6 +27,8 @@ import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
+import org.apache.pinot.common.Utils;
+import org.apache.pinot.common.utils.JsonUtils;
/**
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PqlQueryResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PqlQueryResource.java
index e7628ce..6f474d9 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PqlQueryResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PqlQueryResource.java
@@ -20,15 +20,6 @@ package org.apache.pinot.controller.api.resources;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.pinot.common.Utils;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.exception.QueryException;
-import org.apache.pinot.common.request.BrokerRequest;
-import org.apache.pinot.common.utils.JsonUtils;
-import org.apache.pinot.controller.api.access.AccessControl;
-import org.apache.pinot.controller.api.access.AccessControlFactory;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
-import org.apache.pinot.pql.parsers.Pql2Compiler;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
@@ -50,6 +41,15 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import org.apache.helix.model.InstanceConfig;
+import org.apache.pinot.common.Utils;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.exception.QueryException;
+import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.utils.JsonUtils;
+import org.apache.pinot.controller.api.access.AccessControl;
+import org.apache.pinot.controller.api.access.AccessControlFactory;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
+import org.apache.pinot.pql.parsers.Pql2Compiler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ServerTableSizeReader.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ServerTableSizeReader.java
index ac4e34c..bcdbcaa 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ServerTableSizeReader.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ServerTableSizeReader.java
@@ -19,10 +19,6 @@
package org.apache.pinot.controller.api.resources;
import com.google.common.collect.BiMap;
-import org.apache.pinot.common.http.MultiGetRequest;
-import org.apache.pinot.common.restlet.resources.SegmentSizeInfo;
-import org.apache.pinot.common.restlet.resources.TableSizeInfo;
-import org.apache.pinot.common.utils.JsonUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -32,6 +28,10 @@ import java.util.concurrent.Executor;
import org.apache.commons.httpclient.HttpConnectionManager;
import org.apache.commons.httpclient.URI;
import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.pinot.common.http.MultiGetRequest;
+import org.apache.pinot.common.restlet.resources.SegmentSizeInfo;
+import org.apache.pinot.common.restlet.resources.TableSizeInfo;
+import org.apache.pinot.common.utils.JsonUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableSize.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableSize.java
index d997924..4b867b0 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableSize.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableSize.java
@@ -18,10 +18,6 @@
*/
package org.apache.pinot.controller.api.resources;
-import org.apache.pinot.common.metrics.ControllerMetrics;
-import org.apache.pinot.controller.ControllerConf;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
-import org.apache.pinot.controller.util.TableSizeReader;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -38,6 +34,10 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.commons.httpclient.HttpConnectionManager;
+import org.apache.pinot.common.metrics.ControllerMetrics;
+import org.apache.pinot.controller.ControllerConf;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
+import org.apache.pinot.controller.util.TableSizeReader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableViews.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableViews.java
index 40b2067..5fcffbb 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableViews.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableViews.java
@@ -19,9 +19,6 @@
package org.apache.pinot.controller.api.resources;
import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -38,6 +35,9 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.IdealState;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/WebApplicationExceptionMapper.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/WebApplicationExceptionMapper.java
index e1b997b..5f41d82 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/WebApplicationExceptionMapper.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/WebApplicationExceptionMapper.java
@@ -21,12 +21,12 @@ package org.apache.pinot.controller.api.resources;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
-import org.apache.pinot.common.utils.JsonUtils;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
+import org.apache.pinot.common.utils.JsonUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/SegmentValidator.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/SegmentValidator.java
index d0b431f..e565ee8 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/SegmentValidator.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/SegmentValidator.java
@@ -18,6 +18,12 @@
*/
package org.apache.pinot.controller.api.upload;
+import java.io.File;
+import java.util.Date;
+import java.util.concurrent.Executor;
+import javax.annotation.Nonnull;
+import javax.ws.rs.core.Response;
+import org.apache.commons.httpclient.HttpConnectionManager;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.config.TableNameBuilder;
import org.apache.pinot.common.exception.InvalidConfigException;
@@ -30,12 +36,6 @@ import org.apache.pinot.controller.api.resources.ControllerApplicationException;
import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.apache.pinot.controller.util.TableSizeReader;
import org.apache.pinot.controller.validation.StorageQuotaChecker;
-import java.io.File;
-import java.util.Date;
-import java.util.concurrent.Executor;
-import javax.annotation.Nonnull;
-import javax.ws.rs.core.Response;
-import org.apache.commons.httpclient.HttpConnectionManager;
import org.joda.time.Interval;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/ZKOperator.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/ZKOperator.java
index 01ed579..0227e1f 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/ZKOperator.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/ZKOperator.java
@@ -18,6 +18,11 @@
*/
package org.apache.pinot.controller.api.upload;
+import java.io.File;
+import java.net.URI;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+import org.apache.helix.ZNRecord;
import org.apache.pinot.common.config.TableNameBuilder;
import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
import org.apache.pinot.common.metadata.segment.SegmentZKMetadataCustomMapModifier;
@@ -30,11 +35,6 @@ import org.apache.pinot.controller.api.resources.ControllerApplicationException;
import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.apache.pinot.filesystem.PinotFS;
import org.apache.pinot.filesystem.PinotFSFactory;
-import java.io.File;
-import java.net.URI;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Response;
-import org.apache.helix.ZNRecord;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/ControllerRequestBuilderUtil.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/ControllerRequestBuilderUtil.java
index 0992bbc..0680bf9 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/ControllerRequestBuilderUtil.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/ControllerRequestBuilderUtil.java
@@ -19,13 +19,6 @@
package org.apache.pinot.controller.helix;
import com.fasterxml.jackson.core.JsonProcessingException;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.config.TagNameUtils;
-import org.apache.pinot.common.config.Tenant;
-import org.apache.pinot.common.config.Tenant.TenantBuilder;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.JsonUtils;
-import org.apache.pinot.common.utils.TenantRole;
import java.util.HashMap;
import java.util.Map;
import org.apache.helix.HelixManager;
@@ -35,6 +28,13 @@ import org.apache.helix.model.HelixConfigScope;
import org.apache.helix.model.builder.HelixConfigScopeBuilder;
import org.apache.helix.participant.StateMachineEngine;
import org.apache.helix.participant.statemachine.StateModelFactory;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.config.TagNameUtils;
+import org.apache.pinot.common.config.Tenant;
+import org.apache.pinot.common.config.Tenant.TenantBuilder;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.JsonUtils;
+import org.apache.pinot.common.utils.TenantRole;
import static org.apache.pinot.common.utils.CommonConstants.Helix.*;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/ControllerRequestURLBuilder.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/ControllerRequestURLBuilder.java
index 2495737..b6e3a27 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/ControllerRequestURLBuilder.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/ControllerRequestURLBuilder.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.net.URLEncoder;
import org.apache.avro.reflect.Nullable;
import org.apache.commons.lang.StringUtils;
-
import org.apache.pinot.common.utils.StringUtil;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/SegmentStatusChecker.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/SegmentStatusChecker.java
index 1be218e..ee9b7de 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/SegmentStatusChecker.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/SegmentStatusChecker.java
@@ -18,6 +18,14 @@
*/
package org.apache.pinot.controller.helix;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import org.apache.helix.HelixAdmin;
+import org.apache.helix.ZNRecord;
+import org.apache.helix.model.ExternalView;
+import org.apache.helix.model.IdealState;
+import org.apache.helix.store.zk.ZkHelixPropertyStore;
import org.apache.pinot.common.config.TableNameBuilder;
import org.apache.pinot.common.metadata.ZKMetadataProvider;
import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
@@ -27,14 +35,6 @@ import org.apache.pinot.common.utils.CommonConstants.Helix.TableType;
import org.apache.pinot.controller.ControllerConf;
import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.apache.pinot.controller.helix.core.periodictask.ControllerPeriodicTask;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import org.apache.helix.HelixAdmin;
-import org.apache.helix.ZNRecord;
-import org.apache.helix.model.ExternalView;
-import org.apache.helix.model.IdealState;
-import org.apache.helix.store.zk.ZkHelixPropertyStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixBrokerResourceOnlineOfflineStateModelGenerator.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixBrokerResourceOnlineOfflineStateModelGenerator.java
index 1ab60cc..c38a73e 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixBrokerResourceOnlineOfflineStateModelGenerator.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixBrokerResourceOnlineOfflineStateModelGenerator.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.apache.helix.ZNRecord;
import org.apache.helix.model.StateModelDefinition;
import org.apache.helix.model.StateModelDefinition.StateModelDefinitionProperty;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
index 9abcc03..1f38cab 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
@@ -25,6 +25,40 @@ import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.Uninterruptibles;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.apache.commons.configuration.Configuration;
+import org.apache.helix.AccessOption;
+import org.apache.helix.BaseDataAccessor;
+import org.apache.helix.ClusterMessagingService;
+import org.apache.helix.Criteria;
+import org.apache.helix.HelixAdmin;
+import org.apache.helix.HelixDataAccessor;
+import org.apache.helix.HelixException;
+import org.apache.helix.HelixManager;
+import org.apache.helix.InstanceType;
+import org.apache.helix.PropertyKey;
+import org.apache.helix.PropertyKey.Builder;
+import org.apache.helix.PropertyPathBuilder;
+import org.apache.helix.ZNRecord;
+import org.apache.helix.manager.zk.ZkBaseDataAccessor;
+import org.apache.helix.manager.zk.ZkCacheBaseDataAccessor;
+import org.apache.helix.model.CurrentState;
+import org.apache.helix.model.ExternalView;
+import org.apache.helix.model.IdealState;
+import org.apache.helix.model.InstanceConfig;
+import org.apache.helix.model.LiveInstance;
+import org.apache.helix.store.zk.ZkHelixPropertyStore;
import org.apache.pinot.common.config.IndexingConfig;
import org.apache.pinot.common.config.OfflineTagConfig;
import org.apache.pinot.common.config.RealtimeTagConfig;
@@ -73,40 +107,6 @@ import org.apache.pinot.controller.helix.core.util.HelixSetupUtils;
import org.apache.pinot.controller.helix.core.util.ZKMetadataUtils;
import org.apache.pinot.controller.helix.starter.HelixConfig;
import org.apache.pinot.core.realtime.stream.StreamConfig;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.apache.commons.configuration.Configuration;
-import org.apache.helix.AccessOption;
-import org.apache.helix.BaseDataAccessor;
-import org.apache.helix.ClusterMessagingService;
-import org.apache.helix.Criteria;
-import org.apache.helix.HelixAdmin;
-import org.apache.helix.HelixDataAccessor;
-import org.apache.helix.HelixException;
-import org.apache.helix.HelixManager;
-import org.apache.helix.InstanceType;
-import org.apache.helix.PropertyKey;
-import org.apache.helix.PropertyKey.Builder;
-import org.apache.helix.PropertyPathBuilder;
-import org.apache.helix.ZNRecord;
-import org.apache.helix.manager.zk.ZkBaseDataAccessor;
-import org.apache.helix.manager.zk.ZkCacheBaseDataAccessor;
-import org.apache.helix.model.CurrentState;
-import org.apache.helix.model.ExternalView;
-import org.apache.helix.model.IdealState;
-import org.apache.helix.model.InstanceConfig;
-import org.apache.helix.model.LiveInstance;
-import org.apache.helix.store.zk.ZkHelixPropertyStore;
import org.apache.zookeeper.data.Stat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotTableIdealStateBuilder.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotTableIdealStateBuilder.java
index 9428785..b09b690 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotTableIdealStateBuilder.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotTableIdealStateBuilder.java
@@ -18,6 +18,14 @@
*/
package org.apache.pinot.controller.helix.core;
+import java.util.List;
+import java.util.Map;
+import org.apache.helix.HelixAdmin;
+import org.apache.helix.HelixManager;
+import org.apache.helix.ZNRecord;
+import org.apache.helix.model.IdealState;
+import org.apache.helix.model.builder.CustomModeISBuilder;
+import org.apache.helix.store.zk.ZkHelixPropertyStore;
import org.apache.pinot.common.config.RealtimeTagConfig;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.exception.InvalidConfigException;
@@ -30,14 +38,6 @@ import org.apache.pinot.common.utils.retry.RetryPolicies;
import org.apache.pinot.controller.helix.core.realtime.PinotLLCRealtimeSegmentManager;
import org.apache.pinot.core.realtime.stream.PartitionCountFetcher;
import org.apache.pinot.core.realtime.stream.StreamConfig;
-import java.util.List;
-import java.util.Map;
-import org.apache.helix.HelixAdmin;
-import org.apache.helix.HelixManager;
-import org.apache.helix.ZNRecord;
-import org.apache.helix.model.IdealState;
-import org.apache.helix.model.builder.CustomModeISBuilder;
-import org.apache.helix.store.zk.ZkHelixPropertyStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java
index f405e68..f696da2 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java
@@ -18,13 +18,6 @@
*/
package org.apache.pinot.controller.helix.core;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.metadata.ZKMetadataProvider;
-import org.apache.pinot.common.utils.SegmentName;
-import org.apache.pinot.common.utils.StringUtil;
-import org.apache.pinot.controller.ControllerConf;
-import org.apache.pinot.filesystem.PinotFS;
-import org.apache.pinot.filesystem.PinotFSFactory;
import java.io.File;
import java.io.IOException;
import java.net.URI;
@@ -45,6 +38,13 @@ import org.apache.helix.ZNRecord;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.IdealState;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.utils.SegmentName;
+import org.apache.pinot.common.utils.StringUtil;
+import org.apache.pinot.controller.ControllerConf;
+import org.apache.pinot.filesystem.PinotFS;
+import org.apache.pinot.filesystem.PinotFSFactory;
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/TableRebalancer.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/TableRebalancer.java
index 6ace3b6..4c87999 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/TableRebalancer.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/TableRebalancer.java
@@ -21,14 +21,6 @@ package org.apache.pinot.controller.helix.core;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.MapDifference;
import com.google.common.collect.Maps;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.exception.InvalidConfigException;
-import org.apache.pinot.common.partition.PartitionAssignment;
-import org.apache.pinot.common.restlet.resources.RebalanceResult;
-import org.apache.pinot.common.utils.EqualityUtils;
-import org.apache.pinot.common.utils.helix.HelixHelper;
-import org.apache.pinot.controller.helix.core.rebalance.RebalanceSegmentStrategy;
-import org.apache.pinot.controller.helix.core.rebalance.RebalanceUserConfigConstants;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.I0Itec.zkclient.exception.ZkBadVersionException;
@@ -41,6 +33,14 @@ import org.apache.helix.PropertyKey;
import org.apache.helix.manager.zk.ZkBaseDataAccessor;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.IdealState;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.exception.InvalidConfigException;
+import org.apache.pinot.common.partition.PartitionAssignment;
+import org.apache.pinot.common.restlet.resources.RebalanceResult;
+import org.apache.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.helix.HelixHelper;
+import org.apache.pinot.controller.helix.core.rebalance.RebalanceSegmentStrategy;
+import org.apache.pinot.controller.helix.core.rebalance.RebalanceUserConfigConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/ClusterInfoProvider.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/ClusterInfoProvider.java
index 0f2d2df..c0b422f 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/ClusterInfoProvider.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/ClusterInfoProvider.java
@@ -19,6 +19,11 @@
package org.apache.pinot.controller.helix.core.minion;
import com.google.common.base.Preconditions;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.apache.helix.task.TaskState;
import org.apache.pinot.common.config.PinotTaskConfig;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.config.TableNameBuilder;
@@ -29,11 +34,6 @@ import org.apache.pinot.common.metadata.segment.RealtimeSegmentZKMetadata;
import org.apache.pinot.controller.ControllerConf;
import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.apache.pinot.controller.helix.core.minion.generator.PinotTaskGenerator;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.apache.helix.task.TaskState;
/**
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotHelixTaskResourceManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotHelixTaskResourceManager.java
index ac3769e..12dd6fa 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotHelixTaskResourceManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotHelixTaskResourceManager.java
@@ -20,8 +20,6 @@ package org.apache.pinot.controller.helix.core.minion;
import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.Uninterruptibles;
-import org.apache.pinot.common.config.PinotTaskConfig;
-import org.apache.pinot.common.utils.CommonConstants;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -37,6 +35,8 @@ import org.apache.helix.task.TaskConfig;
import org.apache.helix.task.TaskDriver;
import org.apache.helix.task.TaskState;
import org.apache.helix.task.WorkflowConfig;
+import org.apache.pinot.common.config.PinotTaskConfig;
+import org.apache.pinot.common.utils.CommonConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotTaskManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotTaskManager.java
index 7cfbfcf..0d15c80 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotTaskManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotTaskManager.java
@@ -18,6 +18,12 @@
*/
package org.apache.pinot.controller.helix.core.minion;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nonnull;
import org.apache.pinot.common.config.PinotTaskConfig;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.config.TableTaskConfig;
@@ -28,12 +34,6 @@ import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.apache.pinot.controller.helix.core.minion.generator.PinotTaskGenerator;
import org.apache.pinot.controller.helix.core.minion.generator.TaskGeneratorRegistry;
import org.apache.pinot.controller.helix.core.periodictask.ControllerPeriodicTask;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.annotation.Nonnull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/ConvertToRawIndexTaskGenerator.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/ConvertToRawIndexTaskGenerator.java
index bdcce3a..2f54e1d 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/ConvertToRawIndexTaskGenerator.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/ConvertToRawIndexTaskGenerator.java
@@ -19,6 +19,12 @@
package org.apache.pinot.controller.helix.core.minion.generator;
import com.google.common.base.Preconditions;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nonnull;
import org.apache.pinot.common.config.PinotTaskConfig;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.config.TableTaskConfig;
@@ -27,12 +33,6 @@ import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.controller.helix.core.minion.ClusterInfoProvider;
import org.apache.pinot.core.common.MinionConstants;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.annotation.Nonnull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/PinotTaskGenerator.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/PinotTaskGenerator.java
index d34ee2f..fbbe335 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/PinotTaskGenerator.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/PinotTaskGenerator.java
@@ -18,11 +18,11 @@
*/
package org.apache.pinot.controller.helix.core.minion.generator;
-import org.apache.pinot.common.config.PinotTaskConfig;
-import org.apache.pinot.common.config.TableConfig;
import java.util.List;
import javax.annotation.Nonnull;
import org.apache.helix.task.JobConfig;
+import org.apache.pinot.common.config.PinotTaskConfig;
+import org.apache.pinot.common.config.TableConfig;
/**
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/TaskGeneratorRegistry.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/TaskGeneratorRegistry.java
index 48d80c9..ff8d37e 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/TaskGeneratorRegistry.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/TaskGeneratorRegistry.java
@@ -19,12 +19,12 @@
package org.apache.pinot.controller.helix.core.minion.generator;
import com.clearspring.analytics.util.Preconditions;
-import org.apache.pinot.controller.helix.core.minion.ClusterInfoProvider;
-import org.apache.pinot.controller.helix.core.minion.PinotHelixTaskResourceManager;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import javax.annotation.Nonnull;
+import org.apache.pinot.controller.helix.core.minion.ClusterInfoProvider;
+import org.apache.pinot.controller.helix.core.minion.PinotHelixTaskResourceManager;
/**
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/TaskGeneratorUtils.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/TaskGeneratorUtils.java
index 69d95ca..b3d9398 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/TaskGeneratorUtils.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/TaskGeneratorUtils.java
@@ -18,15 +18,15 @@
*/
package org.apache.pinot.controller.helix.core.minion.generator;
-import org.apache.pinot.common.config.PinotTaskConfig;
-import org.apache.pinot.common.data.Segment;
-import org.apache.pinot.controller.helix.core.minion.ClusterInfoProvider;
-import org.apache.pinot.core.common.MinionConstants;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import javax.annotation.Nonnull;
import org.apache.helix.task.TaskState;
+import org.apache.pinot.common.config.PinotTaskConfig;
+import org.apache.pinot.common.data.Segment;
+import org.apache.pinot.controller.helix.core.minion.ClusterInfoProvider;
+import org.apache.pinot.core.common.MinionConstants;
public class TaskGeneratorUtils {
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/periodictask/ControllerPeriodicTask.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/periodictask/ControllerPeriodicTask.java
index 3dc94b4..9416c1c 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/periodictask/ControllerPeriodicTask.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/periodictask/ControllerPeriodicTask.java
@@ -19,10 +19,10 @@
package org.apache.pinot.controller.helix.core.periodictask;
import com.google.common.annotations.VisibleForTesting;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
-import org.apache.pinot.core.periodictask.BasePeriodicTask;
import java.util.List;
import java.util.Random;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
+import org.apache.pinot.core.periodictask.BasePeriodicTask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/periodictask/ControllerPeriodicTaskScheduler.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/periodictask/ControllerPeriodicTaskScheduler.java
index bc35357..c5ce341 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/periodictask/ControllerPeriodicTaskScheduler.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/periodictask/ControllerPeriodicTaskScheduler.java
@@ -18,11 +18,11 @@
*/
package org.apache.pinot.controller.helix.core.periodictask;
+import java.util.List;
import org.apache.pinot.controller.ControllerLeadershipManager;
import org.apache.pinot.controller.LeadershipChangeSubscriber;
import org.apache.pinot.core.periodictask.PeriodicTask;
import org.apache.pinot.core.periodictask.PeriodicTaskScheduler;
-import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java
index 07a4ec7..6786a7b 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java
@@ -23,6 +23,36 @@ import com.google.common.base.Function;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.Uninterruptibles;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.net.URI;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.math.IntRange;
+import org.apache.helix.AccessOption;
+import org.apache.helix.HelixAdmin;
+import org.apache.helix.HelixManager;
+import org.apache.helix.ZNRecord;
+import org.apache.helix.model.IdealState;
+import org.apache.helix.store.zk.ZkHelixPropertyStore;
import org.apache.pinot.common.config.ColumnPartitionConfig;
import org.apache.pinot.common.config.SegmentPartitionConfig;
import org.apache.pinot.common.config.TableConfig;
@@ -65,36 +95,6 @@ import org.apache.pinot.core.segment.index.ColumnMetadata;
import org.apache.pinot.core.segment.index.SegmentMetadataImpl;
import org.apache.pinot.filesystem.PinotFS;
import org.apache.pinot.filesystem.PinotFSFactory;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.net.URI;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.math.IntRange;
-import org.apache.helix.AccessOption;
-import org.apache.helix.HelixAdmin;
-import org.apache.helix.HelixManager;
-import org.apache.helix.ZNRecord;
-import org.apache.helix.model.IdealState;
-import org.apache.helix.store.zk.ZkHelixPropertyStore;
import org.apache.zookeeper.data.Stat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotRealtimeSegmentManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotRealtimeSegmentManager.java
index d662b0e..f98ce78 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotRealtimeSegmentManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotRealtimeSegmentManager.java
@@ -19,6 +19,23 @@
package org.apache.pinot.controller.helix.core.realtime;
import com.google.common.base.Function;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import org.I0Itec.zkclient.IZkChildListener;
+import org.I0Itec.zkclient.IZkDataListener;
+import org.apache.helix.PropertyPathConfig;
+import org.apache.helix.PropertyType;
+import org.apache.helix.ZNRecord;
+import org.apache.helix.manager.zk.ZNRecordSerializer;
+import org.apache.helix.manager.zk.ZkClient;
+import org.apache.helix.model.IdealState;
+import org.apache.helix.store.HelixPropertyListener;
import org.apache.pinot.common.Utils;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.config.TableNameBuilder;
@@ -41,23 +58,6 @@ import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.apache.pinot.controller.helix.core.PinotTableIdealStateBuilder;
import org.apache.pinot.core.query.utils.Pair;
import org.apache.pinot.core.realtime.stream.StreamConfig;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import org.I0Itec.zkclient.IZkChildListener;
-import org.I0Itec.zkclient.IZkDataListener;
-import org.apache.helix.PropertyPathConfig;
-import org.apache.helix.PropertyType;
-import org.apache.helix.ZNRecord;
-import org.apache.helix.manager.zk.ZNRecordSerializer;
-import org.apache.helix.manager.zk.ZkClient;
-import org.apache.helix.model.IdealState;
-import org.apache.helix.store.HelixPropertyListener;
import org.apache.zookeeper.data.Stat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/SegmentCompletionManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/SegmentCompletionManager.java
index 7a713aa..0a4afb4 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/SegmentCompletionManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/SegmentCompletionManager.java
@@ -19,6 +19,14 @@
package org.apache.pinot.controller.helix.core.realtime;
import com.google.common.annotations.VisibleForTesting;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import org.apache.helix.HelixManager;
+import org.apache.helix.ZNRecord;
import org.apache.pinot.common.config.TableNameBuilder;
import org.apache.pinot.common.metadata.segment.LLCRealtimeSegmentZKMetadata;
import org.apache.pinot.common.metrics.ControllerMeter;
@@ -29,14 +37,6 @@ import org.apache.pinot.common.utils.LLCSegmentName;
import org.apache.pinot.controller.ControllerConf;
import org.apache.pinot.controller.ControllerLeadershipManager;
import org.apache.pinot.controller.helix.core.realtime.segment.CommittingSegmentDescriptor;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-import org.apache.helix.HelixManager;
-import org.apache.helix.ZNRecord;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/TableConfigCache.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/TableConfigCache.java
index 7739a5e..00b7c7f 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/TableConfigCache.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/TableConfigCache.java
@@ -18,8 +18,6 @@
*/
package org.apache.pinot.controller.helix.core.realtime;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.metadata.ZKMetadataProvider;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
@@ -27,6 +25,8 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import org.apache.helix.ZNRecord;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
/**
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/segment/DefaultFlushThresholdUpdater.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/segment/DefaultFlushThresholdUpdater.java
index 294aecb..81f86ae 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/segment/DefaultFlushThresholdUpdater.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/segment/DefaultFlushThresholdUpdater.java
@@ -19,13 +19,13 @@
package org.apache.pinot.controller.helix.core.realtime.segment;
import com.google.common.annotations.VisibleForTesting;
-import org.apache.pinot.common.metadata.segment.LLCRealtimeSegmentZKMetadata;
-import org.apache.pinot.common.partition.PartitionAssignment;
-import org.apache.pinot.common.utils.LLCSegmentName;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Nonnull;
+import org.apache.pinot.common.metadata.segment.LLCRealtimeSegmentZKMetadata;
+import org.apache.pinot.common.partition.PartitionAssignment;
+import org.apache.pinot.common.utils.LLCSegmentName;
/**
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/segment/FlushThresholdUpdateManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/segment/FlushThresholdUpdateManager.java
index 7e6e412..3926ccc 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/segment/FlushThresholdUpdateManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/segment/FlushThresholdUpdateManager.java
@@ -18,10 +18,10 @@
*/
package org.apache.pinot.controller.helix.core.realtime.segment;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.core.realtime.stream.PartitionLevelStreamConfig;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.core.realtime.stream.PartitionLevelStreamConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/segment/FlushThresholdUpdater.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/segment/FlushThresholdUpdater.java
index 98767b2..742b527 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/segment/FlushThresholdUpdater.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/segment/FlushThresholdUpdater.java
@@ -18,9 +18,9 @@
*/
package org.apache.pinot.controller.helix.core.realtime.segment;
+import javax.annotation.Nonnull;
import org.apache.pinot.common.metadata.segment.LLCRealtimeSegmentZKMetadata;
import org.apache.pinot.common.partition.PartitionAssignment;
-import javax.annotation.Nonnull;
/**
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/segment/SegmentSizeBasedFlushThresholdUpdater.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/segment/SegmentSizeBasedFlushThresholdUpdater.java
index 6ef9231..e98a542 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/segment/SegmentSizeBasedFlushThresholdUpdater.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/segment/SegmentSizeBasedFlushThresholdUpdater.java
@@ -19,11 +19,11 @@
package org.apache.pinot.controller.helix.core.realtime.segment;
import com.google.common.annotations.VisibleForTesting;
+import javax.annotation.Nonnull;
import org.apache.pinot.common.metadata.segment.LLCRealtimeSegmentZKMetadata;
import org.apache.pinot.common.partition.PartitionAssignment;
import org.apache.pinot.common.utils.LLCSegmentName;
import org.apache.pinot.common.utils.time.TimeUtils;
-import javax.annotation.Nonnull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/DefaultRebalanceSegmentStrategy.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/DefaultRebalanceSegmentStrategy.java
index 8452f84..6b3e35e 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/DefaultRebalanceSegmentStrategy.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/DefaultRebalanceSegmentStrategy.java
@@ -20,18 +20,6 @@ package org.apache.pinot.controller.helix.core.rebalance;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Lists;
-import org.apache.pinot.common.config.OfflineTagConfig;
-import org.apache.pinot.common.config.RealtimeTagConfig;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.exception.InvalidConfigException;
-import org.apache.pinot.common.partition.PartitionAssignment;
-import org.apache.pinot.common.partition.StreamPartitionAssignmentGenerator;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.CommonConstants.Helix.StateModel.RealtimeSegmentOnlineOfflineStateModel;
-import org.apache.pinot.common.utils.LLCSegmentName;
-import org.apache.pinot.common.utils.SegmentName;
-import org.apache.pinot.common.utils.helix.HelixHelper;
-import org.apache.pinot.core.realtime.stream.StreamConfig;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -48,6 +36,18 @@ import org.apache.helix.controller.rebalancer.strategy.AutoRebalanceStrategy;
import org.apache.helix.controller.stages.ClusterDataCache;
import org.apache.helix.model.IdealState;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.OfflineTagConfig;
+import org.apache.pinot.common.config.RealtimeTagConfig;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.exception.InvalidConfigException;
+import org.apache.pinot.common.partition.PartitionAssignment;
+import org.apache.pinot.common.partition.StreamPartitionAssignmentGenerator;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.CommonConstants.Helix.StateModel.RealtimeSegmentOnlineOfflineStateModel;
+import org.apache.pinot.common.utils.LLCSegmentName;
+import org.apache.pinot.common.utils.SegmentName;
+import org.apache.pinot.common.utils.helix.HelixHelper;
+import org.apache.pinot.core.realtime.stream.StreamConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/RebalanceSegmentStrategy.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/RebalanceSegmentStrategy.java
index 2d2c4bf..97c6f52 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/RebalanceSegmentStrategy.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/RebalanceSegmentStrategy.java
@@ -18,11 +18,11 @@
*/
package org.apache.pinot.controller.helix.core.rebalance;
+import org.apache.commons.configuration.Configuration;
+import org.apache.helix.model.IdealState;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.exception.InvalidConfigException;
import org.apache.pinot.common.partition.PartitionAssignment;
-import org.apache.commons.configuration.Configuration;
-import org.apache.helix.model.IdealState;
/**
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/RebalanceSegmentStrategyFactory.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/RebalanceSegmentStrategyFactory.java
index 5a5796a..8e6ca40 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/RebalanceSegmentStrategyFactory.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/RebalanceSegmentStrategyFactory.java
@@ -18,9 +18,9 @@
*/
package org.apache.pinot.controller.helix.core.rebalance;
+import org.apache.helix.HelixManager;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.controller.helix.core.sharding.SegmentAssignmentStrategyEnum;
-import org.apache.helix.HelixManager;
/**
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/ReplicaGroupRebalanceSegmentStrategy.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/ReplicaGroupRebalanceSegmentStrategy.java
index b14c288..876958c 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/ReplicaGroupRebalanceSegmentStrategy.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/ReplicaGroupRebalanceSegmentStrategy.java
@@ -19,16 +19,6 @@
package org.apache.pinot.controller.helix.core.rebalance;
import com.google.common.base.Function;
-import org.apache.pinot.common.config.OfflineTagConfig;
-import org.apache.pinot.common.config.ReplicaGroupStrategyConfig;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.exception.InvalidConfigException;
-import org.apache.pinot.common.partition.PartitionAssignment;
-import org.apache.pinot.common.partition.ReplicaGroupPartitionAssignment;
-import org.apache.pinot.common.partition.ReplicaGroupPartitionAssignmentGenerator;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.helix.HelixHelper;
-import org.apache.pinot.common.utils.retry.RetryPolicies;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -45,6 +35,16 @@ import org.apache.helix.HelixManager;
import org.apache.helix.ZNRecord;
import org.apache.helix.model.IdealState;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.OfflineTagConfig;
+import org.apache.pinot.common.config.ReplicaGroupStrategyConfig;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.exception.InvalidConfigException;
+import org.apache.pinot.common.partition.PartitionAssignment;
+import org.apache.pinot.common.partition.ReplicaGroupPartitionAssignment;
+import org.apache.pinot.common.partition.ReplicaGroupPartitionAssignmentGenerator;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.helix.HelixHelper;
+import org.apache.pinot.common.utils.retry.RetryPolicies;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/relocation/RealtimeSegmentRelocator.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/relocation/RealtimeSegmentRelocator.java
index fc8ec51..6129669 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/relocation/RealtimeSegmentRelocator.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/relocation/RealtimeSegmentRelocator.java
@@ -21,6 +21,15 @@ package org.apache.pinot.controller.helix.core.relocation;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
import com.google.common.collect.MinMaxPriorityQueue;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.commons.collections.MapUtils;
+import org.apache.helix.HelixManager;
+import org.apache.helix.model.IdealState;
import org.apache.pinot.common.config.RealtimeTagConfig;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.config.TableNameBuilder;
@@ -31,15 +40,6 @@ import org.apache.pinot.controller.ControllerConf;
import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.apache.pinot.controller.helix.core.PinotHelixSegmentOnlineOfflineStateModelGenerator;
import org.apache.pinot.controller.helix.core.periodictask.ControllerPeriodicTask;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Nullable;
-import org.apache.commons.collections.MapUtils;
-import org.apache.helix.HelixManager;
-import org.apache.helix.model.IdealState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/retention/RetentionManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/retention/RetentionManager.java
index ef4516c..d9aa1d9 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/retention/RetentionManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/retention/RetentionManager.java
@@ -18,6 +18,13 @@
*/
package org.apache.pinot.controller.helix.core.retention;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import org.apache.helix.model.IdealState;
import org.apache.pinot.common.config.SegmentsValidationAndRetentionConfig;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.config.TableNameBuilder;
@@ -31,13 +38,6 @@ import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.apache.pinot.controller.helix.core.periodictask.ControllerPeriodicTask;
import org.apache.pinot.controller.helix.core.retention.strategy.RetentionStrategy;
import org.apache.pinot.controller.helix.core.retention.strategy.TimeRetentionStrategy;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import org.apache.helix.model.IdealState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/retention/strategy/TimeRetentionStrategy.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/retention/strategy/TimeRetentionStrategy.java
index a1cd1ae..84373c5 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/retention/strategy/TimeRetentionStrategy.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/retention/strategy/TimeRetentionStrategy.java
@@ -18,9 +18,9 @@
*/
package org.apache.pinot.controller.helix.core.retention.strategy;
+import java.util.concurrent.TimeUnit;
import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
import org.apache.pinot.common.utils.time.TimeUtils;
-import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/sharding/BalanceNumSegmentAssignmentStrategy.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/sharding/BalanceNumSegmentAssignmentStrategy.java
index 20b3555..90fd821 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/sharding/BalanceNumSegmentAssignmentStrategy.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/sharding/BalanceNumSegmentAssignmentStrategy.java
@@ -18,12 +18,6 @@
*/
package org.apache.pinot.controller.helix.core.sharding;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.config.TagNameUtils;
-import org.apache.pinot.common.segment.SegmentMetadata;
-import org.apache.pinot.common.utils.Pairs;
-import org.apache.pinot.common.utils.Pairs.Number2ObjectPair;
-import org.apache.pinot.common.utils.helix.HelixHelper;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -35,6 +29,12 @@ import org.apache.helix.HelixManager;
import org.apache.helix.ZNRecord;
import org.apache.helix.model.IdealState;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.config.TagNameUtils;
+import org.apache.pinot.common.segment.SegmentMetadata;
+import org.apache.pinot.common.utils.Pairs;
+import org.apache.pinot.common.utils.Pairs.Number2ObjectPair;
+import org.apache.pinot.common.utils.helix.HelixHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/sharding/BucketizedSegmentStrategy.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/sharding/BucketizedSegmentStrategy.java
index e178cd3..aee36c7 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/sharding/BucketizedSegmentStrategy.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/sharding/BucketizedSegmentStrategy.java
@@ -18,9 +18,6 @@
*/
package org.apache.pinot.controller.helix.core.sharding;
-import org.apache.pinot.common.config.TagNameUtils;
-import org.apache.pinot.common.segment.SegmentMetadata;
-import org.apache.pinot.common.utils.helix.HelixHelper;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -28,6 +25,9 @@ import org.apache.helix.HelixAdmin;
import org.apache.helix.HelixManager;
import org.apache.helix.ZNRecord;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.TagNameUtils;
+import org.apache.pinot.common.segment.SegmentMetadata;
+import org.apache.pinot.common.utils.helix.HelixHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/sharding/RandomAssignmentStrategy.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/sharding/RandomAssignmentStrategy.java
index f8e9ac2..d335f92 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/sharding/RandomAssignmentStrategy.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/sharding/RandomAssignmentStrategy.java
@@ -18,9 +18,6 @@
*/
package org.apache.pinot.controller.helix.core.sharding;
-import org.apache.pinot.common.config.TagNameUtils;
-import org.apache.pinot.common.segment.SegmentMetadata;
-import org.apache.pinot.common.utils.helix.HelixHelper;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -29,6 +26,9 @@ import org.apache.helix.HelixAdmin;
import org.apache.helix.HelixManager;
import org.apache.helix.ZNRecord;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.TagNameUtils;
+import org.apache.pinot.common.segment.SegmentMetadata;
+import org.apache.pinot.common.utils.helix.HelixHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/sharding/ReplicaGroupSegmentAssignmentStrategy.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/sharding/ReplicaGroupSegmentAssignmentStrategy.java
index 12aa22e..1cd3eca 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/sharding/ReplicaGroupSegmentAssignmentStrategy.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/sharding/ReplicaGroupSegmentAssignmentStrategy.java
@@ -18,14 +18,6 @@
*/
package org.apache.pinot.controller.helix.core.sharding;
-import org.apache.pinot.common.config.ReplicaGroupStrategyConfig;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.metadata.ZKMetadataProvider;
-import org.apache.pinot.common.partition.ReplicaGroupPartitionAssignment;
-import org.apache.pinot.common.partition.ReplicaGroupPartitionAssignmentGenerator;
-import org.apache.pinot.common.segment.SegmentMetadata;
-import org.apache.pinot.core.segment.index.SegmentMetadataImpl;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -34,6 +26,14 @@ import org.apache.helix.HelixAdmin;
import org.apache.helix.HelixManager;
import org.apache.helix.ZNRecord;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.ReplicaGroupStrategyConfig;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.partition.ReplicaGroupPartitionAssignment;
+import org.apache.pinot.common.partition.ReplicaGroupPartitionAssignmentGenerator;
+import org.apache.pinot.common.segment.SegmentMetadata;
+import org.apache.pinot.core.segment.index.SegmentMetadataImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/sharding/SegmentAssignmentStrategy.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/sharding/SegmentAssignmentStrategy.java
index 7ece1b7..a216073 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/sharding/SegmentAssignmentStrategy.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/sharding/SegmentAssignmentStrategy.java
@@ -18,12 +18,12 @@
*/
package org.apache.pinot.controller.helix.core.sharding;
-import org.apache.pinot.common.segment.SegmentMetadata;
import java.util.List;
import org.apache.helix.HelixAdmin;
import org.apache.helix.HelixManager;
import org.apache.helix.ZNRecord;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.segment.SegmentMetadata;
/**
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/HelixSetupUtils.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/HelixSetupUtils.java
index 99a1093..e2e626c 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/HelixSetupUtils.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/HelixSetupUtils.java
@@ -45,13 +45,13 @@ import org.apache.helix.model.Message.MessageType;
import org.apache.helix.model.StateModelDefinition;
import org.apache.helix.model.builder.HelixConfigScopeBuilder;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.common.utils.helix.HelixHelper;
import org.apache.pinot.controller.helix.core.PinotHelixBrokerResourceOnlineOfflineStateModelGenerator;
import org.apache.pinot.controller.helix.core.PinotHelixSegmentOnlineOfflineStateModelGenerator;
import org.apache.pinot.controller.helix.core.PinotTableIdealStateBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/ZKMetadataUtils.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/ZKMetadataUtils.java
index c8a159f..b56ac38 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/ZKMetadataUtils.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/ZKMetadataUtils.java
@@ -18,6 +18,8 @@
*/
package org.apache.pinot.controller.helix.core.util;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.pinot.common.metadata.segment.ColumnPartitionMetadata;
import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
import org.apache.pinot.common.metadata.segment.SegmentPartitionMetadata;
@@ -26,8 +28,6 @@ import org.apache.pinot.common.utils.CommonConstants.Segment.SegmentType;
import org.apache.pinot.core.data.partition.PartitionFunction;
import org.apache.pinot.core.segment.index.ColumnMetadata;
import org.apache.pinot.core.segment.index.SegmentMetadataImpl;
-import java.util.HashMap;
-import java.util.Map;
public class ZKMetadataUtils {
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/util/AutoAddInvertedIndex.java b/pinot-controller/src/main/java/org/apache/pinot/controller/util/AutoAddInvertedIndex.java
index b93654a..3f8c1f9 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/util/AutoAddInvertedIndex.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/util/AutoAddInvertedIndex.java
@@ -20,15 +20,6 @@ package org.apache.pinot.controller.util;
import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.base.Preconditions;
-import org.apache.pinot.common.config.IndexingConfig;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.data.FieldSpec;
-import org.apache.pinot.common.data.Schema;
-import org.apache.pinot.common.data.TimeFieldSpec;
-import org.apache.pinot.common.metadata.ZKMetadataProvider;
-import org.apache.pinot.common.utils.JsonUtils;
-import org.apache.pinot.controller.helix.ControllerRequestURLBuilder;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.InputStreamReader;
@@ -47,6 +38,15 @@ import org.apache.helix.ZNRecord;
import org.apache.helix.manager.zk.ZKHelixAdmin;
import org.apache.helix.manager.zk.ZNRecordSerializer;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.IndexingConfig;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.data.FieldSpec;
+import org.apache.pinot.common.data.Schema;
+import org.apache.pinot.common.data.TimeFieldSpec;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.utils.JsonUtils;
+import org.apache.pinot.controller.helix.ControllerRequestURLBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/util/TableRetentionValidator.java b/pinot-controller/src/main/java/org/apache/pinot/controller/util/TableRetentionValidator.java
index 8f3a1fb..0c32518 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/util/TableRetentionValidator.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/util/TableRetentionValidator.java
@@ -18,12 +18,6 @@
*/
package org.apache.pinot.controller.util;
-import org.apache.pinot.common.config.SegmentsValidationAndRetentionConfig;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.metadata.ZKMetadataProvider;
-import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
-import org.apache.pinot.common.utils.time.TimeUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -35,6 +29,12 @@ import org.apache.helix.ZNRecord;
import org.apache.helix.manager.zk.ZKHelixAdmin;
import org.apache.helix.manager.zk.ZNRecordSerializer;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.SegmentsValidationAndRetentionConfig;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
+import org.apache.pinot.common.utils.time.TimeUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/util/TableSizeReader.java b/pinot-controller/src/main/java/org/apache/pinot/controller/util/TableSizeReader.java
index d099daf..a1e6fcf 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/util/TableSizeReader.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/util/TableSizeReader.java
@@ -21,14 +21,6 @@ package org.apache.pinot.controller.util;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.google.common.base.Preconditions;
import com.google.common.collect.BiMap;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.exception.InvalidConfigException;
-import org.apache.pinot.common.metrics.ControllerGauge;
-import org.apache.pinot.common.metrics.ControllerMetrics;
-import org.apache.pinot.common.restlet.resources.SegmentSizeInfo;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.controller.api.resources.ServerTableSizeReader;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -38,6 +30,14 @@ import javax.annotation.Nonnegative;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.apache.commons.httpclient.HttpConnectionManager;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.exception.InvalidConfigException;
+import org.apache.pinot.common.metrics.ControllerGauge;
+import org.apache.pinot.common.metrics.ControllerMetrics;
+import org.apache.pinot.common.restlet.resources.SegmentSizeInfo;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.controller.api.resources.ServerTableSizeReader;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/validation/BrokerResourceValidationManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/validation/BrokerResourceValidationManager.java
index 693307c..03bfd79 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/validation/BrokerResourceValidationManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/validation/BrokerResourceValidationManager.java
@@ -18,13 +18,13 @@
*/
package org.apache.pinot.controller.validation;
+import java.util.List;
+import java.util.Set;
+import org.apache.helix.model.InstanceConfig;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.controller.ControllerConf;
import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.apache.pinot.controller.helix.core.periodictask.ControllerPeriodicTask;
-import java.util.List;
-import java.util.Set;
-import org.apache.helix.model.InstanceConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/validation/OfflineSegmentIntervalChecker.java b/pinot-controller/src/main/java/org/apache/pinot/controller/validation/OfflineSegmentIntervalChecker.java
index c2d1f3a..41bb950 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/validation/OfflineSegmentIntervalChecker.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/validation/OfflineSegmentIntervalChecker.java
@@ -19,6 +19,9 @@
package org.apache.pinot.controller.validation;
import com.google.common.annotations.VisibleForTesting;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.lang3.StringUtils;
import org.apache.pinot.common.config.SegmentsValidationAndRetentionConfig;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.config.TableNameBuilder;
@@ -29,9 +32,6 @@ import org.apache.pinot.common.utils.time.TimeUtils;
import org.apache.pinot.controller.ControllerConf;
import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.apache.pinot.controller.helix.core.periodictask.ControllerPeriodicTask;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.commons.lang3.StringUtils;
import org.joda.time.Duration;
import org.joda.time.Interval;
import org.slf4j.Logger;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/validation/RealtimeSegmentValidationManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/validation/RealtimeSegmentValidationManager.java
index 3170f71..94aac5c 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/validation/RealtimeSegmentValidationManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/validation/RealtimeSegmentValidationManager.java
@@ -20,6 +20,9 @@ package org.apache.pinot.controller.validation;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.config.TableNameBuilder;
import org.apache.pinot.common.metadata.segment.RealtimeSegmentZKMetadata;
@@ -32,9 +35,6 @@ import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.apache.pinot.controller.helix.core.periodictask.ControllerPeriodicTask;
import org.apache.pinot.controller.helix.core.realtime.PinotLLCRealtimeSegmentManager;
import org.apache.pinot.core.realtime.stream.StreamConfig;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/validation/StorageQuotaChecker.java b/pinot-controller/src/main/java/org/apache/pinot/controller/validation/StorageQuotaChecker.java
index 1848dad..13343af 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/validation/StorageQuotaChecker.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/validation/StorageQuotaChecker.java
@@ -20,6 +20,10 @@ package org.apache.pinot.controller.validation;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
+import java.io.File;
+import javax.annotation.Nonnegative;
+import javax.annotation.Nonnull;
+import org.apache.commons.io.FileUtils;
import org.apache.pinot.common.config.QuotaConfig;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.exception.InvalidConfigException;
@@ -29,10 +33,6 @@ import org.apache.pinot.common.utils.DataSize;
import org.apache.pinot.controller.ControllerLeadershipManager;
import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.apache.pinot.controller.util.TableSizeReader;
-import java.io.File;
-import javax.annotation.Nonnegative;
-import javax.annotation.Nonnull;
-import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/AccessControlTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/AccessControlTest.java
index c0a0b1c..1c90aee 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/AccessControlTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/AccessControlTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.pinot.controller.api.resources;
+import java.io.IOException;
+import javax.ws.rs.core.HttpHeaders;
import org.apache.pinot.controller.ControllerConf;
import org.apache.pinot.controller.api.access.AccessControl;
import org.apache.pinot.controller.api.access.AccessControlFactory;
import org.apache.pinot.controller.helix.ControllerTest;
-import java.io.IOException;
-import javax.ws.rs.core.HttpHeaders;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/FileUploadPathProviderTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/FileUploadPathProviderTest.java
index a4d6491..a51d8cf 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/FileUploadPathProviderTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/FileUploadPathProviderTest.java
@@ -18,9 +18,9 @@
*/
package org.apache.pinot.controller.api.resources;
+import java.io.File;
import org.apache.pinot.controller.ControllerConf;
import org.apache.pinot.controller.helix.ControllerTest;
-import java.io.File;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotFileUploadTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotFileUploadTest.java
index 12c9a78..79472f9 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotFileUploadTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotFileUploadTest.java
@@ -18,16 +18,16 @@
*/
package org.apache.pinot.controller.api.resources;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.ZkStarter;
-import org.apache.pinot.controller.helix.ControllerRequestBuilderUtil;
-import org.apache.pinot.controller.helix.ControllerTest;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.ZkStarter;
+import org.apache.pinot.controller.helix.ControllerRequestBuilderUtil;
+import org.apache.pinot.controller.helix.ControllerTest;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResourceTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResourceTest.java
index d6d24c7..4922043 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResourceTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResourceTest.java
@@ -20,11 +20,11 @@ package org.apache.pinot.controller.api.resources;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
+import java.io.IOException;
import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.common.utils.JsonUtils;
import org.apache.pinot.controller.helix.ControllerTest;
import org.apache.pinot.util.TestUtils;
-import java.io.IOException;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotSchemaRestletResourceTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotSchemaRestletResourceTest.java
index 20682c9..8e964f5 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotSchemaRestletResourceTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotSchemaRestletResourceTest.java
@@ -18,13 +18,13 @@
*/
package org.apache.pinot.controller.api.resources;
+import java.io.IOException;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.PutMethod;
import org.apache.pinot.common.data.DimensionFieldSpec;
import org.apache.pinot.common.data.FieldSpec;
import org.apache.pinot.common.data.Schema;
import org.apache.pinot.controller.helix.ControllerTest;
-import java.io.IOException;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.PutMethod;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotSegmentRestletResourceTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotSegmentRestletResourceTest.java
index 2dced3c..4f19f6d 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotSegmentRestletResourceTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotSegmentRestletResourceTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.pinot.controller.api.resources;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.config.TableNameBuilder;
import org.apache.pinot.common.segment.SegmentMetadata;
@@ -27,8 +29,6 @@ import org.apache.pinot.common.utils.ZkStarter;
import org.apache.pinot.controller.helix.ControllerRequestBuilderUtil;
import org.apache.pinot.controller.helix.ControllerTest;
import org.apache.pinot.controller.utils.SegmentMetadataMockUtils;
-import java.util.HashMap;
-import java.util.Map;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotTableRestletResourceTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotTableRestletResourceTest.java
index f513ba3..fcf097a 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotTableRestletResourceTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotTableRestletResourceTest.java
@@ -19,6 +19,10 @@
package org.apache.pinot.controller.api.resources;
import com.fasterxml.jackson.databind.JsonNode;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.pinot.common.config.QuotaConfig;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.utils.CommonConstants.Helix.TableType;
@@ -30,10 +34,6 @@ import org.apache.pinot.controller.helix.ControllerTest;
import org.apache.pinot.core.realtime.impl.kafka.KafkaStreamConfigProperties;
import org.apache.pinot.core.realtime.stream.StreamConfig;
import org.apache.pinot.core.realtime.stream.StreamConfigProperties;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/SegmentCompletionUtilsTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/SegmentCompletionUtilsTest.java
index fd44400..36d3f4d 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/SegmentCompletionUtilsTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/SegmentCompletionUtilsTest.java
@@ -18,8 +18,8 @@
*/
package org.apache.pinot.controller.api.resources;
-import org.apache.pinot.controller.util.SegmentCompletionUtils;
import junit.framework.Assert;
+import org.apache.pinot.controller.util.SegmentCompletionUtils;
import org.testng.annotations.Test;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/ServerTableSizeReaderTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/ServerTableSizeReaderTest.java
index 3efe81e..d2421f1 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/ServerTableSizeReaderTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/ServerTableSizeReaderTest.java
@@ -20,9 +20,6 @@ package org.apache.pinot.controller.api.resources;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
-import org.apache.pinot.common.restlet.resources.SegmentSizeInfo;
-import org.apache.pinot.common.restlet.resources.TableSizeInfo;
-import org.apache.pinot.common.utils.JsonUtils;
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
import com.sun.net.httpserver.HttpServer;
@@ -37,6 +34,9 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import org.apache.commons.httpclient.HttpConnectionManager;
import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
+import org.apache.pinot.common.restlet.resources.SegmentSizeInfo;
+import org.apache.pinot.common.restlet.resources.TableSizeInfo;
+import org.apache.pinot.common.utils.JsonUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/TableSizeReaderTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/TableSizeReaderTest.java
index b583ed3..cabbcef 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/TableSizeReaderTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/TableSizeReaderTest.java
@@ -20,15 +20,6 @@ package org.apache.pinot.controller.api.resources;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.exception.InvalidConfigException;
-import org.apache.pinot.common.metrics.ControllerGauge;
-import org.apache.pinot.common.metrics.ControllerMetrics;
-import org.apache.pinot.common.restlet.resources.SegmentSizeInfo;
-import org.apache.pinot.common.restlet.resources.TableSizeInfo;
-import org.apache.pinot.common.utils.JsonUtils;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
-import org.apache.pinot.controller.util.TableSizeReader;
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
import com.sun.net.httpserver.HttpServer;
@@ -45,6 +36,15 @@ import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import org.apache.commons.httpclient.HttpConnectionManager;
import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.exception.InvalidConfigException;
+import org.apache.pinot.common.metrics.ControllerGauge;
+import org.apache.pinot.common.metrics.ControllerMetrics;
+import org.apache.pinot.common.restlet.resources.SegmentSizeInfo;
+import org.apache.pinot.common.restlet.resources.TableSizeInfo;
+import org.apache.pinot.common.utils.JsonUtils;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
+import org.apache.pinot.controller.util.TableSizeReader;
import org.mockito.ArgumentMatchers;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/TableViewsTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/TableViewsTest.java
index 8bbfd94..e7f7356 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/TableViewsTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/TableViewsTest.java
@@ -18,6 +18,10 @@
*/
package org.apache.pinot.controller.api.resources;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.config.TableNameBuilder;
import org.apache.pinot.common.utils.CommonConstants;
@@ -30,10 +34,6 @@ import org.apache.pinot.core.realtime.impl.kafka.KafkaAvroMessageDecoder;
import org.apache.pinot.core.realtime.impl.kafka.KafkaConsumerFactory;
import org.apache.pinot.core.realtime.stream.StreamConfig;
import org.apache.pinot.core.realtime.stream.StreamConfigProperties;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerInstanceToggleTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerInstanceToggleTest.java
index a1ef5b3..4000853 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerInstanceToggleTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerInstanceToggleTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.pinot.controller.helix;
+import java.util.Set;
+import org.apache.helix.model.ExternalView;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.config.TableNameBuilder;
import org.apache.pinot.common.config.TagNameUtils;
@@ -25,8 +27,6 @@ import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.common.utils.ZkStarter;
import org.apache.pinot.common.utils.helix.HelixHelper;
import org.apache.pinot.controller.utils.SegmentMetadataMockUtils;
-import java.util.Set;
-import org.apache.helix.model.ExternalView;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerSentinelTestV2.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerSentinelTestV2.java
index 148ba04..9687544 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerSentinelTestV2.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerSentinelTestV2.java
@@ -18,12 +18,12 @@
*/
package org.apache.pinot.controller.helix;
+import java.io.IOException;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.config.TagNameUtils;
import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.common.utils.ZkStarter;
import org.apache.pinot.controller.utils.SegmentMetadataMockUtils;
-import java.io.IOException;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTenantTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTenantTest.java
index 00913ff..c3c7dd7 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTenantTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTenantTest.java
@@ -19,12 +19,12 @@
package org.apache.pinot.controller.helix;
import com.fasterxml.jackson.databind.JsonNode;
+import java.io.IOException;
import org.apache.pinot.common.config.TagNameUtils;
import org.apache.pinot.common.metadata.ZKMetadataProvider;
import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.common.utils.JsonUtils;
import org.apache.pinot.common.utils.ZkStarter;
-import java.io.IOException;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTest.java
index 0819b9b..9ed2859 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTest.java
@@ -18,14 +18,6 @@
*/
package org.apache.pinot.controller.helix;
-import org.apache.pinot.common.data.DimensionFieldSpec;
-import org.apache.pinot.common.data.FieldSpec;
-import org.apache.pinot.common.data.MetricFieldSpec;
-import org.apache.pinot.common.data.Schema;
-import org.apache.pinot.common.utils.ZkStarter;
-import org.apache.pinot.controller.ControllerConf;
-import org.apache.pinot.controller.ControllerStarter;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
@@ -48,6 +40,14 @@ import org.apache.helix.HelixManager;
import org.apache.helix.ZNRecord;
import org.apache.helix.manager.zk.ZkClient;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.data.DimensionFieldSpec;
+import org.apache.pinot.common.data.FieldSpec;
+import org.apache.pinot.common.data.MetricFieldSpec;
+import org.apache.pinot.common.data.Schema;
+import org.apache.pinot.common.utils.ZkStarter;
+import org.apache.pinot.controller.ControllerConf;
+import org.apache.pinot.controller.ControllerStarter;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.testng.Assert;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/HelixHelperTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/HelixHelperTest.java
index 81afd86..6815ee3 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/HelixHelperTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/HelixHelperTest.java
@@ -19,10 +19,10 @@
package org.apache.pinot.controller.helix;
import com.google.common.base.Function;
-import org.apache.pinot.common.utils.helix.HelixHelper;
-import org.apache.pinot.common.utils.retry.RetryPolicies;
import javax.annotation.Nullable;
import org.apache.helix.model.IdealState;
+import org.apache.pinot.common.utils.helix.HelixHelper;
+import org.apache.pinot.common.utils.retry.RetryPolicies;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/PinotResourceManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/PinotResourceManagerTest.java
index 20e3cbe..15198fe 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/PinotResourceManagerTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/PinotResourceManagerTest.java
@@ -18,13 +18,6 @@
*/
package org.apache.pinot.controller.helix;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.ZkStarter;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
-import org.apache.pinot.controller.utils.SegmentMetadataMockUtils;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -32,6 +25,13 @@ import java.util.concurrent.TimeUnit;
import org.apache.helix.HelixAdmin;
import org.apache.helix.manager.zk.ZkClient;
import org.apache.helix.model.IdealState;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.ZkStarter;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
+import org.apache.pinot.controller.utils.SegmentMetadataMockUtils;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/SegmentStatusCheckerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/SegmentStatusCheckerTest.java
index ed6ddd2..0881287 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/SegmentStatusCheckerTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/SegmentStatusCheckerTest.java
@@ -18,13 +18,6 @@
*/
package org.apache.pinot.controller.helix;
-import org.apache.pinot.common.config.TableNameBuilder;
-import org.apache.pinot.common.metrics.ControllerGauge;
-import org.apache.pinot.common.metrics.ControllerMetrics;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.common.utils.LLCSegmentName;
-import org.apache.pinot.controller.ControllerConf;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import com.yammer.metrics.core.MetricsRegistry;
import java.util.ArrayList;
import java.util.List;
@@ -35,6 +28,13 @@ import org.apache.helix.ZNRecord;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.IdealState;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.metrics.ControllerGauge;
+import org.apache.pinot.common.metrics.ControllerMetrics;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.LLCSegmentName;
+import org.apache.pinot.controller.ControllerConf;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerTest.java
index 8a90a12..188b63a 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerTest.java
@@ -19,6 +19,16 @@
package org.apache.pinot.controller.helix.core;
import com.google.common.collect.BiMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+import org.I0Itec.zkclient.ZkClient;
+import org.apache.helix.PropertyPathBuilder;
+import org.apache.helix.ZNRecord;
+import org.apache.helix.manager.zk.ZNRecordSerializer;
+import org.apache.helix.model.IdealState;
+import org.apache.helix.model.InstanceConfig;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.config.TableNameBuilder;
import org.apache.pinot.common.config.TagNameUtils;
@@ -33,16 +43,6 @@ import org.apache.pinot.common.utils.ZkStarter;
import org.apache.pinot.controller.ControllerConf;
import org.apache.pinot.controller.helix.ControllerRequestBuilderUtil;
import org.apache.pinot.controller.helix.ControllerTest;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Random;
-import java.util.Set;
-import org.I0Itec.zkclient.ZkClient;
-import org.apache.helix.PropertyPathBuilder;
-import org.apache.helix.ZNRecord;
-import org.apache.helix.manager.zk.ZNRecordSerializer;
-import org.apache.helix.model.IdealState;
-import org.apache.helix.model.InstanceConfig;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/periodictask/ControllerPeriodicTaskTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/periodictask/ControllerPeriodicTaskTest.java
index 2efb305..f8f67b8 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/periodictask/ControllerPeriodicTaskTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/periodictask/ControllerPeriodicTaskTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.pinot.controller.helix.core.periodictask;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.IntStream;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManagerTest.java
index 1042eb8..4fb4c63 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManagerTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManagerTest.java
@@ -20,6 +20,26 @@ package org.apache.pinot.controller.helix.core.realtime;
import com.google.common.collect.Lists;
import com.google.common.io.Files;
+import com.yammer.metrics.core.MetricsRegistry;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import javax.annotation.Nonnull;
+import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.io.FileUtils;
+import org.apache.helix.HelixManager;
+import org.apache.helix.ZNRecord;
+import org.apache.helix.manager.zk.ZNRecordSerializer;
+import org.apache.helix.model.IdealState;
import org.apache.pinot.common.Utils;
import org.apache.pinot.common.config.IndexingConfig;
import org.apache.pinot.common.config.SegmentsValidationAndRetentionConfig;
@@ -49,26 +69,6 @@ import org.apache.pinot.core.realtime.stream.StreamConfig;
import org.apache.pinot.core.realtime.stream.StreamConfigProperties;
import org.apache.pinot.core.segment.index.SegmentMetadataImpl;
import org.apache.pinot.filesystem.PinotFSFactory;
-import com.yammer.metrics.core.MetricsRegistry;
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import javax.annotation.Nonnull;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.io.FileUtils;
-import org.apache.helix.HelixManager;
-import org.apache.helix.ZNRecord;
-import org.apache.helix.manager.zk.ZNRecordSerializer;
-import org.apache.helix.model.IdealState;
import org.apache.zookeeper.data.Stat;
import org.joda.time.Interval;
import org.testng.Assert;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/SegmentCompletionTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/SegmentCompletionTest.java
index b9e7160..67dd14a 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/SegmentCompletionTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/SegmentCompletionTest.java
@@ -18,27 +18,26 @@
*/
package org.apache.pinot.controller.helix.core.realtime;
-import org.apache.pinot.controller.helix.core.realtime.segment.CommittingSegmentDescriptor;
+import com.yammer.metrics.core.MetricsRegistry;
import java.lang.reflect.Field;
import java.util.List;
import java.util.Map;
import org.apache.helix.HelixManager;
import org.apache.helix.ZNRecord;
-import org.apache.zookeeper.data.Stat;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
import org.apache.pinot.common.metadata.segment.LLCRealtimeSegmentZKMetadata;
import org.apache.pinot.common.metrics.ControllerMetrics;
import org.apache.pinot.common.protocols.SegmentCompletionProtocol;
import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.common.utils.LLCSegmentName;
import org.apache.pinot.controller.ControllerConf;
-import com.yammer.metrics.core.MetricsRegistry;
-import static org.apache.pinot.common.protocols.SegmentCompletionProtocol.ControllerResponseStatus;
-import static org.apache.pinot.common.protocols.SegmentCompletionProtocol.Request;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import org.apache.pinot.controller.helix.core.realtime.segment.CommittingSegmentDescriptor;
+import org.apache.zookeeper.data.Stat;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import static org.apache.pinot.common.protocols.SegmentCompletionProtocol.*;
+import static org.mockito.Mockito.*;
public class SegmentCompletionTest {
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/segment/FlushThresholdUpdaterTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/segment/FlushThresholdUpdaterTest.java
index f8ee809..1c31b5b 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/segment/FlushThresholdUpdaterTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/segment/FlushThresholdUpdaterTest.java
@@ -18,6 +18,11 @@
*/
package org.apache.pinot.controller.helix.core.realtime.segment;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.metadata.segment.LLCRealtimeSegmentZKMetadata;
import org.apache.pinot.common.partition.PartitionAssignment;
@@ -27,11 +32,6 @@ import org.apache.pinot.core.realtime.impl.kafka.KafkaAvroMessageDecoder;
import org.apache.pinot.core.realtime.impl.kafka.KafkaConsumerFactory;
import org.apache.pinot.core.realtime.stream.StreamConfig;
import org.apache.pinot.core.realtime.stream.StreamConfigProperties;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/rebalance/DefaultRebalanceStrategyTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/rebalance/DefaultRebalanceStrategyTest.java
index b7d3069..9a85862 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/rebalance/DefaultRebalanceStrategyTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/rebalance/DefaultRebalanceStrategyTest.java
@@ -19,6 +19,17 @@
package org.apache.pinot.controller.helix.core.rebalance;
import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.commons.collections.map.HashedMap;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.helix.HelixManager;
+import org.apache.helix.model.IdealState;
+import org.apache.helix.model.builder.CustomModeISBuilder;
import org.apache.pinot.common.config.IndexingConfig;
import org.apache.pinot.common.config.SegmentsValidationAndRetentionConfig;
import org.apache.pinot.common.config.TableConfig;
@@ -33,17 +44,6 @@ import org.apache.pinot.controller.helix.core.PinotHelixSegmentOnlineOfflineStat
import org.apache.pinot.core.realtime.impl.kafka.KafkaAvroMessageDecoder;
import org.apache.pinot.core.realtime.impl.kafka.KafkaConsumerFactory;
import org.apache.pinot.core.realtime.stream.StreamConfigProperties;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.apache.commons.collections.map.HashedMap;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.helix.HelixManager;
-import org.apache.helix.model.IdealState;
-import org.apache.helix.model.builder.CustomModeISBuilder;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/rebalance/ReplicaGroupRebalanceStrategyTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/rebalance/ReplicaGroupRebalanceStrategyTest.java
index 5a1b35b..1dc0376 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/rebalance/ReplicaGroupRebalanceStrategyTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/rebalance/ReplicaGroupRebalanceStrategyTest.java
@@ -18,6 +18,13 @@
*/
package org.apache.pinot.controller.helix.core.rebalance;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.plist.PropertyListConfiguration;
+import org.apache.helix.model.IdealState;
import org.apache.pinot.common.config.ReplicaGroupStrategyConfig;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.config.TableNameBuilder;
@@ -29,13 +36,6 @@ import org.apache.pinot.controller.ControllerConf;
import org.apache.pinot.controller.helix.ControllerRequestBuilderUtil;
import org.apache.pinot.controller.helix.ControllerTest;
import org.apache.pinot.controller.utils.ReplicaGroupTestUtils;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.plist.PropertyListConfiguration;
-import org.apache.helix.model.IdealState;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/relocation/RealtimeSegmentRelocatorTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/relocation/RealtimeSegmentRelocatorTest.java
index 200aec2..c1b0e13 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/relocation/RealtimeSegmentRelocatorTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/relocation/RealtimeSegmentRelocatorTest.java
@@ -19,10 +19,6 @@
package org.apache.pinot.controller.helix.core.relocation;
import com.google.common.collect.Lists;
-import org.apache.pinot.common.config.RealtimeTagConfig;
-import org.apache.pinot.controller.ControllerConf;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
-import org.apache.pinot.controller.helix.core.PinotHelixSegmentOnlineOfflineStateModelGenerator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -34,6 +30,10 @@ import org.apache.helix.ZNRecord;
import org.apache.helix.manager.zk.ZNRecordSerializer;
import org.apache.helix.model.IdealState;
import org.apache.helix.model.builder.CustomModeISBuilder;
+import org.apache.pinot.common.config.RealtimeTagConfig;
+import org.apache.pinot.controller.ControllerConf;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
+import org.apache.pinot.controller.helix.core.PinotHelixSegmentOnlineOfflineStateModelGenerator;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/retention/RetentionManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/retention/RetentionManagerTest.java
index b4a781f..37b0346 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/retention/RetentionManagerTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/retention/RetentionManagerTest.java
@@ -18,6 +18,12 @@
*/
package org.apache.pinot.controller.helix.core.retention;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import org.apache.helix.HelixAdmin;
+import org.apache.helix.model.IdealState;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.config.TableNameBuilder;
import org.apache.pinot.common.metadata.segment.LLCRealtimeSegmentZKMetadata;
@@ -31,12 +37,6 @@ import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.apache.pinot.controller.helix.core.PinotTableIdealStateBuilder;
import org.apache.pinot.controller.helix.core.SegmentDeletionManager;
import org.apache.pinot.controller.helix.core.util.ZKMetadataUtils;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import org.apache.helix.HelixAdmin;
-import org.apache.helix.model.IdealState;
import org.joda.time.Duration;
import org.joda.time.Interval;
import org.mockito.ArgumentMatchers;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/retention/strategy/TimeRetentionStrategyTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/retention/strategy/TimeRetentionStrategyTest.java
index 909dd01..12c54d8 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/retention/strategy/TimeRetentionStrategyTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/retention/strategy/TimeRetentionStrategyTest.java
@@ -18,9 +18,9 @@
*/
package org.apache.pinot.controller.helix.core.retention.strategy;
+import java.util.concurrent.TimeUnit;
import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
-import java.util.concurrent.TimeUnit;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/sharding/SegmentAssignmentStrategyTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/sharding/SegmentAssignmentStrategyTest.java
index e083729..cd16782 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/sharding/SegmentAssignmentStrategyTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/sharding/SegmentAssignmentStrategyTest.java
@@ -18,6 +18,14 @@
*/
package org.apache.pinot.controller.helix.core.sharding;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import org.I0Itec.zkclient.ZkClient;
+import org.apache.helix.HelixAdmin;
+import org.apache.helix.HelixManager;
+import org.apache.helix.model.IdealState;
import org.apache.pinot.common.config.ColumnPartitionConfig;
import org.apache.pinot.common.config.IndexingConfig;
import org.apache.pinot.common.config.ReplicaGroupStrategyConfig;
@@ -34,14 +42,6 @@ import org.apache.pinot.controller.helix.core.util.HelixSetupUtils;
import org.apache.pinot.controller.helix.starter.HelixConfig;
import org.apache.pinot.controller.utils.ReplicaGroupTestUtils;
import org.apache.pinot.controller.utils.SegmentMetadataMockUtils;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import org.I0Itec.zkclient.ZkClient;
-import org.apache.helix.HelixAdmin;
-import org.apache.helix.HelixManager;
-import org.apache.helix.model.IdealState;
import org.testng.Assert;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeTest;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/util/SegmentDeletionManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/util/SegmentDeletionManagerTest.java
index 2b7ad01..462af47 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/util/SegmentDeletionManagerTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/util/SegmentDeletionManagerTest.java
@@ -19,10 +19,6 @@
package org.apache.pinot.controller.helix.core.util;
import com.google.common.io.Files;
-import org.apache.pinot.common.utils.CommonConstants;
-import org.apache.pinot.controller.helix.core.SegmentDeletionManager;
-import org.apache.pinot.filesystem.LocalPinotFS;
-import org.apache.pinot.filesystem.PinotFSFactory;
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
@@ -38,6 +34,10 @@ import org.apache.helix.ZNRecord;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.IdealState;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.controller.helix.core.SegmentDeletionManager;
+import org.apache.pinot.filesystem.LocalPinotFS;
+import org.apache.pinot.filesystem.PinotFSFactory;
import org.joda.time.DateTime;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/util/TableRebalancerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/util/TableRebalancerTest.java
index f908661..f822c27 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/util/TableRebalancerTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/util/TableRebalancerTest.java
@@ -18,9 +18,6 @@
*/
package org.apache.pinot.controller.helix.core.util;
-import org.apache.pinot.common.utils.EqualityUtils;
-import org.apache.pinot.controller.helix.core.TableRebalancer;
-import org.apache.pinot.controller.helix.core.rebalance.RebalanceUserConfigConstants;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
@@ -29,6 +26,9 @@ import java.util.Set;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.helix.model.IdealState;
+import org.apache.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.controller.helix.core.TableRebalancer;
+import org.apache.pinot.controller.helix.core.rebalance.RebalanceUserConfigConstants;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/utils/ReplicaGroupTestUtils.java b/pinot-controller/src/test/java/org/apache/pinot/controller/utils/ReplicaGroupTestUtils.java
index 8ab8774..283fcf8 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/utils/ReplicaGroupTestUtils.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/utils/ReplicaGroupTestUtils.java
@@ -18,17 +18,17 @@
*/
package org.apache.pinot.controller.utils;
-import org.apache.pinot.common.config.ReplicaGroupStrategyConfig;
-import org.apache.pinot.common.config.TableConfig;
-import org.apache.pinot.common.partition.ReplicaGroupPartitionAssignment;
-import org.apache.pinot.common.segment.SegmentMetadata;
-import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.pinot.common.config.ReplicaGroupStrategyConfig;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.partition.ReplicaGroupPartitionAssignment;
+import org.apache.pinot.common.segment.SegmentMetadata;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
public class ReplicaGroupTestUtils {
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/utils/SegmentMetadataMockUtils.java b/pinot-controller/src/test/java/org/apache/pinot/controller/utils/SegmentMetadataMockUtils.java
index 304ab70..e504562 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/utils/SegmentMetadataMockUtils.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/utils/SegmentMetadataMockUtils.java
@@ -18,15 +18,14 @@
*/
package org.apache.pinot.controller.utils;
-import org.apache.pinot.common.metadata.segment.RealtimeSegmentZKMetadata;
-import org.apache.pinot.common.segment.SegmentMetadata;
-import org.apache.pinot.core.segment.index.ColumnMetadata;
-import org.apache.pinot.core.segment.index.SegmentMetadataImpl;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
-
import org.apache.commons.lang.math.IntRange;
+import org.apache.pinot.common.metadata.segment.RealtimeSegmentZKMetadata;
+import org.apache.pinot.common.segment.SegmentMetadata;
+import org.apache.pinot.core.segment.index.ColumnMetadata;
+import org.apache.pinot.core.segment.index.SegmentMetadataImpl;
import org.joda.time.Interval;
import org.mockito.Mockito;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/validation/StorageQuotaCheckerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/validation/StorageQuotaCheckerTest.java
index 974d8f6..1b81c95 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/validation/StorageQuotaCheckerTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/validation/StorageQuotaCheckerTest.java
@@ -18,6 +18,12 @@
*/
package org.apache.pinot.controller.validation;
+import com.yammer.metrics.core.MetricsRegistry;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import org.apache.commons.io.FileUtils;
import org.apache.pinot.common.config.QuotaConfig;
import org.apache.pinot.common.config.SegmentsValidationAndRetentionConfig;
import org.apache.pinot.common.config.TableConfig;
@@ -26,12 +32,6 @@ import org.apache.pinot.common.metrics.ControllerGauge;
import org.apache.pinot.common.metrics.ControllerMetrics;
import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.apache.pinot.controller.util.TableSizeReader;
-import com.yammer.metrics.core.MetricsRegistry;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import org.apache.commons.io.FileUtils;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.testng.Assert;
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/validation/ValidationManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/validation/ValidationManagerTest.java
index 757c505..db7a08a 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/validation/ValidationManagerTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/validation/ValidationManagerTest.java
@@ -18,6 +18,13 @@
*/
package org.apache.pinot.controller.validation;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.helix.HelixAdmin;
+import org.apache.helix.HelixManager;
+import org.apache.helix.manager.zk.ZkClient;
+import org.apache.helix.model.IdealState;
+import org.apache.helix.model.InstanceConfig;
import org.apache.pinot.common.config.TableConfig;
import org.apache.pinot.common.config.TagNameUtils;
import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
@@ -32,13 +39,6 @@ import org.apache.pinot.controller.helix.ControllerRequestBuilderUtil;
import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.apache.pinot.controller.helix.core.util.HelixSetupUtils;
import org.apache.pinot.controller.utils.SegmentMetadataMockUtils;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.helix.HelixAdmin;
-import org.apache.helix.HelixManager;
-import org.apache.helix.manager.zk.ZkClient;
-import org.apache.helix.model.IdealState;
-import org.apache.helix.model.InstanceConfig;
import org.joda.time.DateTime;
import org.joda.time.Duration;
import org.joda.time.Interval;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/bloom/GuavaOnHeapBloomFilter.java b/pinot-core/src/main/java/org/apache/pinot/core/bloom/GuavaOnHeapBloomFilter.java
index 3e5b829..9c43bc5 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/bloom/GuavaOnHeapBloomFilter.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/bloom/GuavaOnHeapBloomFilter.java
@@ -18,13 +18,12 @@
*/
package org.apache.pinot.core.bloom;
+import com.google.common.hash.Funnels;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.Charset;
-import com.google.common.hash.Funnels;
-
/**
* Bloom filter implementation with guava library
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/common/DataBlockCache.java b/pinot-core/src/main/java/org/apache/pinot/core/common/DataBlockCache.java
index fa8474c..37984fb 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/common/DataBlockCache.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/common/DataBlockCache.java
@@ -18,14 +18,14 @@
*/
package org.apache.pinot.core.common;
-import org.apache.pinot.common.data.FieldSpec;
-import org.apache.pinot.common.utils.EqualityUtils;
-import org.apache.pinot.core.plan.DocIdSetPlanNode;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import javax.annotation.Nonnull;
+import org.apache.pinot.common.data.FieldSpec;
+import org.apache.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
/**
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/common/DataFetcher.java b/pinot-core/src/main/java/org/apache/pinot/core/common/DataFetcher.java
index 74d7b58..41ed5ec 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/common/DataFetcher.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/common/DataFetcher.java
@@ -18,12 +18,12 @@
*/
package org.apache.pinot.core.common;
-import org.apache.pinot.core.operator.docvalsets.SingleValueSet;
-import org.apache.pinot.core.plan.DocIdSetPlanNode;
-import org.apache.pinot.core.segment.index.readers.Dictionary;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
... 17260 lines suppressed ...
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org