You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by ne...@apache.org on 2019/01/11 17:48:43 UTC

[incubator-pinot] branch rename_package_apache_release created (now 351139a)

This is an automated email from the ASF dual-hosted git repository.

nehapawar pushed a change to branch rename_package_apache_release
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git.


      at 351139a  Rename all package references from com.linkedin to org.apache

This branch includes the following new commits:

     new 351139a  Rename all package references from com.linkedin to org.apache

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org


[incubator-pinot] 01/01: Rename all package references from com.linkedin to org.apache

Posted by ne...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

nehapawar pushed a commit to branch rename_package_apache_release
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git

commit 351139aeab8baf1917a0e5ef21dda3d55283c491
Author: Neha Pawar <np...@linkedin.com>
AuthorDate: Fri Jan 11 09:48:06 2019 -0800

    Rename all package references from com.linkedin to org.apache
---
 contrib/pinot-druid-benchmark/pom.xml              | 14 ++--
 .../org/apache/pinotdruidbenchmark/DataMerger.java |  2 +-
 .../apache/pinotdruidbenchmark/DataSeparator.java  |  2 +-
 .../pinotdruidbenchmark/DruidResponseTime.java     |  2 +-
 .../pinotdruidbenchmark/DruidThroughput.java       |  2 +-
 .../pinotdruidbenchmark/PinotResponseTime.java     |  2 +-
 .../pinotdruidbenchmark/PinotThroughput.java       |  2 +-
 .../main/resources/config/pinot_csv_config.json    |  2 +-
 .../src/main/resources/config/pinot_table.json     |  2 +-
 pinot-api/pom.xml                                  |  2 +-
 .../org/apache/pinot/client/AbstractResultSet.java |  2 +-
 .../apache/pinot/client/AggregationResultSet.java  |  2 +-
 .../org/apache/pinot/client/BrokerResponse.java    |  2 +-
 .../org/apache/pinot/client/BrokerSelector.java    |  2 +-
 .../java/org/apache/pinot/client/Connection.java   |  2 +-
 .../org/apache/pinot/client/ConnectionFactory.java |  2 +-
 .../apache/pinot/client/DynamicBrokerSelector.java |  6 +-
 .../apache/pinot/client/ExternalViewReader.java    |  2 +-
 .../org/apache/pinot/client/GroupByResultSet.java  |  2 +-
 .../client/JsonAsyncHttpPinotClientTransport.java  |  2 +-
 .../JsonAsyncHttpPinotClientTransportFactory.java  |  2 +-
 .../apache/pinot/client/PinotClientException.java  |  2 +-
 .../apache/pinot/client/PinotClientTransport.java  |  2 +-
 .../pinot/client/PinotClientTransportFactory.java  |  2 +-
 .../org/apache/pinot/client/PreparedStatement.java |  2 +-
 .../java/org/apache/pinot/client/ResultSet.java    |  2 +-
 .../org/apache/pinot/client/ResultSetGroup.java    |  2 +-
 .../apache/pinot/client/SelectionResultSet.java    |  2 +-
 .../apache/pinot/client/SimpleBrokerSelector.java  |  2 +-
 .../java/org/apache/pinot/client/TextTable.java    |  2 +-
 .../java/org/apache/pinot/client/package-info.java | 20 ++---
 .../apache/pinot/client/ConnectionFactoryTest.java |  2 +-
 .../apache/pinot/client/PreparedStatementTest.java |  2 +-
 .../apache/pinot/client/ResultSetGroupTest.java    |  2 +-
 pinot-api/src/test/resources/log4j.properties      |  2 +-
 .../org/apache/pinot/client/aggregation.json       |  2 +-
 .../apache/pinot/client/aggregationGroupBy.json    |  2 +-
 .../org/apache/pinot/client/exception.json         |  2 +-
 .../org/apache/pinot/client/selection.json         |  2 +-
 pinot-azure-filesystem/pom.xml                     |  8 +-
 .../org/apache/pinot/filesystem/AzurePinotFS.java  |  4 +-
 .../datalake/store/MockADLFileInputStream.java     |  2 +-
 .../pinot/filesystem/test/AzurePinotFSTest.java    |  4 +-
 pinot-broker/pom.xml                               | 18 ++--
 .../org/apache/pinot/broker/api/AccessControl.java |  4 +-
 .../apache/pinot/broker/api/RequestStatistics.java |  4 +-
 .../apache/pinot/broker/api/RequesterIdentity.java |  2 +-
 .../broker/api/resources/PinotBrokerDebug.java     | 14 ++--
 .../api/resources/PinotBrokerHealthCheck.java      |  8 +-
 .../broker/api/resources/PinotClientRequest.java   | 16 ++--
 .../pinot/broker/broker/AccessControlFactory.java  |  4 +-
 .../broker/AllowAllAccessControlFactory.java       |  8 +-
 .../broker/broker/BrokerAdminApiApplication.java   | 12 +--
 .../pinot/broker/broker/BrokerServerBuilder.java   | 24 +++---
 ...okerResourceOnlineOfflineStateModelFactory.java | 16 ++--
 .../broker/broker/helix/ClusterChangeMediator.java | 10 +--
 .../broker/helix/DefaultHelixBrokerConfig.java     |  2 +-
 .../broker/broker/helix/HelixBrokerStarter.java    | 24 +++---
 .../helix/LiveInstancesChangeListenerImpl.java     | 10 +--
 .../TimeboundaryRefreshMessageHandlerFactory.java  |  6 +-
 .../broker/pruner/PartitionZKMetadataPruner.java   | 18 ++--
 .../pinot/broker/pruner/SegmentPrunerContext.java  |  8 +-
 .../broker/pruner/SegmentZKMetadataPruner.java     |  4 +-
 .../pruner/SegmentZKMetadataPrunerProvider.java    |  2 +-
 .../pruner/SegmentZKMetadataPrunerService.java     |  4 +-
 .../apache/pinot/broker/queryquota/HitCounter.java |  2 +-
 .../pinot/broker/queryquota/QueryQuotaConfig.java  |  2 +-
 .../broker/queryquota/TableQueryQuotaManager.java  | 20 ++---
 .../requesthandler/BaseBrokerRequestHandler.java   | 48 +++++------
 .../requesthandler/BrokerRequestHandler.java       |  8 +-
 .../requesthandler/BrokerRequestOptimizer.java     | 10 +--
 .../ConnectionPoolBrokerRequestHandler.java        | 68 +++++++--------
 .../FilterQueryOptimizerRequest.java               |  4 +-
 .../requesthandler/FilterQueryTreeOptimizer.java   |  4 +-
 ...enNestedPredicatesFilterQueryTreeOptimizer.java |  6 +-
 ...ualitiesToInClauseFilterQueryTreeOptimizer.java |  8 +-
 .../broker/requesthandler/OptimizationFlags.java   |  4 +-
 .../broker/requesthandler/RangeMergeOptimizer.java |  8 +-
 .../SingleConnectionBrokerRequestHandler.java      | 40 ++++-----
 .../pinot/broker/routing/CfgBasedRouting.java      |  6 +-
 .../routing/HelixExternalViewBasedRouting.java     | 28 +++----
 .../HelixExternalViewBasedTimeBoundaryService.java | 16 ++--
 .../apache/pinot/broker/routing/RoutingTable.java  |  2 +-
 .../broker/routing/RoutingTableBuilderFactory.java | 30 +++----
 .../broker/routing/RoutingTableLookupRequest.java  |  6 +-
 .../pinot/broker/routing/TimeBoundaryService.java  |  4 +-
 .../builder/BalancedRandomRoutingTableBuilder.java |  6 +-
 .../BasePartitionAwareRoutingTableBuilder.java     | 20 ++---
 .../routing/builder/BaseRoutingTableBuilder.java   | 18 ++--
 .../builder/DefaultOfflineRoutingTableBuilder.java | 10 +--
 .../DefaultRealtimeRoutingTableBuilder.java        | 12 +--
 .../builder/GeneratorBasedRoutingTableBuilder.java |  2 +-
 .../HighLevelConsumerBasedRoutingTableBuilder.java |  8 +-
 .../builder/LargeClusterRoutingTableBuilder.java   |  6 +-
 .../LowLevelConsumerRoutingTableBuilder.java       | 12 +--
 .../builder/LowLevelRoutingTableBuilderUtil.java   |  6 +-
 .../PartitionAwareOfflineRoutingTableBuilder.java  | 22 ++---
 .../PartitionAwareRealtimeRoutingTableBuilder.java | 20 ++---
 .../routing/builder/RoutingTableBuilder.java       | 10 +--
 .../builder/RoutingTableInstancePruner.java        |  4 +-
 .../routing/selector/MergedSegmentSelector.java    | 12 +--
 .../broker/routing/selector/SegmentSelector.java   |  6 +-
 .../routing/selector/SegmentSelectorProvider.java  |  4 +-
 .../pinot/broker/broker/BrokerTestUtils.java       |  6 +-
 .../EmptyBrokerOnlineOfflineStateModelFactory.java |  2 +-
 ...EmptySegmentOnlineOfflineStateModelFactory.java |  2 +-
 .../broker/broker/HelixBrokerStarterTest.java      | 38 ++++-----
 .../broker/broker/HelixBrokerStarterUtilsTest.java |  4 +-
 .../broker/pruner/SegmentZKMetadataPrunerTest.java | 14 ++--
 .../pinot/broker/queryquota/HitCounterTest.java    |  2 +-
 .../queryquota/TableQueryQuotaManagerTest.java     | 18 ++--
 .../broker/requesthandler/FilterOptimizerTest.java | 12 +--
 ...tiesToInClauseFilterQueryTreeOptimizerTest.java | 10 +--
 .../requesthandler/OptimizationFlagsTest.java      |  4 +-
 .../requesthandler/RangeMergeOptimizerTest.java    | 10 +--
 .../broker/routing/RandomRoutingTableTest.java     | 10 +--
 .../pinot/broker/routing/RoutingTableTest.java     | 26 +++---
 .../broker/routing/TimeBoundaryServiceTest.java    | 18 ++--
 .../BalancedRandomRoutingTableBuilderTest.java     |  6 +-
 .../HighLevelConsumerRoutingTableBuilderTest.java  | 10 +--
 .../LargeClusterRoutingTableBuilderTest.java       |  4 +-
 .../LowLevelConsumerRoutingTableBuilderTest.java   | 10 +--
 ...rtitionAwareOfflineRoutingTableBuilderTest.java | 32 +++----
 ...titionAwareRealtimeRoutingTableBuilderTest.java | 32 +++----
 .../builder/RoutingTableBuilderTestUtil.java       | 10 +--
 .../selector/MergedSegmentSelectorTest.java        | 12 +--
 .../pinot/broker/util/FakePropertyStore.java       |  2 +-
 .../src/test/resources/SampleExternalView.json     |  2 +-
 pinot-broker/src/test/resources/log4j.properties   |  2 +-
 pinot-common/pom.xml                               |  4 +-
 .../main/java/org/apache/pinot/common/Utils.java   |  2 +-
 .../config/AdjustTableNameChildKeyTransformer.java |  4 +-
 .../pinot/common/config/ChildKeyHandler.java       |  2 +-
 .../pinot/common/config/ChildKeyTransformer.java   |  2 +-
 .../pinot/common/config/ColumnPartitionConfig.java |  4 +-
 .../config/ColumnPartitionMapChildKeyHandler.java  |  2 +-
 .../apache/pinot/common/config/CombinedConfig.java | 12 +--
 .../pinot/common/config/CombinedConfigLoader.java  |  4 +-
 ...CombinedConfigSeparatorChildKeyTransformer.java |  4 +-
 .../org/apache/pinot/common/config/ConfigDoc.java  |  2 +-
 .../org/apache/pinot/common/config/ConfigKey.java  |  2 +-
 .../common/config/ConfigNodeLifecycleAware.java    |  2 +-
 .../apache/pinot/common/config/Deserializer.java   |  4 +-
 .../org/apache/pinot/common/config/Duration.java   |  4 +-
 .../apache/pinot/common/config/DurationDsl.java    |  2 +-
 .../apache/pinot/common/config/IndexingConfig.java |  6 +-
 .../common/config/NamedListChildKeyHandler.java    |  2 +-
 .../apache/pinot/common/config/NestedConfig.java   |  2 +-
 .../pinot/common/config/OfflineTagConfig.java      |  2 +-
 .../pinot/common/config/PinotTaskConfig.java       |  4 +-
 .../apache/pinot/common/config/QuotaConfig.java    |  6 +-
 .../pinot/common/config/RealtimeTagConfig.java     |  2 +-
 .../config/RemapTableTypesChildKeyTransformer.java |  2 +-
 .../common/config/ReplicaGroupStrategyConfig.java  |  4 +-
 .../apache/pinot/common/config/RoutingConfig.java  |  4 +-
 .../common/config/SegmentPartitionConfig.java      |  6 +-
 .../SegmentsValidationAndRetentionConfig.java      |  6 +-
 .../org/apache/pinot/common/config/Serializer.java |  2 +-
 .../common/config/SimpleMapChildKeyHandler.java    |  2 +-
 .../apache/pinot/common/config/SingleKeyDsl.java   |  2 +-
 .../pinot/common/config/StarTreeIndexConfig.java   |  2 +-
 .../common/config/StreamConsumptionConfig.java     |  2 +-
 .../apache/pinot/common/config/TableConfig.java    | 12 +--
 .../pinot/common/config/TableCustomConfig.java     |  4 +-
 .../pinot/common/config/TableNameBuilder.java      |  6 +-
 .../pinot/common/config/TableTaskConfig.java       |  4 +-
 .../org/apache/pinot/common/config/TagConfig.java  |  2 +-
 .../apache/pinot/common/config/TagNameUtils.java   |  6 +-
 .../pinot/common/config/TagOverrideConfig.java     |  4 +-
 .../config/TaskConfigMapChildKeyHandler.java       |  2 +-
 .../org/apache/pinot/common/config/Tenant.java     |  6 +-
 .../apache/pinot/common/config/TenantConfig.java   |  4 +-
 .../common/config/TypedMapChildKeyHandler.java     |  2 +-
 .../pinot/common/config/UseChildKeyHandler.java    |  2 +-
 .../common/config/UseChildKeyTransformers.java     |  2 +-
 .../org/apache/pinot/common/config/UseDsl.java     |  2 +-
 .../pinot/common/data/DateTimeFieldSpec.java       |  6 +-
 .../data/DateTimeFieldSpecChildKeyHandler.java     |  4 +-
 .../common/data/DateTimeFormatPatternSpec.java     |  6 +-
 .../pinot/common/data/DateTimeFormatSpec.java      |  6 +-
 .../pinot/common/data/DateTimeFormatUnitSpec.java  |  4 +-
 .../pinot/common/data/DateTimeGranularitySpec.java |  4 +-
 .../pinot/common/data/DimensionFieldSpec.java      |  2 +-
 .../data/DimensionFieldSpecChildKeyHandler.java    |  4 +-
 .../org/apache/pinot/common/data/FieldSpec.java    | 12 +--
 .../apache/pinot/common/data/MetricFieldSpec.java  |  8 +-
 .../data/MetricFieldSpecChildKeyHandler.java       |  4 +-
 .../org/apache/pinot/common/data/RowEvent.java     |  2 +-
 .../java/org/apache/pinot/common/data/Schema.java  | 20 ++---
 .../java/org/apache/pinot/common/data/Segment.java |  2 +-
 .../pinot/common/data/StarTreeIndexSpec.java       | 10 +--
 .../apache/pinot/common/data/TimeFieldSpec.java    |  8 +-
 .../pinot/common/data/TimeGranularitySpec.java     | 10 +--
 .../common/exception/HttpErrorStatusException.java |  2 +-
 .../common/exception/InvalidConfigException.java   |  2 +-
 .../pinot/common/exception/QueryException.java     |  4 +-
 .../common/exception/TableNotFoundException.java   |  2 +-
 .../apache/pinot/common/http/MultiGetRequest.java  |  2 +-
 .../apache/pinot/common/lineage/SegmentGroup.java  |  2 +-
 .../pinot/common/lineage/SegmentMergeLineage.java  |  6 +-
 .../lineage/SegmentMergeLineageAccessHelper.java   |  8 +-
 .../common/messages/SegmentRefreshMessage.java     |  2 +-
 .../common/messages/SegmentReloadMessage.java      |  2 +-
 .../messages/TimeboundaryRefreshMessage.java       |  2 +-
 .../apache/pinot/common/metadata/ZKMetadata.java   |  2 +-
 .../pinot/common/metadata/ZKMetadataProvider.java  | 26 +++---
 .../metadata/instance/InstanceZKMetadata.java      | 16 ++--
 .../metadata/segment/ColumnPartitionMetadata.java  |  6 +-
 .../segment/LLCRealtimeSegmentZKMetadata.java      | 10 +--
 .../metadata/segment/OfflineSegmentZKMetadata.java | 14 ++--
 .../segment/RealtimeSegmentZKMetadata.java         | 10 +--
 .../metadata/segment/SegmentPartitionMetadata.java |  4 +-
 .../common/metadata/segment/SegmentZKMetadata.java | 12 +--
 .../SegmentZKMetadataCustomMapModifier.java        |  4 +-
 .../pinot/common/metrics/AbstractMetrics.java      |  6 +-
 .../pinot/common/metrics/AggregatedCounter.java    |  2 +-
 .../pinot/common/metrics/AggregatedHistogram.java  |  2 +-
 .../pinot/common/metrics/AggregatedLongGauge.java  |  2 +-
 .../pinot/common/metrics/AggregatedMeter.java      |  2 +-
 .../common/metrics/AggregatedMetricsRegistry.java  |  2 +-
 .../apache/pinot/common/metrics/BrokerGauge.java   |  4 +-
 .../apache/pinot/common/metrics/BrokerMeter.java   |  4 +-
 .../apache/pinot/common/metrics/BrokerMetrics.java |  2 +-
 .../pinot/common/metrics/BrokerQueryPhase.java     |  4 +-
 .../apache/pinot/common/metrics/BrokerTimer.java   |  4 +-
 .../pinot/common/metrics/ControllerGauge.java      |  4 +-
 .../pinot/common/metrics/ControllerMeter.java      |  4 +-
 .../pinot/common/metrics/ControllerMetrics.java    |  2 +-
 .../pinot/common/metrics/ControllerTimer.java      |  4 +-
 ...eporterMetricsRegistryRegistrationListener.java |  2 +-
 .../apache/pinot/common/metrics/LatencyMetric.java |  2 +-
 .../apache/pinot/common/metrics/MetricsHelper.java |  2 +-
 .../MetricsRegistryRegistrationListener.java       |  2 +-
 .../apache/pinot/common/metrics/ServerGauge.java   |  4 +-
 .../apache/pinot/common/metrics/ServerMeter.java   |  4 +-
 .../apache/pinot/common/metrics/ServerMetrics.java |  2 +-
 .../pinot/common/metrics/ServerQueryPhase.java     |  4 +-
 .../apache/pinot/common/metrics/ServerTimer.java   |  4 +-
 .../pinot/common/metrics/ValidationMetrics.java    |  2 +-
 .../common/partition/PartitionAssignment.java      |  4 +-
 .../partition/ReplicaGroupPartitionAssignment.java |  2 +-
 .../ReplicaGroupPartitionAssignmentGenerator.java  | 10 +--
 .../StreamPartitionAssignmentGenerator.java        | 14 ++--
 .../protocols/SegmentCompletionProtocol.java       |  4 +-
 .../apache/pinot/common/query/ReduceService.java   | 12 +--
 .../pinot/common/query/ReduceServiceRegistry.java  |  6 +-
 .../pinot/common/request/AggregationInfo.java      |  2 +-
 .../apache/pinot/common/request/BrokerRequest.java |  2 +-
 .../pinot/common/request/FilterOperator.java       |  2 +-
 .../apache/pinot/common/request/FilterQuery.java   |  6 +-
 .../pinot/common/request/FilterQueryMap.java       |  2 +-
 .../org/apache/pinot/common/request/GroupBy.java   |  2 +-
 .../pinot/common/request/HavingFilterQuery.java    |  6 +-
 .../pinot/common/request/HavingFilterQueryMap.java |  2 +-
 .../pinot/common/request/InstanceRequest.java      |  2 +-
 .../apache/pinot/common/request/QuerySource.java   |  2 +-
 .../org/apache/pinot/common/request/QueryType.java |  2 +-
 .../org/apache/pinot/common/request/Selection.java |  2 +-
 .../apache/pinot/common/request/SelectionSort.java |  2 +-
 .../request/transform/TransformExpressionTree.java | 20 ++---
 .../pinot/common/response/BrokerResponse.java      |  4 +-
 .../common/response/BrokerResponseFactory.java     |  4 +-
 .../pinot/common/response/ProcessingException.java |  2 +-
 .../pinot/common/response/ServerInstance.java      |  4 +-
 .../common/response/broker/AggregationResult.java  |  2 +-
 .../response/broker/BrokerResponseNative.java      | 10 +--
 .../common/response/broker/GroupByResult.java      |  2 +-
 .../response/broker/QueryProcessingException.java  |  2 +-
 .../common/response/broker/SelectionResults.java   |  2 +-
 .../common/restlet/resources/RebalanceResult.java  |  6 +-
 .../common/restlet/resources/ResourceUtils.java    |  4 +-
 .../common/restlet/resources/SegmentSizeInfo.java  |  2 +-
 .../common/restlet/resources/TableSegments.java    |  2 +-
 .../common/restlet/resources/TableSizeInfo.java    |  2 +-
 .../pinot/common/restlet/resources/TablesList.java |  2 +-
 .../org/apache/pinot/common/segment/ReadMode.java  |  4 +-
 .../pinot/common/segment/SegmentMetadata.java      |  6 +-
 .../pinot/common/segment/StarTreeMetadata.java     |  2 +-
 .../common/segment/fetcher/HdfsSegmentFetcher.java | 10 +--
 .../common/segment/fetcher/HttpSegmentFetcher.java | 10 +--
 .../segment/fetcher/HttpsSegmentFetcher.java       |  8 +-
 .../segment/fetcher/LocalFileSegmentFetcher.java   |  2 +-
 .../pinot/common/segment/fetcher/NoOpFetcher.java  |  2 +-
 .../segment/fetcher/PinotFSSegmentFetcher.java     |  8 +-
 .../common/segment/fetcher/SegmentFetcher.java     |  2 +-
 .../segment/fetcher/SegmentFetcherFactory.java     |  2 +-
 .../common/utils/ClientSSLContextGenerator.java    |  4 +-
 .../apache/pinot/common/utils/CommonConstants.java | 10 +--
 .../org/apache/pinot/common/utils/DataSchema.java  |  4 +-
 .../org/apache/pinot/common/utils/DataSize.java    |  2 +-
 .../org/apache/pinot/common/utils/DataTable.java   |  4 +-
 .../apache/pinot/common/utils/EqualityUtils.java   |  2 +-
 .../common/utils/FileUploadDownloadClient.java     |  4 +-
 .../org/apache/pinot/common/utils/FileUtils.java   |  2 +-
 .../apache/pinot/common/utils/HLCSegmentName.java  |  4 +-
 .../org/apache/pinot/common/utils/HashUtil.java    |  2 +-
 .../org/apache/pinot/common/utils/JsonUtils.java   |  4 +-
 .../pinot/common/utils/KafkaStarterUtils.java      |  2 +-
 .../apache/pinot/common/utils/LLCSegmentName.java  |  2 +-
 .../org/apache/pinot/common/utils/LLCUtils.java    |  2 +-
 .../org/apache/pinot/common/utils/LogUtils.java    |  2 +-
 .../pinot/common/utils/NamedThreadFactory.java     |  2 +-
 .../org/apache/pinot/common/utils/NetUtil.java     |  2 +-
 .../java/org/apache/pinot/common/utils/Pairs.java  |  2 +-
 .../pinot/common/utils/PrimitiveArrayUtils.java    |  2 +-
 .../org/apache/pinot/common/utils/SchemaUtils.java |  6 +-
 .../org/apache/pinot/common/utils/SegmentName.java |  2 +-
 .../org/apache/pinot/common/utils/ServerType.java  |  2 +-
 .../apache/pinot/common/utils/ServiceStatus.java   |  4 +-
 .../pinot/common/utils/SimpleHttpResponse.java     |  2 +-
 .../org/apache/pinot/common/utils/StringUtil.java  |  2 +-
 .../pinot/common/utils/TarGzCompressionUtils.java  |  4 +-
 .../org/apache/pinot/common/utils/TenantRole.java  |  2 +-
 .../org/apache/pinot/common/utils/ZkStarter.java   |  2 +-
 .../pinot/common/utils/helix/HelixHelper.java      | 12 +--
 .../PinotHelixPropertyStoreZnRecordProvider.java   |  2 +-
 .../pinot/common/utils/primitive/ByteArray.java    |  2 +-
 .../common/utils/request/FilterQueryTree.java      |  6 +-
 .../common/utils/request/HavingQueryTree.java      |  6 +-
 .../pinot/common/utils/request/QueryTree.java      |  4 +-
 .../pinot/common/utils/request/RequestUtils.java   | 20 ++---
 .../utils/retry/AttemptFailureException.java       |  2 +-
 .../utils/retry/AttemptsExceededException.java     |  2 +-
 .../pinot/common/utils/retry/BaseRetryPolicy.java  |  2 +-
 .../utils/retry/ExponentialBackoffRetryPolicy.java |  2 +-
 .../common/utils/retry/FixedDelayRetryPolicy.java  |  2 +-
 .../common/utils/retry/NoDelayRetryPolicy.java     |  2 +-
 .../utils/retry/RetriableOperationException.java   |  2 +-
 .../pinot/common/utils/retry/RetryPolicies.java    |  2 +-
 .../pinot/common/utils/retry/RetryPolicy.java      |  2 +-
 .../pinot/common/utils/time/TimeConverter.java     |  4 +-
 .../apache/pinot/common/utils/time/TimeUtils.java  |  2 +-
 .../common/utils/webhdfs/WebHdfsV1Client.java      |  2 +-
 .../apache/pinot/pql/parsers/AbstractCompiler.java |  6 +-
 .../apache/pinot/pql/parsers/Pql2AstListener.java  | 66 +++++++--------
 .../pql/parsers/Pql2CompilationException.java      |  2 +-
 .../org/apache/pinot/pql/parsers/Pql2Compiler.java | 26 +++---
 .../apache/pinot/pql/parsers/pql2/ast/AstNode.java |  4 +-
 .../pinot/pql/parsers/pql2/ast/BaseAstNode.java    |  4 +-
 .../parsers/pql2/ast/BetweenPredicateAstNode.java  | 10 +--
 .../pql/parsers/pql2/ast/BinaryMathOpAstNode.java  |  2 +-
 .../parsers/pql2/ast/BooleanOperatorAstNode.java   |  4 +-
 .../pql2/ast/ComparisonPredicateAstNode.java       | 10 +--
 .../ast/ExpressionParenthesisGroupAstNode.java     |  2 +-
 .../pql2/ast/FloatingPointLiteralAstNode.java      |  2 +-
 .../pql/parsers/pql2/ast/FunctionCallAstNode.java  | 10 +--
 .../pinot/pql/parsers/pql2/ast/GroupByAstNode.java |  8 +-
 .../pinot/pql/parsers/pql2/ast/HavingAstNode.java  |  6 +-
 .../pql/parsers/pql2/ast/IdentifierAstNode.java    |  2 +-
 .../pql/parsers/pql2/ast/InPredicateAstNode.java   | 12 +--
 .../parsers/pql2/ast/IntegerLiteralAstNode.java    |  2 +-
 .../pql/parsers/pql2/ast/IsPredicateAstNode.java   |  4 +-
 .../pinot/pql/parsers/pql2/ast/LimitAstNode.java   |  2 +-
 .../pinot/pql/parsers/pql2/ast/LiteralAstNode.java |  2 +-
 .../pinot/pql/parsers/pql2/ast/OptionAstNode.java  |  6 +-
 .../pinot/pql/parsers/pql2/ast/OptionsAstNode.java |  4 +-
 .../pinot/pql/parsers/pql2/ast/OrderByAstNode.java | 10 +--
 .../parsers/pql2/ast/OrderByExpressionAstNode.java |  2 +-
 .../pql/parsers/pql2/ast/OutputColumnAstNode.java  |  8 +-
 .../parsers/pql2/ast/OutputColumnListAstNode.java  |  4 +-
 .../pql/parsers/pql2/ast/PredicateAstNode.java     |  6 +-
 .../pql/parsers/pql2/ast/PredicateListAstNode.java |  8 +-
 .../pql2/ast/PredicateParenthesisGroupAstNode.java |  6 +-
 .../pql2/ast/RegexpLikePredicateAstNode.java       | 12 +--
 .../pinot/pql/parsers/pql2/ast/SelectAstNode.java  | 12 +--
 .../parsers/pql2/ast/StarColumnListAstNode.java    |  6 +-
 .../parsers/pql2/ast/StarExpressionAstNode.java    |  2 +-
 .../pql/parsers/pql2/ast/StringLiteralAstNode.java |  2 +-
 .../pql/parsers/pql2/ast/TableNameAstNode.java     |  2 +-
 .../pinot/pql/parsers/pql2/ast/TopAstNode.java     |  4 +-
 .../pinot/pql/parsers/pql2/ast/WhereAstNode.java   |  6 +-
 .../org/apache/pinot/pql/parsers/utils/Pair.java   |  2 +-
 .../main/java/org/apache/pinot/serde/SerDe.java    |  2 +-
 .../org/apache/pinot/startree/hll/HllConfig.java   |  8 +-
 .../apache/pinot/startree/hll/HllConstants.java    |  2 +-
 .../apache/pinot/startree/hll/HllSizeUtils.java    |  2 +-
 .../pinot/common/config/IndexingConfigTest.java    |  6 +-
 .../pinot/common/config/QuotaConfigTest.java       |  4 +-
 .../pinot/common/config/TableConfigTest.java       |  8 +-
 .../pinot/common/config/TagOverrideConfigTest.java |  4 +-
 .../org/apache/pinot/common/config/TenantTest.java |  6 +-
 .../common/config/TestConfigSerialization.java     | 12 +--
 .../pinot/common/data/DateTimeFormatSpecTest.java  | 24 +++---
 .../common/data/DateTimeGranularitySpecTest.java   |  2 +-
 .../apache/pinot/common/data/FieldSpecTest.java    |  6 +-
 .../org/apache/pinot/common/data/SchemaTest.java   |  6 +-
 .../pinot/common/http/MultiGetRequestTest.java     |  2 +-
 .../common/lineage/SegmentMergeLineageTest.java    |  4 +-
 .../common/metadata/InstanceZKMetadataTest.java    |  4 +-
 .../metadata/MetadataEqualsHashCodeTest.java       | 20 ++---
 .../pinot/common/metadata/MetadataUtils.java       |  2 +-
 .../common/metadata/SegmentZKMetadataTest.java     | 20 ++---
 .../pinot/common/metrics/MetricsHelperTest.java    |  2 +-
 .../common/partition/IdealStateBuilderUtil.java    |  8 +-
 .../StreamPartitionAssignmentGeneratorTest.java    | 12 +--
 .../pinot/common/query/gen/AvroQueryGenerator.java |  4 +-
 .../transform/TransformExpressionTreeTest.java     |  2 +-
 .../segment/fetcher/SegmentFetcherFactoryTest.java |  4 +-
 .../apache/pinot/common/utils/DataSchemaTest.java  |  8 +-
 .../apache/pinot/common/utils/DataSizeTest.java    |  2 +-
 .../pinot/common/utils/EqualityUtilsTest.java      |  2 +-
 .../common/utils/FileUploadDownloadClientTest.java |  4 +-
 .../pinot/common/utils/SegmentNameBuilderTest.java |  2 +-
 .../pinot/common/utils/ServiceStatusTest.java      |  4 +-
 .../apache/pinot/common/utils/StringUtilTest.java  |  2 +-
 .../common/utils/TarGzCompressionUtilsTest.java    |  2 +-
 .../org/apache/pinot/common/utils/UtilsTest.java   |  6 +-
 .../pinot/common/utils/retry/RetryPolicyTest.java  |  2 +-
 .../pinot/common/utils/time/TimeConverterTest.java |  6 +-
 .../apache/pinot/pql/parsers/Pql2CompilerTest.java | 16 ++--
 .../request/BrokerRequestSerializationTest.java    | 26 +++---
 .../pinot/request/BrokerResponseNativeTest.java    |  8 +-
 pinot-common/src/test/resources/log4j.properties   |  2 +-
 .../src/test/resources/test-table-config.conf      |  2 +-
 pinot-common/src/thrift/request.thrift             |  2 +-
 pinot-common/src/thrift/response.thrift            |  2 +-
 pinot-controller/pom.xml                           | 16 ++--
 .../apache/pinot/controller/ControllerConf.java    | 12 +--
 .../controller/ControllerLeadershipManager.java    |  2 +-
 .../apache/pinot/controller/ControllerStarter.java | 56 ++++++-------
 .../controller/LeadershipChangeSubscriber.java     |  2 +-
 .../pinot/controller/api/CallableHttpGet.java      |  2 +-
 .../api/ControllerAdminApiApplication.java         |  4 +-
 .../pinot/controller/api/access/AccessControl.java |  2 +-
 .../api/access/AccessControlFactory.java           |  2 +-
 .../api/access/AllowAllAccessFactory.java          |  2 +-
 .../api/events/DefaultMetadataEventNotifier.java   |  6 +-
 .../DefaultMetadataEventNotifierFactory.java       |  2 +-
 .../api/events/MetadataEventNotifier.java          |  6 +-
 .../api/events/MetadataEventNotifierFactory.java   |  2 +-
 .../controller/api/events/SchemaEventType.java     |  2 +-
 .../pinot/controller/api/pojos/Instance.java       |  4 +-
 .../pinot/controller/api/resources/Constants.java  |  4 +-
 .../resources/ControllerApplicationException.java  |  2 +-
 .../api/resources/ControllerResponseFilter.java    |  2 +-
 .../api/resources/FileUploadPathProvider.java      | 12 +--
 .../controller/api/resources/HeaderAdder.java      |  2 +-
 .../InvalidControllerConfigException.java          |  2 +-
 .../resources/LLCSegmentCompletionHandlers.java    | 18 ++--
 .../api/resources/LandingPageHandler.java          |  2 +-
 .../api/resources/PinotControllerHealthCheck.java  |  4 +-
 .../resources/PinotControllerResponseFilter.java   |  8 +-
 .../resources/PinotInstanceRestletResource.java    | 10 +--
 .../api/resources/PinotSchemaRestletResource.java  | 18 ++--
 .../api/resources/PinotSegmentRestletResource.java | 22 ++---
 .../PinotSegmentUploadRestletResource.java         | 46 +++++-----
 .../resources/PinotTableConfigRestletResource.java | 18 ++--
 .../api/resources/PinotTableIndexingConfigs.java   |  6 +-
 .../api/resources/PinotTableInstances.java         |  8 +-
 .../api/resources/PinotTableMetadataConfigs.java   |  6 +-
 .../api/resources/PinotTableRestletResource.java   | 36 ++++----
 .../controller/api/resources/PinotTableSchema.java |  6 +-
 .../api/resources/PinotTableSegmentConfigs.java    | 10 +--
 .../api/resources/PinotTableTenantConfigs.java     | 10 +--
 .../api/resources/PinotTaskRestletResource.java    |  8 +-
 .../api/resources/PinotTenantRestletResource.java  | 18 ++--
 .../api/resources/PinotVersionRestletResource.java |  6 +-
 .../controller/api/resources/PqlQueryResource.java | 20 ++---
 .../api/resources/ServerTableSizeReader.java       | 10 +--
 .../pinot/controller/api/resources/StateType.java  |  2 +-
 .../api/resources/StringResultResponse.java        |  2 +-
 .../controller/api/resources/SuccessResponse.java  |  2 +-
 .../pinot/controller/api/resources/TableSize.java  | 10 +--
 .../pinot/controller/api/resources/TableViews.java |  8 +-
 .../resources/WebApplicationExceptionMapper.java   |  4 +-
 .../controller/api/upload/SegmentValidator.java    | 26 +++---
 .../pinot/controller/api/upload/ZKOperator.java    | 28 +++----
 .../helix/ControllerRequestBuilderUtil.java        | 18 ++--
 .../helix/ControllerRequestURLBuilder.java         |  4 +-
 .../EmptyBrokerOnlineOfflineStateModelFactory.java |  2 +-
 ...EmptySegmentOnlineOfflineStateModelFactory.java |  2 +-
 .../controller/helix/SegmentStatusChecker.java     | 20 ++---
 ...erResourceOnlineOfflineStateModelGenerator.java |  2 +-
 .../helix/core/PinotHelixResourceManager.java      | 98 +++++++++++-----------
 ...lixSegmentOnlineOfflineStateModelGenerator.java |  2 +-
 .../helix/core/PinotResourceManagerResponse.java   |  2 +-
 .../helix/core/PinotTableIdealStateBuilder.java    | 26 +++---
 .../helix/core/SegmentDeletionManager.java         | 16 ++--
 .../controller/helix/core/TableRebalancer.java     | 20 ++---
 .../helix/core/minion/ClusterInfoProvider.java     | 22 ++---
 .../core/minion/PinotHelixTaskResourceManager.java |  6 +-
 .../helix/core/minion/PinotTaskManager.java        | 24 +++---
 .../generator/ConvertToRawIndexTaskGenerator.java  | 18 ++--
 .../core/minion/generator/PinotTaskGenerator.java  |  6 +-
 .../minion/generator/TaskGeneratorRegistry.java    |  6 +-
 .../core/minion/generator/TaskGeneratorUtils.java  | 10 +--
 .../core/periodictask/ControllerPeriodicTask.java  |  6 +-
 .../ControllerPeriodicTaskScheduler.java           | 10 +--
 .../realtime/PinotLLCRealtimeSegmentManager.java   | 88 +++++++++----------
 .../core/realtime/PinotRealtimeSegmentManager.java | 46 +++++-----
 .../core/realtime/SegmentCompletionManager.java    | 22 ++---
 .../helix/core/realtime/TableConfigCache.java      |  6 +-
 .../segment/CommittingSegmentDescriptor.java       |  4 +-
 .../segment/DefaultFlushThresholdUpdater.java      |  8 +-
 .../segment/FlushThresholdUpdateManager.java       |  6 +-
 .../realtime/segment/FlushThresholdUpdater.java    |  6 +-
 .../SegmentSizeBasedFlushThresholdUpdater.java     | 10 +--
 .../rebalance/DefaultRebalanceSegmentStrategy.java | 26 +++---
 .../core/rebalance/RebalanceSegmentStrategy.java   | 10 +--
 .../rebalance/RebalanceSegmentStrategyFactory.java |  6 +-
 .../rebalance/RebalanceUserConfigConstants.java    |  2 +-
 .../ReplicaGroupRebalanceSegmentStrategy.java      | 22 ++---
 .../core/relocation/RealtimeSegmentRelocator.java  | 24 +++---
 .../helix/core/retention/RetentionManager.java     | 30 +++----
 .../core/retention/strategy/RetentionStrategy.java |  4 +-
 .../retention/strategy/TimeRetentionStrategy.java  |  6 +-
 .../BalanceNumSegmentAssignmentStrategy.java       | 14 ++--
 .../core/sharding/BucketizedSegmentStrategy.java   |  8 +-
 .../core/sharding/RandomAssignmentStrategy.java    |  8 +-
 .../ReplicaGroupSegmentAssignmentStrategy.java     | 18 ++--
 .../core/sharding/SegmentAssignmentStrategy.java   |  4 +-
 .../sharding/SegmentAssignmentStrategyEnum.java    |  2 +-
 .../sharding/SegmentAssignmentStrategyFactory.java |  2 +-
 .../helix/core/util/HelixSetupUtils.java           | 12 +--
 .../helix/core/util/ZKMetadataUtils.java           | 18 ++--
 .../controller/helix/starter/HelixConfig.java      |  2 +-
 .../controller/util/AutoAddInvertedIndex.java      | 20 ++---
 .../controller/util/SegmentCompletionUtils.java    |  2 +-
 .../controller/util/TableRetentionValidator.java   | 16 ++--
 .../pinot/controller/util/TableSizeReader.java     | 18 ++--
 .../BrokerResourceValidationManager.java           | 10 +--
 .../validation/OfflineSegmentIntervalChecker.java  | 22 ++---
 .../RealtimeSegmentValidationManager.java          | 26 +++---
 .../controller/validation/StorageQuotaChecker.java | 20 ++---
 .../api/resources/AccessControlTest.java           | 10 +--
 .../api/resources/FileUploadPathProviderTest.java  |  6 +-
 .../api/resources/PinotFileUploadTest.java         | 12 +--
 .../PinotInstanceRestletResourceTest.java          | 10 +--
 .../resources/PinotSchemaRestletResourceTest.java  | 10 +--
 .../resources/PinotSegmentRestletResourceTest.java | 22 ++---
 .../resources/PinotTableRestletResourceTest.java   | 24 +++---
 .../resources/PinotTenantRestletResourceTest.java  | 14 ++--
 .../SegmentCompletionProtocolDeserTest.java        |  6 +-
 .../api/resources/SegmentCompletionUtilsTest.java  |  6 +-
 .../api/resources/ServerTableSizeReaderTest.java   | 10 +--
 .../api/resources/TableSizeReaderTest.java         | 20 ++---
 .../controller/api/resources/TableViewsTest.java   | 28 +++----
 .../helix/ControllerInstanceToggleTest.java        | 16 ++--
 .../controller/helix/ControllerSentinelTestV2.java | 12 +--
 .../controller/helix/ControllerTenantTest.java     | 12 +--
 .../pinot/controller/helix/ControllerTest.java     | 20 ++---
 .../pinot/controller/helix/HelixHelperTest.java    |  6 +-
 .../controller/helix/PinotResourceManagerTest.java | 18 ++--
 .../controller/helix/SegmentStatusCheckerTest.java | 18 ++--
 .../helix/core/PinotHelixResourceManagerTest.java  | 32 +++----
 .../periodictask/ControllerPeriodicTaskTest.java   |  4 +-
 .../PinotLLCRealtimeSegmentManagerTest.java        | 60 ++++++-------
 .../helix/core/realtime/SegmentCompletionTest.java | 20 ++---
 .../segment/FlushThresholdUpdaterTest.java         | 22 ++---
 .../rebalance/DefaultRebalanceStrategyTest.java    | 30 +++----
 .../ReplicaGroupRebalanceStrategyTest.java         | 26 +++---
 .../relocation/RealtimeSegmentRelocatorTest.java   | 10 +--
 .../helix/core/retention/RetentionManagerTest.java | 30 +++----
 .../strategy/TimeRetentionStrategyTest.java        |  6 +-
 .../sharding/SegmentAssignmentStrategyTest.java    | 36 ++++----
 .../core/util/SegmentDeletionManagerTest.java      | 10 +--
 .../helix/core/util/TableRebalancerTest.java       |  8 +-
 .../controller/utils/ReplicaGroupTestUtils.java    | 12 +--
 .../controller/utils/SegmentMetadataMockUtils.java | 12 +--
 .../validation/StorageQuotaCheckerTest.java        | 20 ++---
 .../validation/ValidationManagerTest.java          | 32 +++----
 .../src/test/resources/log4j.properties            |  2 +-
 pinot-core/pom.xml                                 |  6 +-
 .../org/apache/pinot/core/bloom/BloomFilter.java   |  2 +-
 .../apache/pinot/core/bloom/BloomFilterType.java   |  2 +-
 .../apache/pinot/core/bloom/BloomFilterUtil.java   |  2 +-
 .../pinot/core/bloom/GuavaOnHeapBloomFilter.java   |  2 +-
 .../core/bloom/SegmentBloomFilterFactory.java      |  2 +-
 .../apache/pinot/core/common/BaseBlockValSet.java  |  4 +-
 .../java/org/apache/pinot/core/common/Block.java   |  2 +-
 .../pinot/core/common/BlockDocIdIterator.java      |  2 +-
 .../apache/pinot/core/common/BlockDocIdSet.java    |  2 +-
 .../pinot/core/common/BlockDocIdValueIterator.java |  2 +-
 .../pinot/core/common/BlockDocIdValueSet.java      |  2 +-
 .../apache/pinot/core/common/BlockMetadata.java    |  6 +-
 .../pinot/core/common/BlockMultiValIterator.java   |  2 +-
 .../pinot/core/common/BlockSingleValIterator.java  |  2 +-
 .../apache/pinot/core/common/BlockValIterator.java |  2 +-
 .../org/apache/pinot/core/common/BlockValSet.java  |  4 +-
 .../org/apache/pinot/core/common/Constants.java    |  2 +-
 .../apache/pinot/core/common/DataBlockCache.java   |  8 +-
 .../org/apache/pinot/core/common/DataFetcher.java  |  8 +-
 .../org/apache/pinot/core/common/DataSource.java   | 10 +--
 .../pinot/core/common/DataSourceMetadata.java      |  4 +-
 .../apache/pinot/core/common/MinionConstants.java  |  2 +-
 .../apache/pinot/core/common/ObjectSerDeUtils.java | 10 +--
 .../org/apache/pinot/core/common/Operator.java     |  4 +-
 .../org/apache/pinot/core/common/Predicate.java    | 18 ++--
 .../core/common/datatable/DataTableBuilder.java    | 22 ++---
 .../core/common/datatable/DataTableFactory.java    |  4 +-
 .../core/common/datatable/DataTableImplV2.java     | 12 +--
 .../core/common/datatable/DataTableUtils.java      |  4 +-
 .../core/common/predicate/BaseInPredicate.java     |  4 +-
 .../pinot/core/common/predicate/EqPredicate.java   |  6 +-
 .../pinot/core/common/predicate/InPredicate.java   |  2 +-
 .../pinot/core/common/predicate/NEqPredicate.java  |  6 +-
 .../core/common/predicate/NotInPredicate.java      |  2 +-
 .../core/common/predicate/RangePredicate.java      |  4 +-
 .../core/common/predicate/RegexpLikePredicate.java |  4 +-
 .../apache/pinot/core/crypt/NoOpPinotCrypter.java  |  2 +-
 .../org/apache/pinot/core/crypt/PinotCrypter.java  |  2 +-
 .../pinot/core/crypt/PinotCrypterFactory.java      |  4 +-
 .../org/apache/pinot/core/data/GenericRow.java     |  6 +-
 .../core/data/aggregator/AvgValueAggregator.java   | 10 +--
 .../core/data/aggregator/CountValueAggregator.java |  6 +-
 .../DistinctCountHLLValueAggregator.java           | 10 +--
 .../core/data/aggregator/MaxValueAggregator.java   |  6 +-
 .../aggregator/MinMaxRangeValueAggregator.java     | 10 +--
 .../core/data/aggregator/MinValueAggregator.java   |  6 +-
 .../aggregator/PercentileEstValueAggregator.java   | 12 +--
 .../PercentileTDigestValueAggregator.java          | 10 +--
 .../core/data/aggregator/SumValueAggregator.java   |  6 +-
 .../core/data/aggregator/ValueAggregator.java      |  6 +-
 .../data/aggregator/ValueAggregatorFactory.java    |  6 +-
 .../data/function/FunctionExpressionEvaluator.java |  6 +-
 .../pinot/core/data/function/FunctionInfo.java     |  2 +-
 .../pinot/core/data/function/FunctionInvoker.java  |  2 +-
 .../pinot/core/data/function/FunctionRegistry.java |  2 +-
 .../core/data/manager/BaseTableDataManager.java    | 18 ++--
 .../core/data/manager/InstanceDataManager.java     |  6 +-
 .../core/data/manager/SegmentDataManager.java      |  4 +-
 .../pinot/core/data/manager/TableDataManager.java  | 12 +--
 .../manager/config/InstanceDataManagerConfig.java  |  4 +-
 .../manager/config/TableDataManagerConfig.java     |  8 +-
 .../offline/ImmutableSegmentDataManager.java       |  6 +-
 .../manager/offline/OfflineTableDataManager.java   | 12 +--
 .../manager/offline/TableDataManagerProvider.java  | 14 ++--
 .../realtime/HLRealtimeSegmentDataManager.java     | 52 ++++++------
 .../realtime/LLRealtimeSegmentDataManager.java     | 76 ++++++++---------
 .../realtime/RealtimeSegmentDataManager.java       | 14 ++--
 .../manager/realtime/RealtimeTableDataManager.java | 48 +++++------
 .../realtime/SegmentBuildTimeLeaseExtender.java    |  8 +-
 .../core/data/manager/realtime/TimerService.java   |  2 +-
 .../data/partition/ByteArrayPartitionFunction.java |  2 +-
 .../data/partition/ModuloPartitionFunction.java    |  2 +-
 .../data/partition/MurmurPartitionFunction.java    |  4 +-
 .../core/data/partition/PartitionFunction.java     |  2 +-
 .../data/partition/PartitionFunctionFactory.java   |  2 +-
 .../pinot/core/data/readers/AvroRecordReader.java  | 12 +--
 .../pinot/core/data/readers/CSVRecordReader.java   |  8 +-
 .../core/data/readers/CSVRecordReaderConfig.java   |  2 +-
 .../apache/pinot/core/data/readers/FileFormat.java |  2 +-
 .../core/data/readers/GenericRowRecordReader.java  |  8 +-
 .../pinot/core/data/readers/JSONRecordReader.java  | 10 +--
 .../readers/MultiplePinotSegmentRecordReader.java  |  8 +-
 .../data/readers/PinotSegmentColumnReader.java     | 20 ++---
 .../data/readers/PinotSegmentRecordReader.java     | 20 ++---
 .../pinot/core/data/readers/RecordReader.java      |  6 +-
 .../core/data/readers/RecordReaderConfig.java      |  2 +-
 .../core/data/readers/RecordReaderFactory.java     |  6 +-
 .../pinot/core/data/readers/RecordReaderUtils.java |  8 +-
 .../core/data/readers/ThriftRecordReader.java      |  8 +-
 .../data/readers/ThriftRecordReaderConfig.java     |  2 +-
 .../core/data/readers/sort/PinotSegmentSorter.java |  8 +-
 .../core/data/readers/sort/SegmentSorter.java      |  2 +-
 .../recordtransformer/CompoundTransformer.java     |  6 +-
 .../recordtransformer/DataTypeTransformer.java     |  8 +-
 .../recordtransformer/ExpressionTransformer.java   | 10 +--
 .../core/data/recordtransformer/PinotDataType.java |  4 +-
 .../data/recordtransformer/RecordTransformer.java  |  4 +-
 .../recordtransformer/SanitationTransformer.java   | 10 +--
 .../data/recordtransformer/TimeTransformer.java    | 14 ++--
 .../pinot/core/indexsegment/IndexSegment.java      | 10 +--
 .../pinot/core/indexsegment/IndexSegmentUtils.java | 12 +--
 .../generator/SegmentGeneratorConfig.java          | 42 +++++-----
 .../indexsegment/generator/SegmentVersion.java     |  2 +-
 .../indexsegment/immutable/ImmutableSegment.java   | 12 +--
 .../immutable/ImmutableSegmentImpl.java            | 28 +++----
 .../immutable/ImmutableSegmentLoader.java          | 40 ++++-----
 .../core/indexsegment/mutable/MutableSegment.java  |  6 +-
 .../indexsegment/mutable/MutableSegmentImpl.java   | 56 ++++++-------
 .../pinot/core/io/compression/ChunkCompressor.java |  2 +-
 .../io/compression/ChunkCompressorFactory.java     |  2 +-
 .../core/io/compression/ChunkDecompressor.java     |  2 +-
 .../core/io/compression/PassThroughCompressor.java |  2 +-
 .../io/compression/PassThroughDecompressor.java    |  2 +-
 .../core/io/compression/SnappyCompressor.java      |  2 +-
 .../core/io/compression/SnappyDecompressor.java    |  2 +-
 .../reader/BaseSingleColumnMultiValueReader.java   |  2 +-
 .../reader/BaseSingleColumnSingleValueReader.java  |  2 +-
 .../pinot/core/io/reader/DataFileReader.java       |  2 +-
 .../apache/pinot/core/io/reader/ReaderContext.java |  2 +-
 .../io/reader/SingleColumnMultiValueReader.java    |  2 +-
 .../io/reader/SingleColumnSingleValueReader.java   |  2 +-
 .../io/reader/SingleValueMultiColumnReader.java    |  2 +-
 .../core/io/reader/impl/ChunkReaderContext.java    |  2 +-
 .../impl/FixedByteSingleValueMultiColReader.java   |  6 +-
 .../io/reader/impl/UnSortedValueReaderContext.java |  4 +-
 .../reader/impl/v1/BaseChunkSingleValueReader.java | 12 +--
 .../reader/impl/v1/FixedBitMultiValueReader.java   | 14 ++--
 .../reader/impl/v1/FixedBitSingleValueReader.java  | 10 +--
 .../impl/v1/FixedByteChunkSingleValueReader.java   |  8 +-
 .../core/io/reader/impl/v1/SortedIndexReader.java  | 10 +--
 .../io/reader/impl/v1/SortedIndexReaderImpl.java   | 12 +--
 .../impl/v1/VarByteChunkSingleValueReader.java     | 10 +--
 .../BaseSingleColumnMultiValueReaderWriter.java    |  8 +-
 .../BaseSingleColumnSingleValueReaderWriter.java   |  8 +-
 .../BaseSingleValueMultiColumnReaderWriter.java    |  8 +-
 .../readerwriter/PinotDataBufferMemoryManager.java |  4 +-
 .../RealtimeIndexOffHeapMemoryManager.java         | 14 ++--
 ...ixedByteSingleColumnMultiValueReaderWriter.java | 12 +--
 ...xedByteSingleColumnSingleValueReaderWriter.java | 12 +--
 ...ixedByteSingleValueMultiColumnReaderWriter.java | 12 +--
 .../io/util/DictionaryDelegatingValueReader.java   |  4 +-
 .../core/io/util/FixedBitIntReaderWriter.java      |  4 +-
 .../core/io/util/FixedByteValueReaderWriter.java   |  6 +-
 .../apache/pinot/core/io/util/PinotDataBitSet.java |  4 +-
 .../org/apache/pinot/core/io/util/ValueReader.java |  2 +-
 .../pinot/core/io/writer/DataFileWriter.java       |  2 +-
 .../io/writer/SingleColumnMultiValueWriter.java    |  2 +-
 .../io/writer/SingleColumnSingleValueWriter.java   |  2 +-
 .../io/writer/SingleValueMultiColumnWriter.java    |  2 +-
 .../core/io/writer/impl/DirectMemoryManager.java   |  8 +-
 .../impl/FixedByteSingleValueMultiColWriter.java   |  6 +-
 .../core/io/writer/impl/MmapMemoryManager.java     |  8 +-
 .../writer/impl/MutableOffHeapByteArrayStore.java  |  6 +-
 .../core/io/writer/impl/OffHeapStringStore.java    |  6 +-
 .../writer/impl/v1/BaseChunkSingleValueWriter.java |  8 +-
 .../writer/impl/v1/FixedBitMultiValueWriter.java   | 14 ++--
 .../writer/impl/v1/FixedBitSingleValueWriter.java  |  8 +-
 .../impl/v1/FixedByteChunkSingleValueWriter.java   |  4 +-
 .../impl/v1/VarByteChunkSingleValueWriter.java     |  6 +-
 .../core/metadata/DefaultMetadataExtractor.java    |  8 +-
 .../pinot/core/metadata/MetadataExtractor.java     |  4 +-
 .../core/metadata/MetadataExtractorFactory.java    |  2 +-
 .../pinot/core/minion/BackfillDateTimeColumn.java  | 36 ++++----
 .../pinot/core/minion/RawIndexConverter.java       | 42 +++++-----
 .../apache/pinot/core/minion/SegmentConverter.java | 26 +++---
 .../apache/pinot/core/minion/SegmentPurger.java    | 22 ++---
 .../minion/rollup/MergeRollupSegmentConverter.java | 22 ++---
 .../apache/pinot/core/minion/rollup/MergeType.java |  2 +-
 .../core/minion/rollup/RollupRecordAggregator.java | 14 ++--
 .../rollup/aggregate/MaxValueAggregator.java       |  4 +-
 .../rollup/aggregate/SumValueAggregator.java       |  4 +-
 .../minion/rollup/aggregate/ValueAggregator.java   |  4 +-
 .../rollup/aggregate/ValueAggregatorFactory.java   |  2 +-
 .../minion/segment/DefaultRecordPartitioner.java   |  4 +-
 .../core/minion/segment/MapperRecordReader.java    | 12 +--
 .../core/minion/segment/RecordAggregator.java      |  4 +-
 .../core/minion/segment/RecordPartitioner.java     |  4 +-
 .../core/minion/segment/RecordTransformer.java     |  4 +-
 .../core/minion/segment/ReducerRecordReader.java   | 12 +--
 .../apache/pinot/core/operator/BaseOperator.java   |  8 +-
 .../core/operator/CombineGroupByOperator.java      | 26 +++---
 .../pinot/core/operator/CombineOperator.java       | 18 ++--
 .../pinot/core/operator/DocIdSetOperator.java      | 14 ++--
 .../pinot/core/operator/ExecutionStatistics.java   |  2 +-
 .../core/operator/InstanceResponseOperator.java    |  8 +-
 .../pinot/core/operator/ProjectionOperator.java    | 14 ++--
 .../core/operator/blocks/BlockMetadataImpl.java    |  8 +-
 .../pinot/core/operator/blocks/DocIdSetBlock.java  | 14 ++--
 .../core/operator/blocks/EmptyFilterBlock.java     |  4 +-
 .../pinot/core/operator/blocks/FilterBlock.java    | 12 +--
 .../operator/blocks/InstanceResponseBlock.java     | 14 ++--
 .../operator/blocks/IntermediateResultsBlock.java  | 32 +++----
 .../core/operator/blocks/MultiValueBlock.java      | 22 ++---
 .../core/operator/blocks/ProjectionBlock.java      | 16 ++--
 .../core/operator/blocks/SingleValueBlock.java     | 20 ++---
 .../pinot/core/operator/blocks/TransformBlock.java | 18 ++--
 .../operator/dociditerators/AndDocIdIterator.java  |  6 +-
 .../dociditerators/ArrayBasedDocIdIterator.java    |  6 +-
 .../dociditerators/BitmapDocIdIterator.java        |  4 +-
 .../dociditerators/EmptyBlockDocIdIterator.java    |  6 +-
 .../dociditerators/IndexBasedDocIdIterator.java    |  4 +-
 .../dociditerators/MVScanDocIdIterator.java        | 12 +--
 .../operator/dociditerators/OrDocIdIterator.java   |  6 +-
 .../RangelessBitmapDocIdIterator.java              |  6 +-
 .../dociditerators/SVScanDocIdIterator.java        | 16 ++--
 .../dociditerators/ScanBasedDocIdIterator.java     |  4 +-
 .../dociditerators/SizeBasedDocIdIterator.java     |  6 +-
 .../dociditerators/SortedDocIdIterator.java        | 10 +--
 .../core/operator/docidsets/AndBlockDocIdSet.java  | 20 ++---
 .../operator/docidsets/ArrayBasedDocIdSet.java     |  8 +-
 .../core/operator/docidsets/BitmapDocIdSet.java    |  6 +-
 .../docidsets/EmptyFilterBlockDocIdSet.java        |  6 +-
 .../operator/docidsets/FilterBlockDocIdSet.java    |  4 +-
 .../core/operator/docidsets/OrBlockDocIdSet.java   | 12 +--
 .../docidsets/ScanBasedMultiValueDocIdSet.java     | 12 +--
 .../docidsets/ScanBasedSingleValueDocIdSet.java    | 12 +--
 .../core/operator/docidsets/SizeBasedDocIdSet.java |  6 +-
 .../core/operator/docidsets/SortedDocIdSet.java    | 10 +--
 .../core/operator/docidsets/StarTreeDocIdSet.java  |  6 +-
 .../docvaliterators/MultiValueIterator.java        |  8 +-
 .../docvaliterators/SingleValueIterator.java       |  8 +-
 .../core/operator/docvalsets/MultiValueSet.java    | 12 +--
 .../operator/docvalsets/ProjectionBlockValSet.java | 10 +--
 .../core/operator/docvalsets/SingleValueSet.java   | 14 ++--
 .../operator/docvalsets/TransformBlockValSet.java  | 12 +--
 .../core/operator/filter/AndFilterOperator.java    |  8 +-
 .../core/operator/filter/BaseFilterOperator.java   |  6 +-
 .../operator/filter/BitmapBasedFilterOperator.java | 12 +--
 .../core/operator/filter/EmptyFilterOperator.java  |  6 +-
 .../core/operator/filter/FilterOperatorUtils.java  | 10 +--
 .../pinot/core/operator/filter/IntRanges.java      |  4 +-
 .../operator/filter/MatchAllFilterOperator.java    |  6 +-
 .../core/operator/filter/OrFilterOperator.java     |  8 +-
 .../operator/filter/ScanBasedFilterOperator.java   | 22 ++---
 .../SortedInvertedIndexBasedFilterOperator.java    | 14 ++--
 .../BaseDictionaryBasedPredicateEvaluator.java     |  2 +-
 .../filter/predicate/BasePredicateEvaluator.java   |  2 +-
 .../BaseRawValueBasedPredicateEvaluator.java       |  2 +-
 .../predicate/EqualsPredicateEvaluatorFactory.java | 10 +--
 .../predicate/InPredicateEvaluatorFactory.java     | 12 +--
 .../NotEqualsPredicateEvaluatorFactory.java        | 10 +--
 .../predicate/NotInPredicateEvaluatorFactory.java  | 12 +--
 .../filter/predicate/PredicateEvaluator.java       |  4 +-
 .../predicate/PredicateEvaluatorProvider.java      | 24 +++---
 .../predicate/RangePredicateEvaluatorFactory.java  | 16 ++--
 .../RegexpLikePredicateEvaluatorFactory.java       | 10 +--
 .../operator/query/AggregationGroupByOperator.java | 24 +++---
 .../core/operator/query/AggregationOperator.java   | 20 ++---
 .../query/DictionaryBasedAggregationOperator.java  | 24 +++---
 .../operator/query/EmptySelectionOperator.java     | 16 ++--
 .../query/MetadataBasedAggregationOperator.java    | 16 ++--
 .../core/operator/query/SelectionOnlyOperator.java | 26 +++---
 .../operator/query/SelectionOrderByOperator.java   | 26 +++---
 .../core/operator/transform/TransformOperator.java | 22 ++---
 .../transform/TransformResultMetadata.java         |  4 +-
 .../function/AdditionTransformFunction.java        | 10 +--
 .../transform/function/BaseTransformFunction.java  | 14 ++--
 .../DateTimeConversionTransformFunction.java       | 24 +++---
 .../function/DivisionTransformFunction.java        | 12 +--
 .../function/IdentifierTransformFunction.java      | 12 +--
 .../function/LiteralTransformFunction.java         | 10 +--
 .../function/MultiplicationTransformFunction.java  | 10 +--
 .../function/SubtractionTransformFunction.java     | 12 +--
 .../function/TimeConversionTransformFunction.java  | 14 ++--
 .../transform/function/TransformFunction.java      | 10 +--
 .../function/TransformFunctionFactory.java         |  8 +-
 .../function/ValueInTransformFunction.java         | 14 ++--
 .../transform/transformer/DataTransformer.java     |  2 +-
 .../datetime/BaseDateTimeTransformer.java          | 10 +--
 .../datetime/DateTimeTransformerFactory.java       |  8 +-
 .../datetime/EpochToEpochTransformer.java          |  6 +-
 .../datetime/EpochToSDFTransformer.java            |  6 +-
 .../datetime/SDFToEpochTransformer.java            |  6 +-
 .../transformer/datetime/SDFToSDFTransformer.java  |  6 +-
 .../timeunit/CustomTimeUnitTransformer.java        |  2 +-
 .../timeunit/JavaTimeUnitTransformer.java          |  2 +-
 .../transformer/timeunit/TimeUnitTransformer.java  |  4 +-
 .../timeunit/TimeUnitTransformerFactory.java       |  2 +-
 .../pinot/core/periodictask/BasePeriodicTask.java  |  2 +-
 .../pinot/core/periodictask/PeriodicTask.java      |  2 +-
 .../core/periodictask/PeriodicTaskScheduler.java   |  2 +-
 .../core/plan/AggregationFunctionInitializer.java  |  8 +-
 .../core/plan/AggregationGroupByPlanNode.java      | 30 +++----
 .../pinot/core/plan/AggregationPlanNode.java       | 26 +++---
 .../apache/pinot/core/plan/CombinePlanNode.java    | 14 ++--
 .../plan/DictionaryBasedAggregationPlanNode.java   | 16 ++--
 .../apache/pinot/core/plan/DocIdSetPlanNode.java   |  8 +-
 .../org/apache/pinot/core/plan/FilterPlanNode.java | 28 +++----
 .../apache/pinot/core/plan/GlobalPlanImplV0.java   |  8 +-
 .../pinot/core/plan/InstanceResponsePlanNode.java  |  4 +-
 .../plan/MetadataBasedAggregationPlanNode.java     | 20 ++---
 .../main/java/org/apache/pinot/core/plan/Plan.java |  4 +-
 .../java/org/apache/pinot/core/plan/PlanNode.java  |  4 +-
 .../apache/pinot/core/plan/ProjectionPlanNode.java |  8 +-
 .../apache/pinot/core/plan/SelectionPlanNode.java  | 18 ++--
 .../apache/pinot/core/plan/TransformPlanNode.java  | 16 ++--
 .../core/plan/maker/BrokerRequestPreProcessor.java | 14 ++--
 .../core/plan/maker/InstancePlanMakerImplV2.java   | 40 ++++-----
 .../apache/pinot/core/plan/maker/PlanMaker.java    | 12 +--
 .../query/aggregation/AggregationExecutor.java     |  4 +-
 .../aggregation/AggregationFunctionContext.java    |  4 +-
 .../query/aggregation/AggregationResultHolder.java |  2 +-
 .../aggregation/DefaultAggregationExecutor.java    | 10 +--
 .../aggregation/DoubleAggregationResultHolder.java |  2 +-
 .../aggregation/ObjectAggregationResultHolder.java |  2 +-
 .../aggregation/function/AggregationFunction.java  | 10 +--
 .../function/AggregationFunctionFactory.java       |  4 +-
 .../function/AggregationFunctionType.java          |  4 +-
 .../function/AggregationFunctionUtils.java         | 12 +--
 .../function/AggregationFunctionVisitorBase.java   |  2 +-
 .../function/AvgAggregationFunction.java           | 22 ++---
 .../function/AvgMVAggregationFunction.java         |  8 +-
 .../function/CountAggregationFunction.java         | 16 ++--
 .../function/CountMVAggregationFunction.java       |  8 +-
 .../function/DistinctCountAggregationFunction.java | 16 ++--
 .../DistinctCountHLLAggregationFunction.java       | 18 ++--
 .../DistinctCountHLLMVAggregationFunction.java     | 10 +--
 .../DistinctCountMVAggregationFunction.java        | 10 +--
 .../function/FastHLLAggregationFunction.java       | 18 ++--
 .../function/MaxAggregationFunction.java           | 16 ++--
 .../function/MaxMVAggregationFunction.java         |  8 +-
 .../function/MinAggregationFunction.java           | 16 ++--
 .../function/MinMVAggregationFunction.java         |  8 +-
 .../function/MinMaxRangeAggregationFunction.java   | 22 ++---
 .../function/MinMaxRangeMVAggregationFunction.java |  8 +-
 .../function/PercentileAggregationFunction.java    | 16 ++--
 .../function/PercentileEstAggregationFunction.java | 22 ++---
 .../PercentileEstMVAggregationFunction.java        | 10 +--
 .../function/PercentileMVAggregationFunction.java  |  8 +-
 .../PercentileTDigestAggregationFunction.java      | 20 ++---
 .../PercentileTDigestMVAggregationFunction.java    |  8 +-
 .../function/SumAggregationFunction.java           | 16 ++--
 .../function/SumMVAggregationFunction.java         |  8 +-
 .../aggregation/function/customobject/AvgPair.java |  2 +-
 .../function/customobject/MinMaxRangePair.java     |  2 +-
 .../function/customobject/QuantileDigest.java      |  2 +-
 .../groupby/AggregationGroupByResult.java          |  4 +-
 .../groupby/AggregationGroupByTrimmingService.java | 10 +--
 .../groupby/DefaultGroupByExecutor.java            | 22 ++---
 .../groupby/DictionaryBasedGroupKeyGenerator.java  | 12 +--
 .../groupby/DoubleGroupByResultHolder.java         |  2 +-
 .../query/aggregation/groupby/GroupByExecutor.java |  4 +-
 .../aggregation/groupby/GroupByResultHolder.java   |  2 +-
 .../aggregation/groupby/GroupKeyGenerator.java     |  4 +-
 .../NoDictionaryMultiColumnGroupKeyGenerator.java  | 22 ++---
 .../NoDictionarySingleColumnGroupKeyGenerator.java | 12 +--
 .../groupby/ObjectGroupByResultHolder.java         |  2 +-
 .../groupby/utils/BaseValueToIdMap.java            |  2 +-
 .../aggregation/groupby/utils/DoubleToIdMap.java   |  2 +-
 .../aggregation/groupby/utils/FloatToIdMap.java    |  2 +-
 .../aggregation/groupby/utils/IntToIdMap.java      |  2 +-
 .../aggregation/groupby/utils/LongToIdMap.java     |  2 +-
 .../aggregation/groupby/utils/StringToIdMap.java   |  2 +-
 .../aggregation/groupby/utils/ValueToIdMap.java    |  2 +-
 .../groupby/utils/ValueToIdMapFactory.java         |  4 +-
 .../core/query/config/QueryExecutorConfig.java     |  2 +-
 .../core/query/config/QueryPlannerConfig.java      |  2 +-
 .../core/query/config/SegmentPrunerConfig.java     |  2 +-
 .../query/exception/BadQueryRequestException.java  |  2 +-
 .../pinot/core/query/executor/QueryExecutor.java   | 10 +--
 .../query/executor/ServerQueryExecutorV1Impl.java  | 46 +++++-----
 .../core/query/pruner/AbstractSegmentPruner.java   | 14 ++--
 .../query/pruner/ColumnValueSegmentPruner.java     | 22 ++---
 .../core/query/pruner/DataSchemaSegmentPruner.java |  6 +-
 .../core/query/pruner/PartitionSegmentPruner.java  | 20 ++---
 .../pinot/core/query/pruner/SegmentPruner.java     |  6 +-
 .../core/query/pruner/SegmentPrunerProvider.java   |  2 +-
 .../core/query/pruner/SegmentPrunerService.java    |  8 +-
 .../core/query/pruner/ValidSegmentPruner.java      |  8 +-
 .../pinot/core/query/reduce/BetweenComparison.java |  4 +-
 .../core/query/reduce/BrokerReduceService.java     | 54 ++++++------
 .../pinot/core/query/reduce/CombineService.java    | 20 ++---
 .../core/query/reduce/ComparisonFunction.java      |  6 +-
 .../pinot/core/query/reduce/EqualComparison.java   |  4 +-
 .../core/query/reduce/GreaterEqualComparison.java  |  4 +-
 .../core/query/reduce/GreaterThanComparison.java   |  4 +-
 .../query/reduce/HavingClauseComparisonTree.java   | 10 +--
 .../core/query/reduce/InAndNotInComparison.java    |  4 +-
 .../core/query/reduce/LessEqualComparison.java     |  4 +-
 .../core/query/reduce/LessThanComparison.java      |  4 +-
 .../core/query/reduce/NotEqualComparison.java      |  4 +-
 .../core/query/request/ServerQueryRequest.java     | 28 +++----
 .../core/query/request/context/TimerContext.java   |  6 +-
 .../query/scheduler/AbstractSchedulerGroup.java    |  2 +-
 .../query/scheduler/MultiLevelPriorityQueue.java   |  6 +-
 .../query/scheduler/OutOfCapacityException.java    |  2 +-
 .../core/query/scheduler/PriorityScheduler.java    | 18 ++--
 .../pinot/core/query/scheduler/QueryScheduler.java | 24 +++---
 .../query/scheduler/QuerySchedulerFactory.java     | 12 +--
 .../pinot/core/query/scheduler/SchedulerGroup.java |  2 +-
 .../query/scheduler/SchedulerGroupAccountant.java  |  2 +-
 .../query/scheduler/SchedulerGroupFactory.java     |  2 +-
 .../core/query/scheduler/SchedulerGroupMapper.java |  2 +-
 .../query/scheduler/SchedulerPriorityQueue.java    |  2 +-
 .../query/scheduler/SchedulerQueryContext.java     |  4 +-
 .../query/scheduler/TableBasedGroupMapper.java     |  2 +-
 .../query/scheduler/fcfs/BoundedFCFSScheduler.java | 22 ++---
 .../query/scheduler/fcfs/FCFSQueryScheduler.java   | 18 ++--
 .../query/scheduler/fcfs/FCFSSchedulerGroup.java   | 10 +--
 .../resources/BoundedAccountingExecutor.java       |  4 +-
 .../resources/PolicyBasedResourceManager.java      |  6 +-
 .../scheduler/resources/QueryExecutorService.java  |  2 +-
 .../scheduler/resources/ResourceLimitPolicy.java   |  2 +-
 .../query/scheduler/resources/ResourceManager.java |  6 +-
 .../resources/UnboundedResourceManager.java        |  6 +-
 .../tokenbucket/TokenPriorityScheduler.java        | 20 ++---
 .../scheduler/tokenbucket/TokenSchedulerGroup.java | 10 +--
 .../core/query/selection/SelectionFetcher.java     | 30 +++----
 .../query/selection/SelectionOperatorService.java  | 24 +++---
 .../query/selection/SelectionOperatorUtils.java    | 22 ++---
 .../comparator/CompositeDocIdValComparator.java    |  6 +-
 .../comparator/DocIdDoubleValComparator.java       |  6 +-
 .../comparator/DocIdFloatValComparator.java        |  6 +-
 .../comparator/DocIdIntValComparator.java          |  6 +-
 .../comparator/DocIdLongValComparator.java         |  6 +-
 .../selection/comparator/IDocIdValComparator.java  |  2 +-
 .../DoubleArraySelectionColumnIterator.java        |  4 +-
 .../iterator/DoubleSelectionColumnIterator.java    |  6 +-
 .../FloatArraySelectionColumnIterator.java         |  4 +-
 .../iterator/FloatSelectionColumnIterator.java     |  6 +-
 .../iterator/IntArraySelectionColumnIterator.java  |  4 +-
 .../iterator/IntSelectionColumnIterator.java       |  6 +-
 .../iterator/LongArraySelectionColumnIterator.java |  4 +-
 .../iterator/LongSelectionColumnIterator.java      |  6 +-
 .../iterator/SelectionColumnIterator.java          |  2 +-
 .../SelectionMultiValueColumnIterator.java         |  8 +-
 ...SelectionSingleValueColumnWithDictIterator.java | 12 +--
 .../StringArraySelectionColumnIterator.java        |  4 +-
 .../iterator/StringSelectionColumnIterator.java    | 10 +--
 .../org/apache/pinot/core/query/utils/Pair.java    |  2 +-
 .../apache/pinot/core/query/utils/TrieNode.java    |  2 +-
 .../converter/RealtimeSegmentConverter.java        | 34 ++++----
 .../converter/RealtimeSegmentRecordReader.java     | 10 +--
 .../converter/stats/RealtimeColumnStatistics.java  | 26 +++---
 .../stats/RealtimeNoDictionaryColStatistics.java   | 14 ++--
 .../RealtimeSegmentSegmentCreationDataSource.java  | 16 ++--
 .../stats/RealtimeSegmentStatsContainer.java       | 14 ++--
 .../core/realtime/impl/RealtimeSegmentConfig.java  | 10 +--
 .../realtime/impl/RealtimeSegmentStatsHistory.java |  2 +-
 .../dictionary/BaseOffHeapMutableDictionary.java   |  6 +-
 .../dictionary/BaseOnHeapMutableDictionary.java    |  2 +-
 .../dictionary/BytesOffHeapMutableDictionary.java  |  8 +-
 .../dictionary/BytesOnHeapMutableDictionary.java   |  4 +-
 .../dictionary/DoubleOffHeapMutableDictionary.java |  6 +-
 .../dictionary/DoubleOnHeapMutableDictionary.java  |  2 +-
 .../dictionary/FloatOffHeapMutableDictionary.java  |  6 +-
 .../dictionary/FloatOnHeapMutableDictionary.java   |  2 +-
 .../dictionary/IntOffHeapMutableDictionary.java    |  6 +-
 .../dictionary/IntOnHeapMutableDictionary.java     |  2 +-
 .../dictionary/LongOffHeapMutableDictionary.java   |  6 +-
 .../dictionary/LongOnHeapMutableDictionary.java    |  2 +-
 .../impl/dictionary/MutableDictionary.java         |  4 +-
 .../impl/dictionary/MutableDictionaryFactory.java  |  6 +-
 .../dictionary/StringOffHeapMutableDictionary.java |  8 +-
 .../dictionary/StringOnHeapMutableDictionary.java  |  2 +-
 .../invertedindex/RealtimeInvertedIndexReader.java |  4 +-
 .../impl/kafka/AvroRecordToPinotRowGenerator.java  | 12 +--
 .../realtime/impl/kafka/ConsumerAndIterator.java   |  2 +-
 .../impl/kafka/KafkaAvroMessageDecoder.java        | 10 +--
 .../realtime/impl/kafka/KafkaBrokerWrapper.java    |  2 +-
 .../impl/kafka/KafkaConnectionHandler.java         |  8 +-
 .../realtime/impl/kafka/KafkaConsumerFactory.java  | 16 ++--
 .../realtime/impl/kafka/KafkaConsumerManager.java  |  2 +-
 .../impl/kafka/KafkaHighLevelStreamConfig.java     | 10 +--
 .../impl/kafka/KafkaJSONMessageDecoder.java        | 12 +--
 .../impl/kafka/KafkaLowLevelStreamConfig.java      |  6 +-
 .../impl/kafka/KafkaPartitionLevelConsumer.java    |  8 +-
 .../impl/kafka/KafkaSimpleConsumerFactory.java     |  2 +-
 .../impl/kafka/KafkaSimpleConsumerFactoryImpl.java |  2 +-
 .../impl/kafka/KafkaStreamConfigProperties.java    |  4 +-
 .../impl/kafka/KafkaStreamLevelConsumer.java       | 22 ++---
 .../impl/kafka/KafkaStreamMetadataProvider.java    |  8 +-
 .../realtime/impl/kafka/SimpleConsumerFactory.java |  6 +-
 .../impl/kafka/SimpleConsumerMessageBatch.java     |  4 +-
 .../ConsumingSegmentAssignmentStrategy.java        |  8 +-
 .../segment/RealtimeSegmentAssignmentStrategy.java |  8 +-
 .../pinot/core/realtime/stream/MessageBatch.java   |  4 +-
 .../pinot/core/realtime/stream/OffsetCriteria.java |  6 +-
 .../realtime/stream/PartitionCountFetcher.java     |  2 +-
 .../realtime/stream/PartitionLevelConsumer.java    |  2 +-
 .../stream/PartitionLevelStreamConfig.java         |  4 +-
 .../realtime/stream/PartitionOffsetFetcher.java    |  2 +-
 .../stream/PermanentConsumerException.java         |  2 +-
 .../pinot/core/realtime/stream/StreamConfig.java   | 10 +--
 .../realtime/stream/StreamConfigProperties.java    |  2 +-
 .../realtime/stream/StreamConsumerFactory.java     |  8 +-
 .../stream/StreamConsumerFactoryProvider.java      |  4 +-
 .../realtime/stream/StreamDecoderProvider.java     |  8 +-
 .../core/realtime/stream/StreamLevelConsumer.java  |  4 +-
 .../core/realtime/stream/StreamMessageDecoder.java |  6 +-
 .../realtime/stream/StreamMetadataProvider.java    |  2 +-
 .../stream/TransientConsumerException.java         |  4 +-
 .../creator/BaseSingleValueRawIndexCreator.java    |  2 +-
 .../segment/creator/ColumnIndexCreationInfo.java   |  6 +-
 .../core/segment/creator/ColumnStatistics.java     |  4 +-
 .../core/segment/creator/ForwardIndexCreator.java  |  2 +-
 .../core/segment/creator/ForwardIndexType.java     |  2 +-
 .../core/segment/creator/InvertedIndexCreator.java |  2 +-
 .../core/segment/creator/InvertedIndexType.java    |  2 +-
 .../creator/MultiValueForwardIndexCreator.java     |  2 +-
 .../RecordReaderSegmentCreationDataSource.java     | 18 ++--
 .../segment/creator/SegmentCreationDataSource.java |  4 +-
 .../pinot/core/segment/creator/SegmentCreator.java |  8 +-
 .../creator/SegmentIndexCreationDriver.java        |  4 +-
 .../segment/creator/SegmentIndexCreationInfo.java  |  2 +-
 .../creator/SegmentPreIndexStatsCollector.java     |  4 +-
 .../creator/SegmentPreIndexStatsContainer.java     |  2 +-
 .../creator/SingleValueForwardIndexCreator.java    |  2 +-
 .../creator/SingleValueRawIndexCreator.java        |  2 +-
 .../core/segment/creator/StatsCollectorConfig.java | 12 +--
 .../creator/impl/SegmentColumnarIndexCreator.java  | 62 +++++++-------
 .../creator/impl/SegmentCreationDriverFactory.java |  6 +-
 .../creator/impl/SegmentDictionaryCreator.java     | 12 +--
 .../impl/SegmentIndexCreationDriverImpl.java       | 74 ++++++++--------
 .../core/segment/creator/impl/V1Constants.java     |  2 +-
 .../creator/impl/bloom/BloomFilterCreator.java     | 10 +--
 .../fwd/MultiValueUnsortedForwardIndexCreator.java | 12 +--
 .../fwd/SingleValueFixedByteRawIndexCreator.java   | 14 ++--
 .../fwd/SingleValueSortedForwardIndexCreator.java  |  8 +-
 .../SingleValueUnsortedForwardIndexCreator.java    | 12 +--
 .../fwd/SingleValueVarByteRawIndexCreator.java     | 10 +--
 .../inv/OffHeapBitmapInvertedIndexCreator.java     | 10 +--
 .../impl/inv/OnHeapBitmapInvertedIndexCreator.java |  6 +-
 .../stats/AbstractColumnStatisticsCollector.java   | 16 ++--
 .../stats/BytesColumnPredIndexStatsCollector.java  |  6 +-
 .../stats/DoubleColumnPreIndexStatsCollector.java  |  4 +-
 .../stats/FloatColumnPreIndexStatsCollector.java   |  4 +-
 .../stats/IntColumnPreIndexStatsCollector.java     |  4 +-
 .../stats/LongColumnPreIndexStatsCollector.java    |  4 +-
 .../stats/SegmentPreIndexStatsCollectorImpl.java   | 16 ++--
 .../stats/StringColumnPreIndexStatsCollector.java  |  8 +-
 .../pinot/core/segment/index/ColumnMetadata.java   | 32 +++----
 .../core/segment/index/SegmentMetadataImpl.java    | 34 ++++----
 .../segment/index/column/ColumnIndexContainer.java | 10 +--
 .../index/column/PhysicalColumnIndexContainer.java | 62 +++++++-------
 .../index/converter/SegmentFormatConverter.java    |  2 +-
 .../converter/SegmentFormatConverterFactory.java   |  4 +-
 .../converter/SegmentV1V2ToV3FormatConverter.java  | 20 ++---
 .../index/data/source/ColumnDataSource.java        | 36 ++++----
 .../segment/index/loader/IndexLoadingConfig.java   | 14 ++--
 .../core/segment/index/loader/LoaderUtils.java     | 10 +--
 .../segment/index/loader/SegmentPreProcessor.java  | 24 +++---
 .../index/loader/V3RemoveIndexException.java       |  2 +-
 .../loader/bloomfilter/BloomFilterHandler.java     | 38 ++++-----
 .../ColumnMinMaxValueGenerator.java                | 28 +++----
 .../ColumnMinMaxValueGeneratorMode.java            |  4 +-
 .../defaultcolumn/BaseDefaultColumnHandler.java    | 30 +++----
 .../loader/defaultcolumn/DefaultColumnHandler.java |  2 +-
 .../defaultcolumn/DefaultColumnHandlerFactory.java | 10 +--
 .../defaultcolumn/DefaultColumnStatistics.java     |  6 +-
 .../defaultcolumn/V1DefaultColumnHandler.java      |  6 +-
 .../defaultcolumn/V3DefaultColumnHandler.java      | 18 ++--
 .../loader/invertedindex/InvertedIndexHandler.java | 32 +++----
 .../core/segment/index/readers/BaseDictionary.java |  2 +-
 .../index/readers/BitmapInvertedIndexReader.java   |  4 +-
 .../segment/index/readers/BloomFilterReader.java   | 10 +--
 .../segment/index/readers/BytesDictionary.java     |  4 +-
 .../core/segment/index/readers/Dictionary.java     |  2 +-
 .../segment/index/readers/DoubleDictionary.java    |  4 +-
 .../segment/index/readers/FloatDictionary.java     |  4 +-
 .../index/readers/ImmutableDictionaryReader.java   | 12 +--
 .../core/segment/index/readers/IntDictionary.java  |  6 +-
 .../segment/index/readers/InvertedIndexReader.java |  2 +-
 .../core/segment/index/readers/LongDictionary.java |  4 +-
 .../segment/index/readers/OnHeapDictionary.java    |  4 +-
 .../index/readers/OnHeapDoubleDictionary.java      |  4 +-
 .../index/readers/OnHeapFloatDictionary.java       |  4 +-
 .../segment/index/readers/OnHeapIntDictionary.java |  4 +-
 .../index/readers/OnHeapLongDictionary.java        |  4 +-
 .../index/readers/OnHeapStringDictionary.java      |  4 +-
 .../segment/index/readers/StringDictionary.java    |  6 +-
 .../core/segment/memory/BasePinotLBuffer.java      |  2 +-
 .../pinot/core/segment/memory/PinotByteBuffer.java |  2 +-
 .../pinot/core/segment/memory/PinotDataBuffer.java |  2 +-
 .../segment/memory/PinotNativeOrderLBuffer.java    |  2 +-
 .../segment/memory/PinotNonNativeOrderLBuffer.java |  2 +-
 .../segment/name/DefaultSegmentNameGenerator.java  |  6 +-
 .../name/NormalizedDateSegmentNameGenerator.java   |  6 +-
 .../core/segment/name/SegmentNameGenerator.java    |  4 +-
 .../core/segment/store/ColumnIndexDirectory.java   | 10 +--
 .../pinot/core/segment/store/ColumnIndexType.java  |  2 +-
 .../core/segment/store/FilePerIndexDirectory.java  |  8 +-
 .../pinot/core/segment/store/IndexEntry.java       |  4 +-
 .../apache/pinot/core/segment/store/IndexKey.java  |  2 +-
 .../pinot/core/segment/store/SegmentDirectory.java |  8 +-
 .../core/segment/store/SegmentDirectoryPaths.java  |  6 +-
 .../segment/store/SegmentLocalFSDirectory.java     | 12 +--
 .../segment/store/SingleFileIndexDirectory.java    |  8 +-
 .../virtualcolumn/BaseVirtualColumnProvider.java   |  6 +-
 .../virtualcolumn/DocIdVirtualColumnProvider.java  | 32 +++----
 .../HostNameVirtualColumnProvider.java             |  2 +-
 .../IntSingleValueDataFileReader.java              |  8 +-
 .../SegmentNameVirtualColumnProvider.java          |  2 +-
 .../SingleStringVirtualColumnProvider.java         | 28 +++----
 .../virtualcolumn/VirtualColumnContext.java        |  2 +-
 .../virtualcolumn/VirtualColumnIndexContainer.java | 16 ++--
 .../virtualcolumn/VirtualColumnProvider.java       | 12 +--
 .../VirtualColumnProviderFactory.java              |  8 +-
 .../core/segment/virtualcolumn/package-info.java   |  2 +-
 .../pinot/core/startree/DimensionBuffer.java       |  4 +-
 .../apache/pinot/core/startree/MetricBuffer.java   | 12 +--
 .../pinot/core/startree/OffHeapStarTree.java       |  8 +-
 .../core/startree/OffHeapStarTreeBuilder.java      | 24 +++---
 .../pinot/core/startree/OffHeapStarTreeNode.java   |  6 +-
 .../org/apache/pinot/core/startree/StarTree.java   |  4 +-
 .../pinot/core/startree/StarTreeBuilder.java       |  6 +-
 .../pinot/core/startree/StarTreeBuilderConfig.java |  4 +-
 .../pinot/core/startree/StarTreeBuilderUtils.java  |  6 +-
 .../pinot/core/startree/StarTreeDataTable.java     |  6 +-
 .../apache/pinot/core/startree/StarTreeNode.java   |  2 +-
 .../apache/pinot/core/startree/StarTreeUtils.java  | 18 ++--
 .../executor/StarTreeAggregationExecutor.java      | 18 ++--
 .../startree/executor/StarTreeGroupByExecutor.java | 24 +++---
 .../apache/pinot/core/startree/hll/HllUtil.java    |  6 +-
 .../startree/operator/StarTreeFilterOperator.java  | 32 +++----
 .../startree/plan/StarTreeDocIdSetPlanNode.java    | 12 +--
 .../core/startree/plan/StarTreeFilterPlanNode.java | 10 +--
 .../startree/plan/StarTreeProjectionPlanNode.java  | 12 +--
 .../startree/plan/StarTreeTransformPlanNode.java   | 14 ++--
 .../startree/v2/AggregationFunctionColumnPair.java |  4 +-
 .../apache/pinot/core/startree/v2/StarTreeV2.java  |  6 +-
 .../core/startree/v2/StarTreeV2Constants.java      |  2 +-
 .../pinot/core/startree/v2/StarTreeV2Metadata.java |  4 +-
 .../startree/v2/builder/BaseSingleTreeBuilder.java | 36 ++++----
 .../startree/v2/builder/MultipleTreesBuilder.java  | 18 ++--
 .../v2/builder/OffHeapSingleTreeBuilder.java       |  8 +-
 .../v2/builder/OnHeapSingleTreeBuilder.java        |  6 +-
 .../startree/v2/builder/SingleTreeBuilder.java     |  2 +-
 .../startree/v2/builder/StarTreeIndexCombiner.java | 12 +--
 .../v2/builder/StarTreeV2BuilderConfig.java        |  6 +-
 .../v2/store/StarTreeDimensionDataSource.java      | 24 +++---
 .../startree/v2/store/StarTreeIndexContainer.java  | 20 ++---
 .../startree/v2/store/StarTreeIndexMapUtils.java   |  2 +-
 .../startree/v2/store/StarTreeLoaderUtils.java     | 38 ++++-----
 .../v2/store/StarTreeMetricDataSource.java         | 30 +++----
 .../pinot/core/transport/AsyncQueryResponse.java   |  4 +-
 .../pinot/core/transport/DataTableHandler.java     | 10 +--
 .../apache/pinot/core/transport/QueryRouter.java   | 14 ++--
 .../org/apache/pinot/core/transport/Server.java    |  4 +-
 .../pinot/core/transport/ServerChannels.java       | 10 +--
 .../pinot/core/transport/ServerResponse.java       |  4 +-
 .../org/apache/pinot/core/util/ArrayCopyUtils.java |  2 +-
 .../java/org/apache/pinot/core/util/AvroUtils.java | 14 ++--
 .../pinot/core/util/BaseIndexedPriorityQueue.java  |  2 +-
 .../java/org/apache/pinot/core/util/CrcUtils.java  |  4 +-
 .../org/apache/pinot/core/util/FixedIntArray.java  |  2 +-
 .../pinot/core/util/FixedIntArrayOffHeapIdMap.java | 10 +--
 .../java/org/apache/pinot/core/util/IdMap.java     |  2 +-
 .../core/util/IntDoubleIndexedPriorityQueue.java   |  4 +-
 .../core/util/IntObjectIndexedPriorityQueue.java   |  4 +-
 .../java/org/apache/pinot/core/util/SizeUtil.java  |  2 +-
 .../pinot/core/util/SortedRangeIntersection.java   |  6 +-
 .../pinot/core/util/trace/TraceCallable.java       |  2 +-
 .../apache/pinot/core/util/trace/TraceContext.java |  6 +-
 .../pinot/core/util/trace/TraceRunnable.java       |  2 +-
 .../server/realtime/ControllerLeaderLocator.java   |  4 +-
 .../ServerSegmentCompletionProtocolHandler.java    | 18 ++--
 .../apache/pinot/core/common/DataFetcherTest.java  | 26 +++---
 .../pinot/core/common/ObjectSerDeUtilsTest.java    | 14 ++--
 .../core/common/RealtimeNoDictionaryTest.java      | 14 ++--
 .../core/common/datatable/DataTableSerDeTest.java  | 10 +--
 .../core/common/docidsets/BitmapDocIdSetTest.java  |  8 +-
 .../core/common/docidsets/SortedDocIdSetTest.java  | 12 +--
 .../pinot/core/crypt/PinotCrypterFactoryTest.java  |  2 +-
 .../function/FunctionExpressionEvaluatorTest.java  |  4 +-
 .../data/manager/BaseTableDataManagerTest.java     | 16 ++--
 .../realtime/LLRealtimeSegmentDataManagerTest.java | 40 ++++-----
 .../core/data/partition/PartitionFunctionTest.java |  2 +-
 .../readers/BackfillDateTimeRecordReaderTest.java  | 28 +++----
 .../core/data/readers/CSVRecordReaderTest.java     |  2 +-
 .../core/data/readers/JSONRecordReaderTest.java    |  4 +-
 .../MultiplePinotSegmentRecordReaderTest.java      | 16 ++--
 .../data/readers/PinotSegmentRecordReaderTest.java | 18 ++--
 .../pinot/core/data/readers/PinotSegmentUtil.java  | 12 +--
 .../pinot/core/data/readers/RecordReaderTest.java  | 10 +--
 .../core/data/readers/ThriftRecordReaderTest.java  | 12 +--
 .../pinot/core/data/readers/ThriftSampleData.java  |  2 +-
 .../data/recordtransformer/PinotDataTypeTest.java  |  2 +-
 .../recordtransformer/RecordTransformerTest.java   |  8 +-
 .../recordtransformer/TimeTransformerTest.java     | 12 +--
 .../MutableSegmentImplAggregateMetricsTest.java    | 10 +--
 .../mutable/MutableSegmentImplTest.java            | 40 ++++-----
 .../mutable/MutableSegmentImplTestUtils.java       | 12 +--
 .../pinot/core/io/util/PinotDataBitSetTest.java    |  4 +-
 .../impl/MmapMemoryManagerFileCleanupTest.java     |  4 +-
 .../core/io/writer/impl/MmapMemoryManagerTest.java |  6 +-
 .../impl/MutableOffHeapByteArrayStoreTest.java     |  4 +-
 .../io/writer/impl/OffHeapStringStoreTest.java     |  4 +-
 .../metadata/MetadataExtractorFactoryTest.java     |  2 +-
 .../minion/MergeRollupSegmentConverterTest.java    | 28 +++----
 .../pinot/core/minion/SegmentConverterTest.java    | 30 +++----
 .../pinot/core/minion/SegmentPurgerTest.java       | 22 ++---
 .../dociditerators/BitmapDocIdIteratorTest.java    |  6 +-
 .../RealtimeSingleValueIteratorTest.java           |  8 +-
 .../operator/filter/AndFilterOperatorTest.java     |  6 +-
 .../operator/filter/FilterOperatorUtilsTest.java   |  2 +-
 .../pinot/core/operator/filter/IntRangesTest.java  |  4 +-
 .../core/operator/filter/OrFilterOperatorTest.java |  6 +-
 .../core/operator/filter/TestFilterOperator.java   | 10 +--
 .../function/AdditionTransformFunctionTest.java    |  6 +-
 .../function/BaseTransformFunctionTest.java        | 38 ++++-----
 .../DateTimeConversionTransformFunctionTest.java   |  6 +-
 .../function/DivisionTransformFunctionTest.java    |  6 +-
 .../MultiplicationTransformFunctionTest.java       |  6 +-
 .../function/SubtractionTransformFunctionTest.java |  6 +-
 .../TimeConversionTransformFunctionTest.java       |  6 +-
 .../function/ValueInTransformFunctionTest.java     |  8 +-
 .../datetime/DateTimeConverterTest.java            |  2 +-
 .../timeunit/TimeUnitTransformerTest.java          |  2 +-
 .../periodictask/PeriodicTaskSchedulerTest.java    |  2 +-
 .../pinot/core/plan/CombinePlanNodeTest.java       |  8 +-
 ...adataAndDictionaryAggregationPlanMakerTest.java | 40 ++++-----
 .../pinot/core/predicate/InPredicateTest.java      | 18 ++--
 .../NoDictionaryEqualsPredicateEvaluatorsTest.java | 16 ++--
 .../NoDictionaryInPredicateEvaluatorTest.java      | 16 ++--
 .../NoDictionaryRangePredicateEvaluatorTest.java   | 10 +--
 .../predicate/PredicateEvaluatorTestUtils.java     |  2 +-
 ...ngeOfflineDictionaryPredicateEvaluatorTest.java | 10 +--
 .../function/AggregationFunctionFactoryTest.java   |  2 +-
 .../function/AggregationFunctionTypeTest.java      |  2 +-
 .../scheduler/MultiLevelPriorityQueueTest.java     | 14 ++--
 .../query/scheduler/PrioritySchedulerTest.java     | 26 +++---
 .../pinot/core/query/scheduler/TestHelper.java     | 12 +--
 .../core/query/scheduler/TestSchedulerGroup.java   |  2 +-
 .../query/scheduler/TestSchedulerGroupFactory.java |  2 +-
 .../scheduler/fcfs/FCFSSchedulerGroupTest.java     |  8 +-
 .../resources/BoundedAccountingExecutorTest.java   |  4 +-
 .../scheduler/resources/ResourceManagerTest.java   |  6 +-
 .../resources/UnboundedResourceManagerTest.java    |  4 +-
 .../tokenbucket/TokenSchedulerGroupTest.java       |  2 +-
 .../impl/RealtimeSegmentStatsHistoryTest.java      |  4 +-
 .../impl/dictionary/DictionaryPerfRunner.java      |  4 +-
 .../impl/dictionary/MultiValueDictionaryTest.java  |  8 +-
 .../impl/dictionary/MutableDictionaryTest.java     | 10 +--
 .../kafka/AvroRecordToPinotRowGeneratorTest.java   | 10 +--
 .../impl/kafka/KafkaLowLevelStreamConfigTest.java  |  8 +-
 .../kafka/KafkaPartitionLevelConsumerTest.java     | 14 ++--
 .../ConsumingSegmentAssignmentStrategyTest.java    | 16 ++--
 .../stream/MetadataEqualsHashCodeTest.java         |  2 +-
 .../core/realtime/stream/OffsetCriteriaTest.java   |  2 +-
 .../core/realtime/stream/StreamConfigTest.java     | 10 +--
 .../core/segment/index/ColumnMetadataTest.java     | 30 +++----
 .../segment/index/SegmentMetadataImplTest.java     | 12 +--
 .../SegmentV1V2ToV3FormatConverterTest.java        | 30 +++----
 .../index/creator/BloomFilterCreatorTest.java      | 22 ++---
 .../segment/index/creator/RawIndexCreatorTest.java | 36 ++++----
 .../SegmentGenerationWithBytesTypeTest.java        | 42 +++++-----
 .../SegmentGenerationWithTimeColumnTest.java       | 24 +++---
 .../index/creator/SegmentPartitionTest.java        | 44 +++++-----
 .../core/segment/index/loader/LoaderTest.java      | 48 +++++------
 .../core/segment/index/loader/LoaderUtilsTest.java |  4 +-
 .../index/loader/SegmentPreProcessorTest.java      | 36 ++++----
 .../readers/ImmutableDictionaryReaderTest.java     | 16 ++--
 .../core/segment/memory/PinotDataBufferTest.java   |  2 +-
 .../name/DefaultSegmentNameGeneratorTest.java      | 14 ++--
 .../NormalizedDateSegmentNameGeneratorTest.java    |  6 +-
 .../store/ColumnIndexDirectoryTestHelper.java      |  8 +-
 .../segment/store/FilePerIndexDirectoryTest.java   | 10 +--
 .../segment/store/SegmentDirectoryPathsTest.java   |  6 +-
 .../segment/store/SegmentLocalFSDirectoryTest.java | 12 +--
 .../store/SingleFileIndexDirectoryTest.java        | 10 +--
 .../pinot/core/startree/BaseStarTreeIndexTest.java | 26 +++---
 .../core/startree/OffHeapStarTreeBuilderTest.java  | 14 ++--
 .../pinot/core/startree/StarTreeDataTableTest.java |  4 +-
 .../startree/StarTreeIndexTestSegmentHelper.java   | 28 +++----
 .../pinot/core/startree/SumStarTreeIndexTest.java  | 12 +--
 .../pinot/core/startree/TestStarTreeMetadata.java  | 22 ++---
 .../pinot/core/startree/hll/HllFieldSizeTest.java  |  4 +-
 .../core/startree/hll/HllIndexCreationTest.java    | 32 +++----
 .../core/startree/hll/HllStarTreeIndexTest.java    | 20 ++---
 .../core/startree/hll/HllTypeConversionTest.java   |  2 +-
 .../OffHeapStarTreeBuilderWithHllFieldTest.java    | 26 +++---
 .../hll/SegmentWithHllIndexCreateHelper.java       | 32 +++----
 .../v2/AggregationFunctionColumnPairTest.java      |  4 +-
 .../pinot/core/startree/v2/AvgStarTreeV2Test.java  | 10 +--
 .../pinot/core/startree/v2/BaseStarTreeV2Test.java | 66 +++++++--------
 .../core/startree/v2/CountStarTreeV2Test.java      |  8 +-
 .../v2/DistinctCountHLLStarTreeV2Test.java         |  8 +-
 .../pinot/core/startree/v2/MaxStarTreeV2Test.java  |  8 +-
 .../startree/v2/MinMaxRangeStarTreeV2Test.java     | 10 +--
 .../pinot/core/startree/v2/MinStarTreeV2Test.java  |  8 +-
 .../startree/v2/PercentileEstStarTreeV2Test.java   | 12 +--
 .../v2/PercentileTDigestStarTreeV2Test.java        |  8 +-
 .../v2/PreAggregatedAvgStarTreeV2Test.java         | 12 +--
 ...reAggregatedDistinctCountHLLStarTreeV2Test.java | 10 +--
 .../v2/PreAggregatedMinMaxRangeStarTreeV2Test.java | 12 +--
 .../PreAggregatedPercentileEstStarTreeV2Test.java  | 12 +--
 ...eAggregatedPercentileTDigestStarTreeV2Test.java | 10 +--
 .../pinot/core/startree/v2/SumStarTreeV2Test.java  |  8 +-
 .../apache/pinot/core/transport/DummyServer.java   |  2 +-
 .../pinot/core/transport/QueryRouterTest.java      | 14 ++--
 .../apache/pinot/core/util/ArrayCopyUtilsTest.java |  4 +-
 .../org/apache/pinot/core/util/CrcUtilsTest.java   | 22 ++---
 .../pinot/core/util/DoubleComparisonUtil.java      |  2 +-
 .../core/util/SortedRangeIntersectionTest.java     |  6 +-
 .../pinot/core/util/trace/TraceContextTest.java    |  6 +-
 .../pinot/index/persist/AvroDataPublisherTest.java | 24 +++---
 .../pinot/index/reader/FileReaderTestUtils.java    |  2 +-
 .../pinot/index/reader/FixedBitMultiValueTest.java | 18 ++--
 .../FixedByteWidthRowColDataFileReaderTest.java    |  6 +-
 .../index/reader/SortedForwardIndexReaderTest.java | 12 +--
 .../FixedByteChunkSingleValueReaderWriteTest.java  | 12 +--
 ...ByteSingleColumnMultiValueReaderWriterTest.java | 10 +--
 ...yteSingleColumnSingleValueReaderWriterTest.java |  8 +-
 ...ByteSingleValueMultiColumnReaderWriterTest.java |  8 +-
 .../VarByteChunkSingleValueReaderWriteTest.java    | 12 +--
 .../FixedByteWidthRowColDataFileWriterTest.java    | 10 +--
 .../pinot/queries/BaseMultiValueQueriesTest.java   | 26 +++---
 .../org/apache/pinot/queries/BaseQueriesTest.java  | 26 +++---
 .../pinot/queries/BaseSingleValueQueriesTest.java  | 26 +++---
 .../apache/pinot/queries/FastHllQueriesTest.java   | 40 ++++-----
 ...nerSegmentAggregationMultiValueQueriesTest.java |  8 +-
 ...erSegmentAggregationSingleValueQueriesTest.java |  8 +-
 ...InnerSegmentSelectionMultiValueQueriesTest.java | 14 ++--
 ...nnerSegmentSelectionSingleValueQueriesTest.java | 14 ++--
 ...terSegmentAggregationMultiValueQueriesTest.java |  6 +-
 ...erSegmentAggregationSingleValueQueriesTest.java |  6 +-
 .../queries/PercentileTDigestMVQueriesTest.java    | 22 ++---
 .../queries/PercentileTDigestQueriesTest.java      | 50 +++++------
 .../org/apache/pinot/queries/QueriesTestUtils.java | 14 ++--
 .../DefaultAggregationExecutorTest.java            | 52 ++++++------
 .../DoubleAggregationResultHolderTest.java         |  6 +-
 .../AggregationGroupByTrimmingServiceTest.java     | 10 +--
 .../DictionaryBasedGroupKeyGeneratorTest.java      | 40 ++++-----
 .../groupby/DoubleGroupByResultHolderTest.java     |  6 +-
 .../groupby/NoDictionaryGroupKeyGeneratorTest.java | 48 +++++------
 .../pinot/query/executor/QueryExecutorTest.java    | 40 ++++-----
 .../query/pruner/ColumnValueSegmentPrunerTest.java | 18 ++--
 .../selection/SelectionOperatorServiceTest.java    | 18 ++--
 .../converter/RealtimeSegmentConverterTest.java    | 14 ++--
 .../pinot/reduce/HavingClauseComparisonTests.java  | 26 +++---
 .../v1/creator/BitmapInvertedIndexCreatorTest.java | 18 ++--
 .../v1/creator/BitmapInvertedIndexTest.java        | 24 +++---
 .../pinot/segments/v1/creator/BlocksTest.java      | 12 +--
 .../segments/v1/creator/DictionariesTest.java      | 64 +++++++-------
 .../v1/creator/FixedIntArrayIdMapTest.java         | 10 +--
 .../pinot/segments/v1/creator/IntArraysTest.java   | 28 +++----
 .../v1/creator/OnHeapDictionariesTest.java         | 34 ++++----
 .../segments/v1/creator/SegmentTestUtils.java      | 24 +++---
 .../realtime/ControllerLeaderLocatorTest.java      |  4 +-
 .../util/IntDoubleIndexedPriorityQueueTest.java    |  6 +-
 .../util/IntObjectIndexedPriorityQueueTest.java    |  8 +-
 .../test/java/org/apache/pinot/util/TestUtils.java |  4 +-
 .../test/resources/conf/query-executor.properties  |  2 +-
 pinot-core/src/test/resources/log4j.properties     |  2 +-
 pinot-core/testng.xml                              | 12 +--
 pinot-distribution/pom.xml                         | 30 +++----
 pinot-filesystem/pom.xml                           |  4 +-
 .../org/apache/pinot/filesystem/LocalPinotFS.java  |  4 +-
 .../java/org/apache/pinot/filesystem/PinotFS.java  |  2 +-
 .../apache/pinot/filesystem/PinotFSFactory.java    |  2 +-
 .../apache/pinot/filesystem/LocalPinotFSTest.java  |  4 +-
 .../pinot/filesystem/PinotFSFactoryTest.java       |  4 +-
 pinot-hadoop-filesystem/pom.xml                    |  8 +-
 .../org/apache/pinot/filesystem/HadoopPinotFS.java | 10 +--
 pinot-hadoop/README.md                             |  2 +-
 pinot-hadoop/pom.xml                               | 12 +--
 .../pinot/hadoop/PinotHadoopJobLauncher.java       | 10 +--
 .../org/apache/pinot/hadoop/io/FileHandler.java    |  2 +-
 .../pinot/hadoop/io/JsonPinotOutputFormat.java     |  8 +-
 .../apache/pinot/hadoop/io/PinotOutputFormat.java  | 16 ++--
 .../org/apache/pinot/hadoop/io/PinotRecord.java    |  6 +-
 .../pinot/hadoop/io/PinotRecordSerialization.java  |  4 +-
 .../apache/pinot/hadoop/io/PinotRecordWriter.java  | 12 +--
 .../apache/pinot/hadoop/job/ControllerRestApi.java | 12 +--
 .../pinot/hadoop/job/JobConfigConstants.java       |  2 +-
 .../pinot/hadoop/job/SegmentCreationJob.java       | 16 ++--
 .../apache/pinot/hadoop/job/SegmentTarPushJob.java |  6 +-
 .../apache/pinot/hadoop/job/SegmentUriPushJob.java |  6 +-
 .../mapper/HadoopSegmentCreationMapReduceJob.java  | 30 +++----
 .../apache/pinot/hadoop/utils/PushLocation.java    |  2 +-
 .../pinot/hadoop/io/PinotOutputFormatTest.java     | 12 +--
 pinot-integration-tests/pom.xml                    | 30 +++----
 ...umSegmentAssignmentStrategyIntegrationTest.java |  6 +-
 .../tests/BaseClusterIntegrationTest.java          | 20 ++---
 .../tests/BaseClusterIntegrationTestSet.java       | 18 ++--
 .../tests/ChaosMonkeyIntegrationTest.java          | 10 +--
 .../tests/ClusterIntegrationTestUtils.java         | 32 +++----
 .../pinot/integration/tests/ClusterTest.java       | 60 ++++++-------
 ...vertToRawIndexMinionClusterIntegrationTest.java | 24 +++---
 .../DeleteAPIHybridClusterIntegrationTest.java     | 12 +--
 ...lakyConsumerRealtimeClusterIntegrationTest.java | 24 +++---
 ...mentBuildPushOfflineClusterIntegrationTest.java | 16 ++--
 .../tests/HybridClusterIntegrationTest.java        | 16 ++--
 ...ridClusterIntegrationTestCommandLineRunner.java | 14 ++--
 .../tests/LLCRealtimeClusterIntegrationTest.java   |  8 +-
 ...CRealtimeClusterSplitCommitIntegrationTest.java |  6 +-
 ...onaryAggregationPlanClusterIntegrationTest.java |  6 +-
 .../MultiNodesOfflineClusterIntegrationTest.java   |  2 +-
 .../tests/NewConfigApplyIntegrationTest.java       | 12 +--
 .../tests/OfflineClusterIntegrationTest.java       | 12 +--
 .../tests/PinotURIUploadIntegrationTest.java       | 14 ++--
 .../pinot/integration/tests/QueryGenerator.java    |  4 +-
 .../tests/RealtimeClusterIntegrationTest.java      |  8 +-
 .../tests/SegmentCompletionIntegrationTests.java   | 30 +++----
 .../tests/SimpleMinionClusterIntegrationTest.java  | 38 ++++-----
 .../tests/StarTreeClusterIntegrationTest.java      | 12 +--
 .../tests/StarTreeV2ClusterIntegrationTest.java    | 16 ++--
 .../tests/UploadRefreshDeleteIntegrationTest.java  |  6 +-
 .../src/test/resources/log4j.properties            |  2 +-
 .../src/test/resources/mytable-updated.conf        |  2 +-
 .../src/test/resources/mytable.conf                |  2 +-
 pinot-minion/pom.xml                               |  8 +-
 .../org/apache/pinot/minion/MinionContext.java     |  6 +-
 .../org/apache/pinot/minion/MinionStarter.java     | 34 ++++----
 .../minion/events/DefaultMinionEventObserver.java  |  4 +-
 .../events/DefaultMinionEventObserverFactory.java  |  2 +-
 .../events/EventObserverFactoryRegistry.java       |  2 +-
 .../pinot/minion/events/MinionEventObserver.java   |  4 +-
 .../minion/events/MinionEventObserverFactory.java  |  2 +-
 .../pinot/minion/exception/FatalException.java     |  2 +-
 .../minion/exception/TaskCancelledException.java   |  2 +-
 .../BaseMultipleSegmentsConversionExecutor.java    | 14 ++--
 .../BaseSingleSegmentConversionExecutor.java       | 16 ++--
 .../pinot/minion/executor/BaseTaskExecutor.java    |  4 +-
 .../executor/ConvertToRawIndexTaskExecutor.java    | 10 +--
 .../ConvertToRawIndexTaskExecutorFactory.java      |  2 +-
 .../pinot/minion/executor/PinotTaskExecutor.java   |  4 +-
 .../minion/executor/PinotTaskExecutorFactory.java  |  2 +-
 .../pinot/minion/executor/PurgeTaskExecutor.java   | 12 +--
 .../minion/executor/PurgeTaskExecutorFactory.java  |  2 +-
 .../minion/executor/SegmentConversionResult.java   |  4 +-
 .../minion/executor/SegmentConversionUtils.java    | 16 ++--
 .../executor/TaskExecutorFactoryRegistry.java      |  4 +-
 .../apache/pinot/minion/metrics/MinionGauge.java   |  6 +-
 .../apache/pinot/minion/metrics/MinionMeter.java   |  6 +-
 .../apache/pinot/minion/metrics/MinionMetrics.java |  6 +-
 .../pinot/minion/metrics/MinionQueryPhase.java     |  6 +-
 .../apache/pinot/minion/metrics/MinionTimer.java   |  6 +-
 .../minion/taskfactory/TaskFactoryRegistry.java    | 28 +++----
 .../minion/executor/PurgeTaskExecutorTest.java     | 30 +++----
 pinot-minion/src/test/resources/log4j.properties   |  2 +-
 pinot-perf/pom.xml                                 | 24 +++---
 .../org/apache/pinot/perf/BenchmarkDictionary.java | 10 +--
 .../pinot/perf/BenchmarkDictionaryCreation.java    |  8 +-
 .../perf/BenchmarkFixedIntArrayOffHeapIdMap.java   | 12 +--
 .../perf/BenchmarkOffHeapDictionaryMemory.java     | 10 +--
 .../pinot/perf/BenchmarkOfflineIndexReader.java    | 42 +++++-----
 .../pinot/perf/BenchmarkOrDocIdIterator.java       |  8 +-
 .../apache/pinot/perf/BenchmarkQueryEngine.java    | 12 +--
 .../perf/BenchmarkRealtimeConsumptionSpeed.java    | 12 +--
 .../pinot/perf/BenchmarkStringDictionary.java      | 10 +--
 .../org/apache/pinot/perf/DictionaryDumper.java    | 12 +--
 .../pinot/perf/ForwardIndexWriterBenchmark.java    |  4 +-
 .../org/apache/pinot/perf/RawIndexBenchmark.java   | 42 +++++-----
 .../org/apache/pinot/perf/RealtimeStressTest.java  | 14 ++--
 .../pinot/perf/StringDictionaryPerfTest.java       | 30 +++----
 pinot-perf/src/main/resources/log4j.properties     | 12 +--
 pinot-server/pom.xml                               | 16 ++--
 .../api/resources/DefaultExceptionMapper.java      |  4 +-
 .../pinot/server/api/resources/ErrorInfo.java      |  2 +-
 .../pinot/server/api/resources/ErrorResponse.java  |  2 +-
 .../server/api/resources/HealthCheckResource.java  |  8 +-
 .../server/api/resources/MmapDebugResource.java    |  4 +-
 .../server/api/resources/SchedulerResource.java    |  4 +-
 .../server/api/resources/TableSizeResource.java    | 20 ++---
 .../pinot/server/api/resources/TablesResource.java | 18 ++--
 .../pinot/server/conf/NettyServerConfig.java       |  2 +-
 .../org/apache/pinot/server/conf/ServerConf.java   |  2 +-
 .../server/request/ScheduledRequestHandler.java    | 18 ++--
 .../apache/pinot/server/starter/ServerBuilder.java | 24 +++---
 .../pinot/server/starter/ServerInstance.java       | 22 ++---
 .../server/starter/helix/AdminApiApplication.java  |  6 +-
 .../helix/DefaultHelixStarterServerConfig.java     |  6 +-
 .../starter/helix/HelixInstanceDataManager.java    | 34 ++++----
 .../helix/HelixInstanceDataManagerConfig.java      |  6 +-
 .../server/starter/helix/HelixServerStarter.java   | 36 ++++----
 .../starter/helix/SegmentFetcherAndLoader.java     | 32 +++----
 .../pinot/server/starter/helix/SegmentLocks.java   |  2 +-
 .../helix/SegmentMessageHandlerFactory.java        | 16 ++--
 .../SegmentOnlineOfflineStateModelFactory.java     | 24 +++---
 .../server/api/resources/BaseResourceTest.java     | 32 +++----
 .../api/resources/TableSizeResourceTest.java       |  6 +-
 .../server/api/resources/TablesResourceTest.java   | 14 ++--
 .../realtime/RealtimeTableDataManagerTest.java     | 58 ++++++-------
 .../request/ScheduledRequestHandlerTest.java       | 34 ++++----
 .../apache/pinot/server/util/SegmentTestUtils.java | 12 +--
 pinot-tools/pom.xml                                | 44 +++++-----
 .../apache/pinot/tools/AbstractBaseCommand.java    |  2 +-
 .../pinot/tools/AutoAddInvertedIndexTool.java      |  4 +-
 .../apache/pinot/tools/ClusterStateVerifier.java   |  4 +-
 .../main/java/org/apache/pinot/tools/Command.java  |  2 +-
 .../org/apache/pinot/tools/HybridQuickstart.java   | 18 ++--
 .../apache/pinot/tools/PinotIdealstateChanger.java |  6 +-
 .../apache/pinot/tools/PinotNumReplicaChanger.java | 12 +--
 .../apache/pinot/tools/PinotSegmentRebalancer.java | 16 ++--
 .../org/apache/pinot/tools/PinotToolLauncher.java  |  6 +-
 .../org/apache/pinot/tools/PinotZKChanger.java     |  4 +-
 .../java/org/apache/pinot/tools/Quickstart.java    |  6 +-
 .../apache/pinot/tools/QuickstartTableRequest.java |  6 +-
 .../org/apache/pinot/tools/RealtimeQuickStart.java | 16 ++--
 .../org/apache/pinot/tools/SegmentDumpTool.java    | 28 +++----
 .../java/org/apache/pinot/tools/SpeedTest.java     |  2 +-
 .../apache/pinot/tools/StarTreeIndexViewer.java    | 26 +++---
 .../org/apache/pinot/tools/UpdateSegmentState.java |  4 +-
 .../apache/pinot/tools/ValidateTableRetention.java |  4 +-
 .../pinot/tools/admin/PinotAdministrator.java      | 62 +++++++-------
 .../org/apache/pinot/tools/admin/PinotBroker.java  |  2 +-
 .../apache/pinot/tools/admin/PinotController.java  |  2 +-
 .../org/apache/pinot/tools/admin/PinotServer.java  |  2 +-
 .../admin/command/AbstractBaseAdminCommand.java    |  4 +-
 .../tools/admin/command/AddSchemaCommand.java      | 10 +--
 .../pinot/tools/admin/command/AddTableCommand.java | 10 +--
 .../tools/admin/command/AddTenantCommand.java      | 12 +--
 .../admin/command/ApplyTableConfigCommand.java     | 12 +--
 .../admin/command/AvroSchemaToPinotSchema.java     | 10 +--
 .../command/BackfillDateTimeColumnCommand.java     | 16 ++--
 .../admin/command/ChangeNumReplicasCommand.java    |  6 +-
 .../tools/admin/command/ChangeTableState.java      |  6 +-
 .../tools/admin/command/CreateSegmentCommand.java  | 20 ++---
 .../tools/admin/command/DeleteClusterCommand.java  |  4 +-
 .../tools/admin/command/GenerateDataCommand.java   | 28 +++----
 .../tools/admin/command/MoveReplicaGroup.java      | 16 ++--
 .../tools/admin/command/PostQueryCommand.java      | 10 +--
 .../tools/admin/command/QuickstartRunner.java      | 10 +--
 .../command/RealtimeProvisioningHelperCommand.java | 10 +--
 .../tools/admin/command/RebalanceTableCommand.java |  6 +-
 .../admin/command/ShowClusterInfoCommand.java      |  8 +-
 .../tools/admin/command/StartBrokerCommand.java    | 10 +--
 .../admin/command/StartControllerCommand.java      | 10 +--
 .../tools/admin/command/StartKafkaCommand.java     |  6 +-
 .../tools/admin/command/StartServerCommand.java    | 10 +--
 .../tools/admin/command/StartZookeeperCommand.java |  6 +-
 .../tools/admin/command/StopProcessCommand.java    |  4 +-
 .../admin/command/StreamAvroIntoKafkaCommand.java  | 12 +--
 .../tools/admin/command/UploadSegmentCommand.java  | 10 +--
 .../tools/admin/command/ValidateConfigCommand.java | 18 ++--
 .../admin/command/VerifyClusterStateCommand.java   |  6 +-
 .../tools/admin/command/VerifySegmentState.java    |  8 +-
 .../pinot/tools/backfill/BackfillSegmentUtils.java | 12 +--
 .../tools/config/validator/SchemaValidator.java    |  4 +-
 .../config/validator/TableConfigValidator.java     |  4 +-
 .../pinot/tools/data/generator/AvroWriter.java     |  8 +-
 .../pinot/tools/data/generator/DataGenerator.java  | 20 ++---
 .../tools/data/generator/DataGeneratorSpec.java    |  8 +-
 .../pinot/tools/data/generator/Generator.java      |  2 +-
 .../tools/data/generator/GeneratorFactory.java     |  4 +-
 .../tools/data/generator/NumberGenerator.java      |  4 +-
 .../tools/data/generator/RangeDoubleGenerator.java |  2 +-
 .../tools/data/generator/RangeFloatGenerator.java  |  2 +-
 .../tools/data/generator/RangeIntGenerator.java    |  2 +-
 .../tools/data/generator/RangeLongGenerator.java   |  2 +-
 .../tools/data/generator/SchemaAnnotation.java     |  2 +-
 .../tools/data/generator/StringGenerator.java      |  2 +-
 .../pinot/tools/perf/PerfBenchmarkDriver.java      | 30 +++----
 .../pinot/tools/perf/PerfBenchmarkDriverConf.java  |  4 +-
 .../pinot/tools/perf/PerfBenchmarkRunner.java      |  8 +-
 .../org/apache/pinot/tools/perf/QueryRunner.java   |  6 +-
 .../apache/pinot/tools/perf/ZookeeperLauncher.java |  2 +-
 .../tools/query/comparison/ClusterStarter.java     | 34 ++++----
 .../tools/query/comparison/QueryComparison.java    | 10 +--
 .../query/comparison/QueryComparisonConfig.java    |  4 +-
 .../query/comparison/SegmentInfoProvider.java      | 18 ++--
 .../query/comparison/StarQueryComparison.java      |  4 +-
 .../query/comparison/StarTreeQueryGenerator.java   | 12 +--
 .../tools/query/comparison/StatsGenerator.java     |  2 +-
 .../realtime/provisioning/MemoryEstimator.java     | 28 +++----
 .../apache/pinot/tools/scan/query/Aggregation.java | 12 +--
 .../pinot/tools/scan/query/AggregationFunc.java    |  2 +-
 .../tools/scan/query/AggregationFuncFactory.java   |  2 +-
 .../apache/pinot/tools/scan/query/AvgFunction.java |  4 +-
 .../pinot/tools/scan/query/CountFunction.java      |  4 +-
 .../tools/scan/query/DistinctCountFunction.java    |  4 +-
 .../tools/scan/query/EqualsPredicateFilter.java    |  4 +-
 .../pinot/tools/scan/query/GroupByOperator.java    |  2 +-
 .../pinot/tools/scan/query/InPredicateFilter.java  |  4 +-
 .../apache/pinot/tools/scan/query/MaxFunction.java |  4 +-
 .../apache/pinot/tools/scan/query/MinFunction.java |  4 +-
 .../tools/scan/query/MinMaxRangeFunction.java      |  4 +-
 .../tools/scan/query/NotInPredicateFilter.java     |  4 +-
 .../pinot/tools/scan/query/NotPredicateFilter.java |  4 +-
 .../pinot/tools/scan/query/PredicateFilter.java    |  2 +-
 .../apache/pinot/tools/scan/query/Projection.java  | 18 ++--
 .../pinot/tools/scan/query/QueryResponse.java      |  6 +-
 .../tools/scan/query/RangePredicateFilter.java     |  4 +-
 .../apache/pinot/tools/scan/query/ResultTable.java |  4 +-
 .../tools/scan/query/ScanBasedQueryProcessor.java  | 12 +--
 .../tools/scan/query/SegmentQueryProcessor.java    | 36 ++++----
 .../apache/pinot/tools/scan/query/Selection.java   | 10 +--
 .../apache/pinot/tools/scan/query/SumFunction.java |  4 +-
 .../org/apache/pinot/tools/scan/query/Utils.java   |  2 +-
 .../converter/ColumnarToStarTreeConverter.java     | 26 +++---
 .../converter/DictionaryToRawIndexConverter.java   | 32 +++----
 .../converter/PinotSegmentConvertCommand.java      | 10 +--
 .../segment/converter/PinotSegmentConverter.java   |  2 +-
 .../converter/PinotSegmentToAvroConverter.java     |  8 +-
 .../converter/PinotSegmentToCsvConverter.java      |  6 +-
 .../converter/PinotSegmentToJsonConverter.java     |  8 +-
 .../segment/converter/SegmentMergeCommand.java     | 26 +++---
 .../pinot/tools/streams/AirlineDataStream.java     | 14 ++--
 .../pinot/tools/streams/MeetupRsvpStream.java      | 10 +--
 .../resources/conf/pinot-admin-log4j.properties    | 14 ++--
 .../resources/conf/pinot-broker-log4j.properties   |  2 +-
 .../conf/pinot-controller-log4j.properties         |  2 +-
 .../resources/conf/pinot-server-log4j.properties   |  2 +-
 .../resources/conf/pinot-tools-log4j.properties    | 12 +--
 .../resources/conf/quickstart-log4j.properties     | 12 +--
 .../conf/quickstart-offline-log4j.properties       | 14 ++--
 .../conf/quickstart-realtime-log4j.properties      | 14 ++--
 .../main/resources/conf/sample_perf_benchmark.yaml |  2 +-
 .../conf/sample_realtime_table_config.json         |  2 +-
 pinot-tools/src/main/resources/log4j.properties    | 12 +--
 .../airlineStats_realtime_table_config.json        |  2 +-
 .../meetupRsvp_realtime_table_config.json          |  4 +-
 pinot-transport/pom.xml                            | 10 +--
 .../common/AbstractCompositeListenableFuture.java  |  4 +-
 .../transport/common/AsyncResponseFuture.java      |  4 +-
 .../apache/pinot/transport/common/Callback.java    |  2 +-
 .../apache/pinot/transport/common/Cancellable.java |  2 +-
 .../pinot/transport/common/CompositeFuture.java    |  4 +-
 .../pinot/transport/common/LinkedDequeue.java      |  2 +-
 .../apache/pinot/transport/common/NoneType.java    |  2 +-
 .../pinot/transport/common/SelectingFuture.java    |  4 +-
 .../transport/common/ServerResponseFuture.java     |  4 +-
 .../pinot/transport/conf/TransportClientConf.java  |  6 +-
 .../transport/config/ConnectionPoolConfig.java     |  2 +-
 .../transport/config/PerTableRoutingConfig.java    |  2 +-
 .../pinot/transport/config/RoutingTableConfig.java |  2 +-
 .../pinot/transport/config/ThreadPoolConfig.java   |  2 +-
 .../transport/metrics/AggregatedPoolStats.java     |  6 +-
 .../metrics/AggregatedTransportClientMetrics.java  | 16 ++--
 .../metrics/AggregatedTransportServerMetrics.java  | 12 +--
 .../pinot/transport/metrics/AsyncPoolStats.java    |  6 +-
 .../transport/metrics/NettyClientMetrics.java      |  6 +-
 .../transport/metrics/NettyServerMetrics.java      |  6 +-
 .../apache/pinot/transport/metrics/PoolStats.java  |  6 +-
 .../pinot/transport/metrics/PoolStatsProvider.java |  2 +-
 .../transport/metrics/TransportClientMetrics.java  |  4 +-
 .../transport/metrics/TransportServerMetrics.java  |  4 +-
 .../transport/netty/NettyClientConnection.java     | 10 +--
 .../apache/pinot/transport/netty/NettyServer.java  | 12 +--
 .../transport/netty/NettyTCPClientConnection.java  | 10 +--
 .../pinot/transport/netty/NettyTCPServer.java      | 10 +--
 .../netty/PooledNettyClientResourceManager.java    | 14 ++--
 .../org/apache/pinot/transport/pool/AsyncPool.java | 14 ++--
 .../apache/pinot/transport/pool/AsyncPoolImpl.java | 18 ++--
 .../pool/AsyncPoolResourceManagerAdapter.java      | 14 ++--
 .../org/apache/pinot/transport/pool/KeyedPool.java | 12 +--
 .../apache/pinot/transport/pool/KeyedPoolImpl.java | 24 +++---
 .../transport/pool/PooledResourceManager.java      |  4 +-
 .../transport/pool/SizeLimitExceededException.java |  2 +-
 .../transport/scattergather/ScatterGather.java     |  6 +-
 .../transport/scattergather/ScatterGatherImpl.java | 26 +++---
 .../scattergather/ScatterGatherRequest.java        |  4 +-
 .../scattergather/ScatterGatherStats.java          |  4 +-
 .../src/test/java/org/apache/pinot/Checkable.java  |  2 +-
 .../src/test/java/org/apache/pinot/TestUtils.java  |  2 +-
 .../transport/common/CompositeFutureTest.java      |  6 +-
 .../pinot/transport/common/ResponseFutureTest.java |  8 +-
 .../transport/common/SelectingFutureTest.java      |  4 +-
 .../pinot/transport/common/ServerInstanceTest.java |  4 +-
 .../transport/netty/NettyCloseChannelTest.java     |  8 +-
 .../NettySingleConnectionIntegrationTest.java      | 30 +++----
 .../pinot/transport/netty/NettyTestUtils.java      |  2 +-
 .../transport/perf/ScatterGatherPerfClient.java    | 32 +++----
 .../transport/perf/ScatterGatherPerfServer.java    | 12 +--
 .../transport/perf/ScatterGatherPerfTester.java    | 16 ++--
 .../pool/AsyncPoolResourceManagerAdapterTest.java  |  6 +-
 .../pinot/transport/pool/KeyedPoolImplTest.java    | 12 +--
 .../transport/scattergather/ScatterGatherTest.java | 26 +++---
 pom.xml                                            | 36 ++++----
 1724 files changed, 8405 insertions(+), 8405 deletions(-)

diff --git a/contrib/pinot-druid-benchmark/pom.xml b/contrib/pinot-druid-benchmark/pom.xml
index 1f919aa..050e312 100644
--- a/contrib/pinot-druid-benchmark/pom.xml
+++ b/contrib/pinot-druid-benchmark/pom.xml
@@ -24,7 +24,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.linkedin.pinotdruidbenchmark</groupId>
+  <groupId>org.apache.pinotdruidbenchmark</groupId>
   <artifactId>pinot-druid-benchmark</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
@@ -52,27 +52,27 @@
         <configuration>
           <programs>
             <program>
-              <mainClass>com.linkedin.pinotdruidbenchmark.DataSeparator</mainClass>
+              <mainClass>org.apache.pinotdruidbenchmark.DataSeparator</mainClass>
               <name>data-separator</name>
             </program>
             <program>
-              <mainClass>com.linkedin.pinotdruidbenchmark.DataMerger</mainClass>
+              <mainClass>org.apache.pinotdruidbenchmark.DataMerger</mainClass>
               <name>data-merger</name>
             </program>
             <program>
-              <mainClass>com.linkedin.pinotdruidbenchmark.PinotResponseTime</mainClass>
+              <mainClass>org.apache.pinotdruidbenchmark.PinotResponseTime</mainClass>
               <name>pinot-response-time</name>
             </program>
             <program>
-              <mainClass>com.linkedin.pinotdruidbenchmark.DruidResponseTime</mainClass>
+              <mainClass>org.apache.pinotdruidbenchmark.DruidResponseTime</mainClass>
               <name>druid-response-time</name>
             </program>
             <program>
-              <mainClass>com.linkedin.pinotdruidbenchmark.PinotThroughput</mainClass>
+              <mainClass>org.apache.pinotdruidbenchmark.PinotThroughput</mainClass>
               <name>pinot-throughput</name>
             </program>
             <program>
-              <mainClass>com.linkedin.pinotdruidbenchmark.DruidThroughput</mainClass>
+              <mainClass>org.apache.pinotdruidbenchmark.DruidThroughput</mainClass>
               <name>druid-throughput</name>
             </program>
           </programs>
diff --git a/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/DataMerger.java b/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/DataMerger.java
index 4849e6e..bce28cf 100644
--- a/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/DataMerger.java
+++ b/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/DataMerger.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinotdruidbenchmark;
+package org.apache.pinotdruidbenchmark;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/DataSeparator.java b/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/DataSeparator.java
index 6e6f735..9211599 100644
--- a/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/DataSeparator.java
+++ b/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/DataSeparator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinotdruidbenchmark;
+package org.apache.pinotdruidbenchmark;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/DruidResponseTime.java b/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/DruidResponseTime.java
index 06caf2e..6650c9e 100644
--- a/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/DruidResponseTime.java
+++ b/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/DruidResponseTime.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinotdruidbenchmark;
+package org.apache.pinotdruidbenchmark;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
diff --git a/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/DruidThroughput.java b/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/DruidThroughput.java
index 789db27..11af155 100644
--- a/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/DruidThroughput.java
+++ b/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/DruidThroughput.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinotdruidbenchmark;
+package org.apache.pinotdruidbenchmark;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/PinotResponseTime.java b/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/PinotResponseTime.java
index 32c2499..353eafc 100644
--- a/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/PinotResponseTime.java
+++ b/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/PinotResponseTime.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinotdruidbenchmark;
+package org.apache.pinotdruidbenchmark;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
diff --git a/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/PinotThroughput.java b/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/PinotThroughput.java
index c50f61f..1ac1bf2 100644
--- a/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/PinotThroughput.java
+++ b/contrib/pinot-druid-benchmark/src/main/java/org/apache/pinotdruidbenchmark/PinotThroughput.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinotdruidbenchmark;
+package org.apache.pinotdruidbenchmark;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/contrib/pinot-druid-benchmark/src/main/resources/config/pinot_csv_config.json b/contrib/pinot-druid-benchmark/src/main/resources/config/pinot_csv_config.json
index fbe483a..724a7c5 100644
--- a/contrib/pinot-druid-benchmark/src/main/resources/config/pinot_csv_config.json
+++ b/contrib/pinot-druid-benchmark/src/main/resources/config/pinot_csv_config.json
@@ -1,4 +1,4 @@
 {
   "CsvHeader": "l_orderkey|l_partkey|l_suppkey|l_linenumber|l_quantity|l_extendedprice|l_discount|l_tax|l_returnflag|l_linestatus|l_shipdate|l_commitdate|l_receiptdate|l_shipinstruct|l_shipmode|l_comment|",
   "CsvDelimiter": "|"
-}
\ No newline at end of file
+}
diff --git a/contrib/pinot-druid-benchmark/src/main/resources/config/pinot_table.json b/contrib/pinot-druid-benchmark/src/main/resources/config/pinot_table.json
index 457ef9d..01c5fa2 100644
--- a/contrib/pinot-druid-benchmark/src/main/resources/config/pinot_table.json
+++ b/contrib/pinot-druid-benchmark/src/main/resources/config/pinot_table.json
@@ -16,4 +16,4 @@
   },
   "tableType":"OFFLINE",
   "metadata": {}
-}
\ No newline at end of file
+}
diff --git a/pinot-api/pom.xml b/pinot-api/pom.xml
index 45b5a41..d12faec 100644
--- a/pinot-api/pom.xml
+++ b/pinot-api/pom.xml
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>pinot</artifactId>
-    <groupId>com.linkedin.pinot</groupId>
+    <groupId>org.apache.pinot</groupId>
     <version>0.016</version>
   </parent>
   <artifactId>pinot-api</artifactId>
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/AbstractResultSet.java b/pinot-api/src/main/java/org/apache/pinot/client/AbstractResultSet.java
index 6a3fda6..87cb98c 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/AbstractResultSet.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/AbstractResultSet.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 /**
  * Shared implementation between the different ResultSets.
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/AggregationResultSet.java b/pinot-api/src/main/java/org/apache/pinot/client/AggregationResultSet.java
index 4afb5ff..48cf497 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/AggregationResultSet.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/AggregationResultSet.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 import com.fasterxml.jackson.databind.JsonNode;
 
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/BrokerResponse.java b/pinot-api/src/main/java/org/apache/pinot/client/BrokerResponse.java
index 576da47..792f0ed 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/BrokerResponse.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/BrokerResponse.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 import com.fasterxml.jackson.databind.JsonNode;
 
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/BrokerSelector.java b/pinot-api/src/main/java/org/apache/pinot/client/BrokerSelector.java
index 5968344..9b787c2 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/BrokerSelector.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/BrokerSelector.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 public interface BrokerSelector {
   /**
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/Connection.java b/pinot-api/src/main/java/org/apache/pinot/client/Connection.java
index 236c34f..023cb64 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/Connection.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/Connection.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/ConnectionFactory.java b/pinot-api/src/main/java/org/apache/pinot/client/ConnectionFactory.java
index f4cd8db..a6805d9 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/ConnectionFactory.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/ConnectionFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 import java.util.Arrays;
 import java.util.Properties;
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 4a6ab26..e733a42 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -31,8 +31,8 @@ import org.I0Itec.zkclient.IZkDataListener;
 import org.I0Itec.zkclient.ZkClient;
 import org.I0Itec.zkclient.serialize.BytesPushThroughSerializer;
 
-import static com.linkedin.pinot.client.ExternalViewReader.OFFLINE_SUFFIX;
-import static com.linkedin.pinot.client.ExternalViewReader.REALTIME_SUFFIX;
+import static org.apache.pinot.client.ExternalViewReader.OFFLINE_SUFFIX;
+import static org.apache.pinot.client.ExternalViewReader.REALTIME_SUFFIX;
 
 
 /**
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/ExternalViewReader.java b/pinot-api/src/main/java/org/apache/pinot/client/ExternalViewReader.java
index 486a990..bbdc4a5 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/ExternalViewReader.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/ExternalViewReader.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/GroupByResultSet.java b/pinot-api/src/main/java/org/apache/pinot/client/GroupByResultSet.java
index e9d9423..80b3de2 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/GroupByResultSet.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/GroupByResultSet.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 import com.fasterxml.jackson.databind.JsonNode;
 
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransport.java b/pinot-api/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransport.java
index c20716e..63b13a5 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransport.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransport.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransportFactory.java b/pinot-api/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransportFactory.java
index e5c0e55..da2ff12 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransportFactory.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransportFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 /**
  * Pinot client transport factory for JSON encoded BrokerResults through HTTP.
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/PinotClientException.java b/pinot-api/src/main/java/org/apache/pinot/client/PinotClientException.java
index f43818c..c2c8f15 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/PinotClientException.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/PinotClientException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 /**
  * Pinot client exception.
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/PinotClientTransport.java b/pinot-api/src/main/java/org/apache/pinot/client/PinotClientTransport.java
index c54e091..9c2dffd 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/PinotClientTransport.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/PinotClientTransport.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 import java.util.concurrent.Future;
 
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/PinotClientTransportFactory.java b/pinot-api/src/main/java/org/apache/pinot/client/PinotClientTransportFactory.java
index efbcd25..ce74ce8 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/PinotClientTransportFactory.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/PinotClientTransportFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 /**
  * Factory for client transports.
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/PreparedStatement.java b/pinot-api/src/main/java/org/apache/pinot/client/PreparedStatement.java
index 1406cba..fee0d52 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/PreparedStatement.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/PreparedStatement.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 import java.util.concurrent.Future;
 
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/ResultSet.java b/pinot-api/src/main/java/org/apache/pinot/client/ResultSet.java
index e8051fd..69c4c74 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/ResultSet.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/ResultSet.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 /**
  * A Pinot result group, representing an aggregation function in the original query.
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/ResultSetGroup.java b/pinot-api/src/main/java/org/apache/pinot/client/ResultSetGroup.java
index 73c9cb4..1516f1b 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/ResultSetGroup.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/ResultSetGroup.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import java.util.ArrayList;
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/SelectionResultSet.java b/pinot-api/src/main/java/org/apache/pinot/client/SelectionResultSet.java
index 0b81f9a..e871b7c 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/SelectionResultSet.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/SelectionResultSet.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 import com.fasterxml.jackson.databind.JsonNode;
 
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/SimpleBrokerSelector.java b/pinot-api/src/main/java/org/apache/pinot/client/SimpleBrokerSelector.java
index fb89488..97a8ddd 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/SimpleBrokerSelector.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/SimpleBrokerSelector.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 import java.util.List;
 import java.util.Random;
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/TextTable.java b/pinot-api/src/main/java/org/apache/pinot/client/TextTable.java
index 67c5875..bde857d 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/TextTable.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/TextTable.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/package-info.java b/pinot-api/src/main/java/org/apache/pinot/client/package-info.java
index ac22e3f..a1cb2f2 100644
--- a/pinot-api/src/main/java/org/apache/pinot/client/package-info.java
+++ b/pinot-api/src/main/java/org/apache/pinot/client/package-info.java
@@ -20,7 +20,7 @@
  * This package contains the Pinot client API.
  *
  * Connections to Pinot are created using the
- * {@link com.linkedin.pinot.client.ConnectionFactory} class' utility methods to create connections to a Pinot cluster
+ * {@link org.apache.pinot.client.ConnectionFactory} class' utility methods to create connections to a Pinot cluster
  * given a Zookeeper URL, a Java Properties object or a list of broker addresses to connect to.
  *
  * <pre>{@code Connection connection = ConnectionFactory.fromZookeeper
@@ -32,15 +32,15 @@
  *     ("some-server:1234", "some-other-server:1234", ...);}</pre>
  *
  * Queries can be sent directly to the Pinot cluster using the
- * {@link com.linkedin.pinot.client.Connection#execute(java.lang.String)} and
- * {@link com.linkedin.pinot.client.Connection#executeAsync(java.lang.String)} methods of
- * {@link com.linkedin.pinot.client.Connection}.
+ * {@link org.apache.pinot.client.Connection#execute(java.lang.String)} and
+ * {@link org.apache.pinot.client.Connection#executeAsync(java.lang.String)} methods of
+ * {@link org.apache.pinot.client.Connection}.
  *
  * <pre>{@code ResultSetGroup resultSetGroup = connection.execute("select * from foo...");
  * Future<ResultSetGroup> futureResultSetGroup = connection.executeAsync
  *     ("select * from foo...");}</pre>
  *
- * Queries can also use a {@link com.linkedin.pinot.client.PreparedStatement} to escape query parameters:
+ * Queries can also use a {@link org.apache.pinot.client.PreparedStatement} to escape query parameters:
  *
  * <pre>{@code PreparedStatement statement = connection.prepareStatement
  *     ("select * from foo where a = ?");
@@ -50,8 +50,8 @@
  * Future<ResultSetGroup> futureResultSetGroup = statement.executeAsync();}</pre>
  *
  * In the case of a selection query, results can be obtained with the various <code>get</code> methods in the first
- * {@link com.linkedin.pinot.client.ResultSet}, obtained through the
- * {@link com.linkedin.pinot.client.ResultSetGroup#getResultSet(int)} method:
+ * {@link org.apache.pinot.client.ResultSet}, obtained through the
+ * {@link org.apache.pinot.client.ResultSetGroup#getResultSet(int)} method:
  *
  * <pre>{@code ResultSet resultSet = connection.execute
  *     ("select foo, bar from baz where quux = 'quuux'").getResultSet(0);
@@ -64,7 +64,7 @@
  * resultSet.close();}</pre>
  *
  * In the case where there is an aggregation, each aggregation function is within its own
- * {@link com.linkedin.pinot.client.ResultSet}:
+ * {@link org.apache.pinot.client.ResultSet}:
  *
  * <pre>{@code ResultSetGroup resultSetGroup = connection.execute("select count(*) from foo");
  *
@@ -72,7 +72,7 @@
  * System.out.println("Number of records: " + resultSet.getInt(0));
  * resultSet.close();}</pre>
  *
- * There can be more than one {@link com.linkedin.pinot.client.ResultSet}, each of which can contain multiple results
+ * There can be more than one {@link org.apache.pinot.client.ResultSet}, each of which can contain multiple results
  * grouped by a group key.
  *
  * <pre>{@code ResultSetGroup resultSetGroup = connection.execute
@@ -95,4 +95,4 @@
  *
  * resultSet.close();}</pre>
  */
-package com.linkedin.pinot.client;
\ No newline at end of file
+package org.apache.pinot.client;
diff --git a/pinot-api/src/test/java/org/apache/pinot/client/ConnectionFactoryTest.java b/pinot-api/src/test/java/org/apache/pinot/client/ConnectionFactoryTest.java
index 705f2a6..fecf5cb 100644
--- a/pinot-api/src/test/java/org/apache/pinot/client/ConnectionFactoryTest.java
+++ b/pinot-api/src/test/java/org/apache/pinot/client/ConnectionFactoryTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/pinot-api/src/test/java/org/apache/pinot/client/PreparedStatementTest.java b/pinot-api/src/test/java/org/apache/pinot/client/PreparedStatementTest.java
index 365ca3c..672c357 100644
--- a/pinot-api/src/test/java/org/apache/pinot/client/PreparedStatementTest.java
+++ b/pinot-api/src/test/java/org/apache/pinot/client/PreparedStatementTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 import java.util.concurrent.Future;
 import org.testng.Assert;
diff --git a/pinot-api/src/test/java/org/apache/pinot/client/ResultSetGroupTest.java b/pinot-api/src/test/java/org/apache/pinot/client/ResultSetGroupTest.java
index 3d1cc3f..45842ee 100644
--- a/pinot-api/src/test/java/org/apache/pinot/client/ResultSetGroupTest.java
+++ b/pinot-api/src/test/java/org/apache/pinot/client/ResultSetGroupTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.client;
+package org.apache.pinot.client;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.InputStream;
diff --git a/pinot-api/src/test/resources/log4j.properties b/pinot-api/src/test/resources/log4j.properties
index 0453d9d..9f399d0 100644
--- a/pinot-api/src/test/resources/log4j.properties
+++ b/pinot-api/src/test/resources/log4j.properties
@@ -15,7 +15,7 @@
 #
 
 log4j.rootLogger=WARN, stdout
-log4j.logger.com.linkedin.pinot=WARN
+log4j.logger.org.apache.pinot=WARN
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.Target=System.out
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
diff --git a/pinot-api/src/test/resources/org/apache/pinot/client/aggregation.json b/pinot-api/src/test/resources/org/apache/pinot/client/aggregation.json
index a9bcbd7..b2009d6 100644
--- a/pinot-api/src/test/resources/org/apache/pinot/client/aggregation.json
+++ b/pinot-api/src/test/resources/org/apache/pinot/client/aggregation.json
@@ -1 +1 @@
-{"traceInfo":{},"numDocsScanned":36542,"aggregationResults":[{"function":"count_star","value":"36542"}],"timeUsedMs":30,"segmentStatistics":[],"exceptions":[],"totalDocs":115545}
\ No newline at end of file
+{"traceInfo":{},"numDocsScanned":36542,"aggregationResults":[{"function":"count_star","value":"36542"}],"timeUsedMs":30,"segmentStatistics":[],"exceptions":[],"totalDocs":115545}
diff --git a/pinot-api/src/test/resources/org/apache/pinot/client/aggregationGroupBy.json b/pinot-api/src/test/resources/org/apache/pinot/client/aggregationGroupBy.json
index d61a717..79b8a5d 100644
--- a/pinot-api/src/test/resources/org/apache/pinot/client/aggregationGroupBy.json
+++ b/pinot-api/src/test/resources/org/apache/pinot/client/aggregationGroupBy.json
@@ -1 +1 @@
-{"traceInfo":{},"numDocsScanned":22598,"aggregationResults":[{"groupByResult":[{"value":"3604","group":["30194"]},{"value":"1804","group":["31057"]},{"value":"1316","group":["32467"]},{"value":"1278","group":["30977"]},{"value":"1276","group":["30466"]},{"value":"1186","group":["32575"]},{"value":"1167","group":["31703"]},{"value":"1054","group":["30559"]},{"value":"975","group":["34100"]},{"value":"828","group":["30852"]}],"function":"count_star","groupByColumns":["DestCityMarketID"]}], [...]
\ No newline at end of file
+{"traceInfo":{},"numDocsScanned":22598,"aggregationResults":[{"groupByResult":[{"value":"3604","group":["30194"]},{"value":"1804","group":["31057"]},{"value":"1316","group":["32467"]},{"value":"1278","group":["30977"]},{"value":"1276","group":["30466"]},{"value":"1186","group":["32575"]},{"value":"1167","group":["31703"]},{"value":"1054","group":["30559"]},{"value":"975","group":["34100"]},{"value":"828","group":["30852"]}],"function":"count_star","groupByColumns":["DestCityMarketID"]}], [...]
diff --git a/pinot-api/src/test/resources/org/apache/pinot/client/exception.json b/pinot-api/src/test/resources/org/apache/pinot/client/exception.json
index 9b43ad1..0bfd8fd 100644
--- a/pinot-api/src/test/resources/org/apache/pinot/client/exception.json
+++ b/pinot-api/src/test/resources/org/apache/pinot/client/exception.json
@@ -1 +1 @@
-{"traceInfo":{},"numDocsScanned":0,"aggregationResults":[],"timeUsedMs":0,"segmentStatistics":[],"exceptions":["ProcessingException(errorCode:350, message:java.lang.NullPointerException\n\tat com.linkedin.pinot.core.plan.GlobalPlanImplV0.execute(GlobalPlanImplV0.java:66)\n\tat com.linkedin.pinot.core.query.executor.ServerQueryExecutorV1Impl$3.call(ServerQueryExecutorV1Impl.java:141)\n\tat com.linkedin.pinot.common.metrics.AbstractMetrics.timePhase(AbstractMetrics.java:106)\n\tat com.link [...]
\ No newline at end of file
+{"traceInfo":{},"numDocsScanned":0,"aggregationResults":[],"timeUsedMs":0,"segmentStatistics":[],"exceptions":["ProcessingException(errorCode:350, message:java.lang.NullPointerException\n\tat org.apache.pinot.core.plan.GlobalPlanImplV0.execute(GlobalPlanImplV0.java:66)\n\tat org.apache.pinot.core.query.executor.ServerQueryExecutorV1Impl$3.call(ServerQueryExecutorV1Impl.java:141)\n\tat org.apache.pinot.common.metrics.AbstractMetrics.timePhase(AbstractMetrics.java:106)\n\tat org.apache.pin [...]
diff --git a/pinot-api/src/test/resources/org/apache/pinot/client/selection.json b/pinot-api/src/test/resources/org/apache/pinot/client/selection.json
index 34b8b9f..223e093 100644
--- a/pinot-api/src/test/resources/org/apache/pinot/client/selection.json
+++ b/pinot-api/src/test/resources/org/apache/pinot/client/selection.json
@@ -1 +1 @@
-{"selectionResults":{"columns":["ActualElapsedTime","AirTime","AirlineID","ArrDel15","ArrDelay","ArrDelayMinutes","ArrTime","ArrTimeBlk","ArrivalDelayGroups","CRSArrTime","CRSDepTime","CRSElapsedTime","CancellationCode","Cancelled","Carrier","CarrierDelay","DayOfWeek","DayofMonth","DaysSinceEpoch","DepDel15","DepDelay","DepDelayMinutes","DepTime","DepTimeBlk","DepartureDelayGroups","Dest","DestAirportID","DestAirportSeqID","DestCityMarketID","DestCityName","DestState","DestStateFips","De [...]
\ No newline at end of file
+{"selectionResults":{"columns":["ActualElapsedTime","AirTime","AirlineID","ArrDel15","ArrDelay","ArrDelayMinutes","ArrTime","ArrTimeBlk","ArrivalDelayGroups","CRSArrTime","CRSDepTime","CRSElapsedTime","CancellationCode","Cancelled","Carrier","CarrierDelay","DayOfWeek","DayofMonth","DaysSinceEpoch","DepDel15","DepDelay","DepDelayMinutes","DepTime","DepTimeBlk","DepartureDelayGroups","Dest","DestAirportID","DestAirportSeqID","DestCityMarketID","DestCityName","DestState","DestStateFips","De [...]
diff --git a/pinot-azure-filesystem/pom.xml b/pinot-azure-filesystem/pom.xml
index 2080d4d..719c738 100644
--- a/pinot-azure-filesystem/pom.xml
+++ b/pinot-azure-filesystem/pom.xml
@@ -24,7 +24,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>pinot</artifactId>
-    <groupId>com.linkedin.pinot</groupId>
+    <groupId>org.apache.pinot</groupId>
     <version>0.016</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -46,15 +46,15 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.linkedin.pinot</groupId>
+      <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-filesystem</artifactId>
       <version>0.016</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.linkedin.pinot</groupId>
+      <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-common</artifactId>
     </dependency>
 </dependencies>
 
-</project>
\ No newline at end of file
+</project>
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 34c2e80..5780571 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.filesystem;
+package org.apache.pinot.filesystem;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.linkedin.pinot.common.utils.CommonConstants;
+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;
diff --git a/pinot-azure-filesystem/src/test/java/com/microsoft/azure/datalake/store/MockADLFileInputStream.java b/pinot-azure-filesystem/src/test/java/com/microsoft/azure/datalake/store/MockADLFileInputStream.java
index 53b5192..1a7351f 100644
--- a/pinot-azure-filesystem/src/test/java/com/microsoft/azure/datalake/store/MockADLFileInputStream.java
+++ b/pinot-azure-filesystem/src/test/java/com/microsoft/azure/datalake/store/MockADLFileInputStream.java
@@ -84,4 +84,4 @@ public final class MockADLFileInputStream extends ADLFileInputStream {
   public boolean markSupported() {
     return _in.markSupported();
   }
-}
\ No newline at end of file
+}
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 b4bcff3..00c8989 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.filesystem.test;
+package org.apache.pinot.filesystem.test;
 
-import com.linkedin.pinot.filesystem.AzurePinotFS;
+import org.apache.pinot.filesystem.AzurePinotFS;
 import com.microsoft.azure.datalake.store.ADLStoreClient;
 import com.microsoft.azure.datalake.store.MockADLFileInputStream;
 import java.io.ByteArrayInputStream;
diff --git a/pinot-broker/pom.xml b/pinot-broker/pom.xml
index 52905eb..1b7b71f 100644
--- a/pinot-broker/pom.xml
+++ b/pinot-broker/pom.xml
@@ -24,10 +24,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>pinot</artifactId>
-    <groupId>com.linkedin.pinot</groupId>
+    <groupId>org.apache.pinot</groupId>
     <version>0.016</version>
   </parent>
-  <groupId>com.linkedin.pinot</groupId>
+  <groupId>org.apache.pinot</groupId>
   <artifactId>pinot-broker</artifactId>
   <version>0.016</version>
   <name>pinot-broker</name>
@@ -82,24 +82,24 @@
       <artifactId>jersey-container-grizzly2-http</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.linkedin.pinot</groupId>
+      <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-transport</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.linkedin.pinot</groupId>
+      <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.linkedin.pinot</groupId>
+      <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.linkedin.pinot</groupId>
+      <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-controller</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.linkedin.pinot</groupId>
+      <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-server</artifactId>
       <scope>test</scope>
     </dependency>
@@ -136,14 +136,14 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.linkedin.pinot</groupId>
+      <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-common</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.linkedin.pinot</groupId>
+      <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-controller</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/api/AccessControl.java b/pinot-broker/src/main/java/org/apache/pinot/broker/api/AccessControl.java
index b315693..70d6d24 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/api/AccessControl.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/api/AccessControl.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.api;
+package org.apache.pinot.broker.api;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.BrokerRequest;
 
 
 public interface AccessControl {
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 a4c0556..97e0f99 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.api;
+package org.apache.pinot.broker.api;
 
-import com.linkedin.pinot.common.response.BrokerResponse;
+import org.apache.pinot.common.response.BrokerResponse;
 import java.util.concurrent.TimeUnit;
 
 
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/api/RequesterIdentity.java b/pinot-broker/src/main/java/org/apache/pinot/broker/api/RequesterIdentity.java
index e1fed0d..5c86811 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/api/RequesterIdentity.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/api/RequesterIdentity.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.api;
+package org.apache.pinot.broker.api;
 
 public abstract class RequesterIdentity {
 }
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 cfac240..154b6a1 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
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.api.resources;
+package org.apache.pinot.broker.api.resources;
 
-import com.linkedin.pinot.broker.routing.RoutingTable;
-import com.linkedin.pinot.broker.routing.TimeBoundaryService;
-import com.linkedin.pinot.common.config.TableNameBuilder;
-import com.linkedin.pinot.common.metrics.BrokerMeter;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
-import com.linkedin.pinot.common.utils.CommonConstants;
+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;
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 b2bdae8..a6fa66d 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.api.resources;
+package org.apache.pinot.broker.api.resources;
 
-import com.linkedin.pinot.broker.broker.BrokerServerBuilder;
-import com.linkedin.pinot.common.metrics.BrokerMeter;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
+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;
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 8573fbe..0a47b3e 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
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.api.resources;
+package org.apache.pinot.broker.api.resources;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.linkedin.pinot.broker.api.RequestStatistics;
-import com.linkedin.pinot.broker.requesthandler.BrokerRequestHandler;
-import com.linkedin.pinot.common.metrics.BrokerMeter;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
-import com.linkedin.pinot.common.response.BrokerResponse;
-import com.linkedin.pinot.common.utils.JsonUtils;
+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;
@@ -43,7 +43,7 @@ import javax.ws.rs.core.Response;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.linkedin.pinot.common.utils.CommonConstants.Broker.Request.*;
+import static org.apache.pinot.common.utils.CommonConstants.Broker.Request.*;
 
 
 @Api(tags = "Query")
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 7181549..a12b45a 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.broker;
+package org.apache.pinot.broker.broker;
 
-import com.linkedin.pinot.broker.api.AccessControl;
+import org.apache.pinot.broker.api.AccessControl;
 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/AllowAllAccessControlFactory.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/AllowAllAccessControlFactory.java
index c8ebf51..097a5f6 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.broker;
+package org.apache.pinot.broker.broker;
 
-import com.linkedin.pinot.broker.api.AccessControl;
-import com.linkedin.pinot.broker.api.RequesterIdentity;
-import com.linkedin.pinot.common.request.BrokerRequest;
+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;
 
 
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 f0e70af..075a9b0 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
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.broker;
+package org.apache.pinot.broker.broker;
 
 import com.google.common.base.Preconditions;
-import com.linkedin.pinot.broker.requesthandler.BrokerRequestHandler;
-import com.linkedin.pinot.broker.routing.RoutingTable;
-import com.linkedin.pinot.broker.routing.TimeBoundaryService;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
+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;
@@ -36,7 +36,7 @@ import org.glassfish.jersey.server.ResourceConfig;
 
 
 public class BrokerAdminApiApplication extends ResourceConfig {
-  private static final String RESOURCE_PACKAGE = "com.linkedin.pinot.broker.api.resources";
+  private static final String RESOURCE_PACKAGE = "org.apache.pinot.broker.api.resources";
 
   private URI _baseUri;
   private HttpServer _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 e1b85a8..e42cb8d 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
@@ -16,20 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.broker;
+package org.apache.pinot.broker.broker;
 
 import com.google.common.base.Preconditions;
-import com.linkedin.pinot.broker.broker.helix.LiveInstancesChangeListenerImpl;
-import com.linkedin.pinot.broker.queryquota.TableQueryQuotaManager;
-import com.linkedin.pinot.broker.requesthandler.BrokerRequestHandler;
-import com.linkedin.pinot.broker.requesthandler.ConnectionPoolBrokerRequestHandler;
-import com.linkedin.pinot.broker.requesthandler.SingleConnectionBrokerRequestHandler;
-import com.linkedin.pinot.broker.routing.RoutingTable;
-import com.linkedin.pinot.broker.routing.TimeBoundaryService;
-import com.linkedin.pinot.common.Utils;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
-import com.linkedin.pinot.common.metrics.MetricsHelper;
-import com.linkedin.pinot.common.utils.CommonConstants;
+import org.apache.pinot.broker.broker.helix.LiveInstancesChangeListenerImpl;
+import org.apache.pinot.broker.queryquota.TableQueryQuotaManager;
+import org.apache.pinot.broker.requesthandler.BrokerRequestHandler;
+import org.apache.pinot.broker.requesthandler.ConnectionPoolBrokerRequestHandler;
+import org.apache.pinot.broker.requesthandler.SingleConnectionBrokerRequestHandler;
+import org.apache.pinot.broker.routing.RoutingTable;
+import org.apache.pinot.broker.routing.TimeBoundaryService;
+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;
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 71e247e..baa8bdf 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
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.broker.helix;
+package org.apache.pinot.broker.broker.helix;
 
-import com.linkedin.pinot.broker.queryquota.TableQueryQuotaManager;
-import com.linkedin.pinot.broker.routing.HelixExternalViewBasedRouting;
-import com.linkedin.pinot.common.Utils;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.metadata.ZKMetadataProvider;
-import com.linkedin.pinot.common.utils.helix.HelixHelper;
+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;
@@ -42,7 +42,7 @@ import org.apache.helix.store.zk.ZkHelixPropertyStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.linkedin.pinot.common.utils.CommonConstants.Helix.*;
+import static org.apache.pinot.common.utils.CommonConstants.Helix.*;
 
 
 /**
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 9be0d0b..4aef39b 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.broker.helix;
+package org.apache.pinot.broker.broker.helix;
 
-import com.linkedin.pinot.broker.queryquota.TableQueryQuotaManager;
-import com.linkedin.pinot.broker.routing.HelixExternalViewBasedRouting;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
-import com.linkedin.pinot.common.metrics.BrokerTimer;
+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;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/DefaultHelixBrokerConfig.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/DefaultHelixBrokerConfig.java
index 911ed48..c264598 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/DefaultHelixBrokerConfig.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/DefaultHelixBrokerConfig.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.broker.helix;
+package org.apache.pinot.broker.broker.helix;
 
 import java.util.Iterator;
 import org.apache.commons.configuration.Configuration;
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 e3cc6c6..5387c79 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
@@ -16,20 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.broker.helix;
+package org.apache.pinot.broker.broker.helix;
 
 import com.google.common.collect.ImmutableList;
-import com.linkedin.pinot.broker.broker.AccessControlFactory;
-import com.linkedin.pinot.broker.broker.BrokerServerBuilder;
-import com.linkedin.pinot.broker.queryquota.TableQueryQuotaManager;
-import com.linkedin.pinot.broker.routing.HelixExternalViewBasedRouting;
-import com.linkedin.pinot.common.config.TagNameUtils;
-import com.linkedin.pinot.common.metadata.ZKMetadataProvider;
-import com.linkedin.pinot.common.metrics.BrokerMeter;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.NetUtil;
-import com.linkedin.pinot.common.utils.ServiceStatus;
-import com.linkedin.pinot.common.utils.StringUtil;
+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;
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 c05affb..45d1cc5 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.broker.helix;
+package org.apache.pinot.broker.broker.helix;
 
-import com.linkedin.pinot.common.response.ServerInstance;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.transport.netty.PooledNettyClientResourceManager;
-import com.linkedin.pinot.transport.pool.KeyedPool;
+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;
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 214bdf2..17318a5 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.broker.helix;
+package org.apache.pinot.broker.broker.helix;
 
-import com.linkedin.pinot.broker.routing.HelixExternalViewBasedRouting;
-import com.linkedin.pinot.common.messages.TimeboundaryRefreshMessage;
+import org.apache.pinot.broker.routing.HelixExternalViewBasedRouting;
+import org.apache.pinot.common.messages.TimeboundaryRefreshMessage;
 import com.sun.org.apache.xpath.internal.operations.Bool;
 import org.apache.helix.NotificationContext;
 import org.apache.helix.messaging.handling.HelixTaskResult;
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 d65ed66..debb8df 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
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.pruner;
-
-import com.linkedin.pinot.common.metadata.segment.ColumnPartitionMetadata;
-import com.linkedin.pinot.common.metadata.segment.SegmentPartitionMetadata;
-import com.linkedin.pinot.common.metadata.segment.SegmentZKMetadata;
-import com.linkedin.pinot.common.request.FilterOperator;
-import com.linkedin.pinot.common.utils.request.FilterQueryTree;
-import com.linkedin.pinot.core.data.partition.PartitionFunction;
-import com.linkedin.pinot.core.data.partition.PartitionFunctionFactory;
+package org.apache.pinot.broker.pruner;
+
+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.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;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/pruner/SegmentPrunerContext.java b/pinot-broker/src/main/java/org/apache/pinot/broker/pruner/SegmentPrunerContext.java
index e3c5732..d841308 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/pruner/SegmentPrunerContext.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/pruner/SegmentPrunerContext.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.pruner;
+package org.apache.pinot.broker.pruner;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.utils.request.FilterQueryTree;
-import com.linkedin.pinot.common.utils.request.RequestUtils;
+import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.utils.request.FilterQueryTree;
+import org.apache.pinot.common.utils.request.RequestUtils;
 
 
 /**
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/pruner/SegmentZKMetadataPruner.java b/pinot-broker/src/main/java/org/apache/pinot/broker/pruner/SegmentZKMetadataPruner.java
index 748d4cc..04a4e18 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/pruner/SegmentZKMetadataPruner.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/pruner/SegmentZKMetadataPruner.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.pruner;
+package org.apache.pinot.broker.pruner;
 
-import com.linkedin.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
 
 
 /**
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/pruner/SegmentZKMetadataPrunerProvider.java b/pinot-broker/src/main/java/org/apache/pinot/broker/pruner/SegmentZKMetadataPrunerProvider.java
index 25b4a47..bbaa2d2 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/pruner/SegmentZKMetadataPrunerProvider.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/pruner/SegmentZKMetadataPrunerProvider.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.pruner;
+package org.apache.pinot.broker.pruner;
 
 import java.util.HashMap;
 import java.util.Map;
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 6be47b4..37d4164 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.pruner;
+package org.apache.pinot.broker.pruner;
 
-import com.linkedin.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nonnull;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/queryquota/HitCounter.java b/pinot-broker/src/main/java/org/apache/pinot/broker/queryquota/HitCounter.java
index 54fdf57..ae45398 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/queryquota/HitCounter.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/queryquota/HitCounter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.queryquota;
+package org.apache.pinot.broker.queryquota;
 
 import com.google.common.annotations.VisibleForTesting;
 import java.util.concurrent.atomic.AtomicIntegerArray;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/queryquota/QueryQuotaConfig.java b/pinot-broker/src/main/java/org/apache/pinot/broker/queryquota/QueryQuotaConfig.java
index 6ead5e8..0ba54f3 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/queryquota/QueryQuotaConfig.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/queryquota/QueryQuotaConfig.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.queryquota;
+package org.apache.pinot.broker.queryquota;
 
 import com.google.common.util.concurrent.RateLimiter;
 import javax.annotation.Nonnull;
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 8877dbe..377c00a 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
@@ -16,19 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.queryquota;
+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 com.linkedin.pinot.common.config.QuotaConfig;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.config.TableNameBuilder;
-import com.linkedin.pinot.common.metadata.ZKMetadataProvider;
-import com.linkedin.pinot.common.metrics.BrokerGauge;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.helix.HelixHelper;
+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.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;
@@ -39,7 +39,7 @@ import org.apache.helix.store.zk.ZkHelixPropertyStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.linkedin.pinot.common.utils.CommonConstants.Helix.*;
+import static org.apache.pinot.common.utils.CommonConstants.Helix.*;
 
 
 public class TableQueryQuotaManager {
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 989cfbb..1b0cc43 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
@@ -16,31 +16,31 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.requesthandler;
+package org.apache.pinot.broker.requesthandler;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.base.Splitter;
-import com.linkedin.pinot.broker.api.RequestStatistics;
-import com.linkedin.pinot.broker.api.RequesterIdentity;
-import com.linkedin.pinot.broker.broker.AccessControlFactory;
-import com.linkedin.pinot.broker.queryquota.TableQueryQuotaManager;
-import com.linkedin.pinot.broker.routing.RoutingTable;
-import com.linkedin.pinot.broker.routing.RoutingTableLookupRequest;
-import com.linkedin.pinot.broker.routing.TimeBoundaryService;
-import com.linkedin.pinot.common.config.TableNameBuilder;
-import com.linkedin.pinot.common.exception.QueryException;
-import com.linkedin.pinot.common.metrics.BrokerMeter;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
-import com.linkedin.pinot.common.metrics.BrokerQueryPhase;
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.request.FilterOperator;
-import com.linkedin.pinot.common.request.FilterQuery;
-import com.linkedin.pinot.common.request.FilterQueryMap;
-import com.linkedin.pinot.common.response.BrokerResponse;
-import com.linkedin.pinot.common.response.broker.BrokerResponseNative;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.core.query.reduce.BrokerReduceService;
-import com.linkedin.pinot.pql.parsers.Pql2Compiler;
+import org.apache.pinot.broker.api.RequestStatistics;
+import org.apache.pinot.broker.api.RequesterIdentity;
+import org.apache.pinot.broker.broker.AccessControlFactory;
+import org.apache.pinot.broker.queryquota.TableQueryQuotaManager;
+import org.apache.pinot.broker.routing.RoutingTable;
+import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
+import org.apache.pinot.broker.routing.TimeBoundaryService;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.exception.QueryException;
+import org.apache.pinot.common.metrics.BrokerMeter;
+import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.common.metrics.BrokerQueryPhase;
+import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.FilterOperator;
+import org.apache.pinot.common.request.FilterQuery;
+import org.apache.pinot.common.request.FilterQueryMap;
+import org.apache.pinot.common.response.BrokerResponse;
+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;
@@ -55,8 +55,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.linkedin.pinot.common.utils.CommonConstants.Broker.*;
-import static com.linkedin.pinot.common.utils.CommonConstants.Broker.Request.*;
+import static org.apache.pinot.common.utils.CommonConstants.Broker.*;
+import static org.apache.pinot.common.utils.CommonConstants.Broker.Request.*;
 
 
 @ThreadSafe
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 e01d6a1..304bae3 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.requesthandler;
+package org.apache.pinot.broker.requesthandler;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.linkedin.pinot.broker.api.RequestStatistics;
-import com.linkedin.pinot.broker.api.RequesterIdentity;
-import com.linkedin.pinot.common.response.BrokerResponse;
+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;
 
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 47acffc..bec3cc6 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.requesthandler;
+package org.apache.pinot.broker.requesthandler;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.request.FilterQuery;
-import com.linkedin.pinot.common.utils.request.FilterQueryTree;
-import com.linkedin.pinot.common.utils.request.RequestUtils;
+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;
 
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 fc87f6d..3a19ed4 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
@@ -16,40 +16,40 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.requesthandler;
-
-import com.linkedin.pinot.broker.api.RequestStatistics;
-import com.linkedin.pinot.broker.broker.AccessControlFactory;
-import com.linkedin.pinot.broker.broker.helix.LiveInstancesChangeListenerImpl;
-import com.linkedin.pinot.broker.queryquota.TableQueryQuotaManager;
-import com.linkedin.pinot.broker.routing.RoutingTable;
-import com.linkedin.pinot.broker.routing.TimeBoundaryService;
-import com.linkedin.pinot.common.config.TableNameBuilder;
-import com.linkedin.pinot.common.exception.QueryException;
-import com.linkedin.pinot.common.metrics.BrokerMeter;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
-import com.linkedin.pinot.common.metrics.BrokerQueryPhase;
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.request.InstanceRequest;
-import com.linkedin.pinot.common.response.BrokerResponse;
-import com.linkedin.pinot.common.response.ProcessingException;
-import com.linkedin.pinot.common.response.ServerInstance;
-import com.linkedin.pinot.common.response.broker.BrokerResponseNative;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.DataTable;
-import com.linkedin.pinot.core.common.datatable.DataTableFactory;
-import com.linkedin.pinot.serde.SerDe;
-import com.linkedin.pinot.transport.common.CompositeFuture;
-import com.linkedin.pinot.transport.conf.TransportClientConf;
-import com.linkedin.pinot.transport.config.ConnectionPoolConfig;
-import com.linkedin.pinot.transport.metrics.NettyClientMetrics;
-import com.linkedin.pinot.transport.netty.PooledNettyClientResourceManager;
-import com.linkedin.pinot.transport.pool.KeyedPool;
-import com.linkedin.pinot.transport.pool.KeyedPoolImpl;
-import com.linkedin.pinot.transport.scattergather.ScatterGather;
-import com.linkedin.pinot.transport.scattergather.ScatterGatherImpl;
-import com.linkedin.pinot.transport.scattergather.ScatterGatherRequest;
-import com.linkedin.pinot.transport.scattergather.ScatterGatherStats;
+package org.apache.pinot.broker.requesthandler;
+
+import org.apache.pinot.broker.api.RequestStatistics;
+import org.apache.pinot.broker.broker.AccessControlFactory;
+import org.apache.pinot.broker.broker.helix.LiveInstancesChangeListenerImpl;
+import org.apache.pinot.broker.queryquota.TableQueryQuotaManager;
+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.exception.QueryException;
+import org.apache.pinot.common.metrics.BrokerMeter;
+import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.common.metrics.BrokerQueryPhase;
+import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.InstanceRequest;
+import org.apache.pinot.common.response.BrokerResponse;
+import org.apache.pinot.common.response.ProcessingException;
+import org.apache.pinot.common.response.ServerInstance;
+import org.apache.pinot.common.response.broker.BrokerResponseNative;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.DataTable;
+import org.apache.pinot.core.common.datatable.DataTableFactory;
+import org.apache.pinot.serde.SerDe;
+import org.apache.pinot.transport.common.CompositeFuture;
+import org.apache.pinot.transport.conf.TransportClientConf;
+import org.apache.pinot.transport.config.ConnectionPoolConfig;
+import org.apache.pinot.transport.metrics.NettyClientMetrics;
+import org.apache.pinot.transport.netty.PooledNettyClientResourceManager;
+import org.apache.pinot.transport.pool.KeyedPool;
+import org.apache.pinot.transport.pool.KeyedPoolImpl;
+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;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/FilterQueryOptimizerRequest.java b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/FilterQueryOptimizerRequest.java
index 3d9660d..17ba2e2 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/FilterQueryOptimizerRequest.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/FilterQueryOptimizerRequest.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.requesthandler;
+package org.apache.pinot.broker.requesthandler;
 
-import com.linkedin.pinot.common.utils.request.FilterQueryTree;
+import org.apache.pinot.common.utils.request.FilterQueryTree;
 
 
 public class FilterQueryOptimizerRequest {
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/FilterQueryTreeOptimizer.java b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/FilterQueryTreeOptimizer.java
index 74030fe..4254a5a 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/FilterQueryTreeOptimizer.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/FilterQueryTreeOptimizer.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.requesthandler;
+package org.apache.pinot.broker.requesthandler;
 
-import com.linkedin.pinot.common.utils.request.FilterQueryTree;
+import org.apache.pinot.common.utils.request.FilterQueryTree;
 
 
 /**
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 0efdcfa..d11c041 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.requesthandler;
+package org.apache.pinot.broker.requesthandler;
 
-import com.linkedin.pinot.common.request.FilterOperator;
-import com.linkedin.pinot.common.utils.request.FilterQueryTree;
+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;
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 099d1ec..d692db5 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.requesthandler;
+package org.apache.pinot.broker.requesthandler;
 
 import com.google.common.base.Splitter;
-import com.linkedin.pinot.common.request.FilterOperator;
-import com.linkedin.pinot.common.utils.StringUtil;
-import com.linkedin.pinot.common.utils.request.FilterQueryTree;
+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;
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 db75f8a..3b2f0e5 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.requesthandler;
+package org.apache.pinot.broker.requesthandler;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
-import com.linkedin.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.BrokerRequest;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
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 0afc56b..5be0fac 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.requesthandler;
+package org.apache.pinot.broker.requesthandler;
 
-import com.linkedin.pinot.common.request.FilterOperator;
-import com.linkedin.pinot.common.utils.request.FilterQueryTree;
-import com.linkedin.pinot.core.common.predicate.RangePredicate;
+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;
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 f7002cf..fa5f07f 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
@@ -16,27 +16,27 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.requesthandler;
+package org.apache.pinot.broker.requesthandler;
 
-import com.linkedin.pinot.broker.api.RequestStatistics;
-import com.linkedin.pinot.broker.broker.AccessControlFactory;
-import com.linkedin.pinot.broker.queryquota.TableQueryQuotaManager;
-import com.linkedin.pinot.broker.routing.RoutingTable;
-import com.linkedin.pinot.broker.routing.TimeBoundaryService;
-import com.linkedin.pinot.common.config.TableNameBuilder;
-import com.linkedin.pinot.common.metrics.BrokerMeter;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
-import com.linkedin.pinot.common.metrics.BrokerQueryPhase;
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.response.BrokerResponse;
-import com.linkedin.pinot.common.response.ServerInstance;
-import com.linkedin.pinot.common.response.broker.BrokerResponseNative;
-import com.linkedin.pinot.common.utils.CommonConstants.Helix.TableType;
-import com.linkedin.pinot.common.utils.DataTable;
-import com.linkedin.pinot.core.transport.AsyncQueryResponse;
-import com.linkedin.pinot.core.transport.QueryRouter;
-import com.linkedin.pinot.core.transport.Server;
-import com.linkedin.pinot.core.transport.ServerResponse;
+import org.apache.pinot.broker.api.RequestStatistics;
+import org.apache.pinot.broker.broker.AccessControlFactory;
+import org.apache.pinot.broker.queryquota.TableQueryQuotaManager;
+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.metrics.BrokerQueryPhase;
+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.response.broker.BrokerResponseNative;
+import org.apache.pinot.common.utils.CommonConstants.Helix.TableType;
+import org.apache.pinot.common.utils.DataTable;
+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;
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 8aa1147..b25b40d 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing;
+package org.apache.pinot.broker.routing;
 
-import com.linkedin.pinot.transport.config.PerTableRoutingConfig;
-import com.linkedin.pinot.transport.config.RoutingTableConfig;
+import org.apache.pinot.transport.config.PerTableRoutingConfig;
+import org.apache.pinot.transport.config.RoutingTableConfig;
 import java.util.List;
 import java.util.Map;
 import org.slf4j.Logger;
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 91ec52b..92603ab 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
@@ -16,24 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing;
+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 com.linkedin.pinot.broker.routing.builder.RoutingTableBuilder;
-import com.linkedin.pinot.broker.routing.selector.SegmentSelector;
-import com.linkedin.pinot.broker.routing.selector.SegmentSelectorProvider;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.config.TableNameBuilder;
-import com.linkedin.pinot.common.metrics.BrokerMeter;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
-import com.linkedin.pinot.common.metrics.BrokerTimer;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.EqualityUtils;
-import com.linkedin.pinot.common.utils.JsonUtils;
-import com.linkedin.pinot.common.utils.NetUtil;
-import com.linkedin.pinot.common.utils.helix.HelixHelper;
+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;
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 997247d..89b3b1f 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
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing;
-
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.config.TableNameBuilder;
-import com.linkedin.pinot.common.metadata.ZKMetadataProvider;
-import com.linkedin.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
-import com.linkedin.pinot.common.utils.CommonConstants.Helix.TableType;
-import com.linkedin.pinot.common.utils.time.TimeUtils;
+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;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/RoutingTable.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/RoutingTable.java
index d62d542..bcb752b 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/RoutingTable.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/RoutingTable.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing;
+package org.apache.pinot.broker.routing;
 
 import java.util.List;
 import java.util.Map;
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 7ef2f78..0ba4c86 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
@@ -16,22 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing;
+package org.apache.pinot.broker.routing;
 
-import com.linkedin.pinot.broker.routing.builder.BalancedRandomRoutingTableBuilder;
-import com.linkedin.pinot.broker.routing.builder.DefaultOfflineRoutingTableBuilder;
-import com.linkedin.pinot.broker.routing.builder.DefaultRealtimeRoutingTableBuilder;
-import com.linkedin.pinot.broker.routing.builder.HighLevelConsumerBasedRoutingTableBuilder;
-import com.linkedin.pinot.broker.routing.builder.LowLevelConsumerRoutingTableBuilder;
-import com.linkedin.pinot.broker.routing.builder.PartitionAwareOfflineRoutingTableBuilder;
-import com.linkedin.pinot.broker.routing.builder.PartitionAwareRealtimeRoutingTableBuilder;
-import com.linkedin.pinot.broker.routing.builder.RoutingTableBuilder;
-import com.linkedin.pinot.common.config.SegmentsValidationAndRetentionConfig;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.CommonConstants.Helix.TableType;
-import com.linkedin.pinot.core.realtime.stream.StreamConfig;
+import org.apache.pinot.broker.routing.builder.BalancedRandomRoutingTableBuilder;
+import org.apache.pinot.broker.routing.builder.DefaultOfflineRoutingTableBuilder;
+import org.apache.pinot.broker.routing.builder.DefaultRealtimeRoutingTableBuilder;
+import org.apache.pinot.broker.routing.builder.HighLevelConsumerBasedRoutingTableBuilder;
+import org.apache.pinot.broker.routing.builder.LowLevelConsumerRoutingTableBuilder;
+import org.apache.pinot.broker.routing.builder.PartitionAwareOfflineRoutingTableBuilder;
+import org.apache.pinot.broker.routing.builder.PartitionAwareRealtimeRoutingTableBuilder;
+import org.apache.pinot.broker.routing.builder.RoutingTableBuilder;
+import org.apache.pinot.common.config.SegmentsValidationAndRetentionConfig;
+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.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;
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 7028a89..31f0617 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing;
+package org.apache.pinot.broker.routing;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Splitter;
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.request.QuerySource;
+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;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/TimeBoundaryService.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/TimeBoundaryService.java
index aa9dfe5..347ab0f 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/TimeBoundaryService.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/TimeBoundaryService.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing;
+package org.apache.pinot.broker.routing;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.linkedin.pinot.common.utils.JsonUtils;
+import org.apache.pinot.common.utils.JsonUtils;
 
 
 public interface TimeBoundaryService {
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 01f1259..a2c29d6 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
+package org.apache.pinot.broker.routing.builder;
 
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
+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;
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 dc88c1e..8fb9e7c 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
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
-
-import com.linkedin.pinot.broker.pruner.SegmentPrunerContext;
-import com.linkedin.pinot.broker.pruner.SegmentZKMetadataPrunerService;
-import com.linkedin.pinot.broker.routing.RoutingTableLookupRequest;
-import com.linkedin.pinot.broker.routing.selector.SegmentSelector;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.metadata.segment.SegmentZKMetadata;
-import com.linkedin.pinot.common.metrics.BrokerMeter;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
+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;
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 0783abe..7122845 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
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
-
-import com.linkedin.pinot.broker.routing.RoutingTableLookupRequest;
-import com.linkedin.pinot.broker.routing.selector.SegmentSelector;
-import com.linkedin.pinot.common.config.RoutingConfig;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.metrics.BrokerMeter;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
-import com.linkedin.pinot.common.utils.CommonConstants;
+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;
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 c1eda37..e991bd6 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
+package org.apache.pinot.broker.routing.builder;
 
-import com.linkedin.pinot.broker.routing.RoutingTableLookupRequest;
-import com.linkedin.pinot.broker.routing.selector.SegmentSelector;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
+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;
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 061d016..e383cc6 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
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
+package org.apache.pinot.broker.routing.builder;
 
-import com.linkedin.pinot.broker.routing.RoutingTableLookupRequest;
-import com.linkedin.pinot.broker.routing.selector.SegmentSelector;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
-import com.linkedin.pinot.common.utils.SegmentName;
+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;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/GeneratorBasedRoutingTableBuilder.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/GeneratorBasedRoutingTableBuilder.java
index be29b8b..23e1773 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/GeneratorBasedRoutingTableBuilder.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/builder/GeneratorBasedRoutingTableBuilder.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
+package org.apache.pinot.broker.routing.builder;
 
 import java.util.ArrayList;
 import java.util.Comparator;
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 40dd9df..933ed31 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
+package org.apache.pinot.broker.routing.builder;
 
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.HLCSegmentName;
-import com.linkedin.pinot.common.utils.SegmentName;
+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;
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 d0f1b45..c039460 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
+package org.apache.pinot.broker.routing.builder;
 
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
+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;
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 baf8fc1..6df3b34 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
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
+package org.apache.pinot.broker.routing.builder;
 
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.LLCUtils;
-import com.linkedin.pinot.common.utils.SegmentName;
+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;
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 d34161a..61622c7 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
+package org.apache.pinot.broker.routing.builder;
 
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.SegmentName;
+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;
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 c7c37bc..cc2a0a9 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
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
-
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.metadata.ZKMetadataProvider;
-import com.linkedin.pinot.common.metadata.segment.ColumnPartitionMetadata;
-import com.linkedin.pinot.common.metadata.segment.SegmentPartitionMetadata;
-import com.linkedin.pinot.common.metadata.segment.SegmentZKMetadata;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
-import com.linkedin.pinot.common.partition.ReplicaGroupPartitionAssignment;
-import com.linkedin.pinot.common.partition.ReplicaGroupPartitionAssignmentGenerator;
-import com.linkedin.pinot.common.utils.CommonConstants;
+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;
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 8d4ca27..dd44512 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
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
-
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.metadata.ZKMetadataProvider;
-import com.linkedin.pinot.common.metadata.segment.SegmentZKMetadata;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.LLCSegmentName;
-import com.linkedin.pinot.common.utils.LLCUtils;
-import com.linkedin.pinot.common.utils.SegmentName;
+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;
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 9457d3d..1402b93 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
+package org.apache.pinot.broker.routing.builder;
 
-import com.linkedin.pinot.broker.routing.RoutingTableLookupRequest;
-import com.linkedin.pinot.broker.routing.selector.SegmentSelector;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
+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;
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 fe423ba..6d88359 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
+package org.apache.pinot.broker.routing.builder;
 
-import com.linkedin.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.CommonConstants;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
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 622fea7..90f46cc 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
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.selector;
+package org.apache.pinot.broker.routing.selector;
 
-import com.linkedin.pinot.broker.routing.RoutingTableLookupRequest;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.lineage.SegmentGroup;
-import com.linkedin.pinot.common.lineage.SegmentMergeLineage;
-import com.linkedin.pinot.common.lineage.SegmentMergeLineageAccessHelper;
+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;
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 a2c801a..9e1f271 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.selector;
+package org.apache.pinot.broker.routing.selector;
 
-import com.linkedin.pinot.broker.routing.RoutingTableLookupRequest;
-import com.linkedin.pinot.common.config.TableConfig;
+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;
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 2156783..f24fc03 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.selector;
+package org.apache.pinot.broker.routing.selector;
 
-import com.linkedin.pinot.common.config.TableConfig;
+import org.apache.pinot.common.config.TableConfig;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.store.zk.ZkHelixPropertyStore;
 
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 dbef75f..fe4e5c5 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.broker;
+package org.apache.pinot.broker.broker;
 
 import org.apache.commons.configuration.Configuration;
 
-import com.linkedin.pinot.broker.broker.helix.DefaultHelixBrokerConfig;
-import com.linkedin.pinot.broker.broker.helix.HelixBrokerStarter;
+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/EmptyBrokerOnlineOfflineStateModelFactory.java b/pinot-broker/src/test/java/org/apache/pinot/broker/broker/EmptyBrokerOnlineOfflineStateModelFactory.java
index a473fba..64b2244 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/broker/EmptyBrokerOnlineOfflineStateModelFactory.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/broker/EmptyBrokerOnlineOfflineStateModelFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.broker;
+package org.apache.pinot.broker.broker;
 
 import org.apache.helix.NotificationContext;
 import org.apache.helix.model.Message;
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/broker/EmptySegmentOnlineOfflineStateModelFactory.java b/pinot-broker/src/test/java/org/apache/pinot/broker/broker/EmptySegmentOnlineOfflineStateModelFactory.java
index 0eca71e..f093c74 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/broker/EmptySegmentOnlineOfflineStateModelFactory.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/broker/EmptySegmentOnlineOfflineStateModelFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.broker;
+package org.apache.pinot.broker.broker;
 
 import org.apache.helix.NotificationContext;
 import org.apache.helix.model.Message;
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 4545c61..162d12f 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
@@ -16,26 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.broker;
+package org.apache.pinot.broker.broker;
 
 import com.google.common.util.concurrent.Uninterruptibles;
-import com.linkedin.pinot.broker.broker.helix.DefaultHelixBrokerConfig;
-import com.linkedin.pinot.broker.broker.helix.HelixBrokerStarter;
-import com.linkedin.pinot.broker.routing.HelixExternalViewBasedRouting;
-import com.linkedin.pinot.broker.routing.TimeBoundaryService;
-import com.linkedin.pinot.broker.routing.builder.RoutingTableBuilder;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.config.TableNameBuilder;
-import com.linkedin.pinot.common.data.Schema;
-import com.linkedin.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
-import com.linkedin.pinot.common.metrics.ControllerMetrics;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.ZkStarter;
-import com.linkedin.pinot.controller.ControllerConf;
-import com.linkedin.pinot.controller.helix.ControllerRequestBuilderUtil;
-import com.linkedin.pinot.controller.helix.core.PinotHelixResourceManager;
-import com.linkedin.pinot.controller.helix.core.realtime.PinotLLCRealtimeSegmentManager;
-import com.linkedin.pinot.controller.utils.SegmentMetadataMockUtils;
+import org.apache.pinot.broker.broker.helix.DefaultHelixBrokerConfig;
+import org.apache.pinot.broker.broker.helix.HelixBrokerStarter;
+import org.apache.pinot.broker.routing.HelixExternalViewBasedRouting;
+import org.apache.pinot.broker.routing.TimeBoundaryService;
+import org.apache.pinot.broker.routing.builder.RoutingTableBuilder;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.data.Schema;
+import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
+import org.apache.pinot.common.metrics.ControllerMetrics;
+import org.apache.pinot.common.utils.CommonConstants;
+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.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;
@@ -120,7 +120,7 @@ public class HelixBrokerStarterTest {
     streamConfigs.put("stream.kafka.consumer.type", "highLevel");
     streamConfigs.put("stream.kafka.topic.name", "kafkaTopic");
     streamConfigs.put("stream.kafka.decoder.class.name",
-            "com.linkedin.pinot.core.realtime.impl.kafka.KafkaAvroMessageDecoder");
+            "org.apache.pinot.core.realtime.impl.kafka.KafkaAvroMessageDecoder");
     streamConfigs.put("stream.kafka.hlc.zk.connect.string", "localhost:1111/zkConnect");
     streamConfigs.put("stream.kafka.decoder.prop.schema.registry.rest.url", "http://localhost:2222/schemaRegistry");
     TableConfig realtimeTimeConfig = new TableConfig.Builder(CommonConstants.Helix.TableType.REALTIME)
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 325e8ee..1fffc1f 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.broker;
+package org.apache.pinot.broker.broker;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import com.linkedin.pinot.broker.broker.helix.HelixBrokerStarter;
+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 83c904c..b87b77f 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
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.pruner;
+package org.apache.pinot.broker.pruner;
 
-import com.linkedin.pinot.common.metadata.segment.ColumnPartitionMetadata;
-import com.linkedin.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
-import com.linkedin.pinot.common.metadata.segment.SegmentPartitionMetadata;
-import com.linkedin.pinot.common.metadata.segment.SegmentZKMetadata;
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.pql.parsers.Pql2Compiler;
+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;
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 d7d353a..619d812 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.queryquota;
+package org.apache.pinot.broker.queryquota;
 
 import com.google.common.util.concurrent.Uninterruptibles;
 import java.util.ArrayList;
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 42102e9..ee6737a 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
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.queryquota;
-
-import com.linkedin.pinot.common.config.QuotaConfig;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.config.TableNameBuilder;
-import com.linkedin.pinot.common.metadata.ZKMetadataProvider;
-import com.linkedin.pinot.common.utils.StringUtil;
-import com.linkedin.pinot.common.utils.ZkStarter;
+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;
@@ -40,7 +40,7 @@ import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import static com.linkedin.pinot.common.utils.CommonConstants.Helix.*;
+import static org.apache.pinot.common.utils.CommonConstants.Helix.*;
 
 
 public class TableQueryQuotaManagerTest {
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/FilterOptimizerTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/FilterOptimizerTest.java
index 85d1b9d..3cabb78 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/FilterOptimizerTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/FilterOptimizerTest.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.requesthandler;
+package org.apache.pinot.broker.requesthandler;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.request.FilterOperator;
-import com.linkedin.pinot.common.utils.request.FilterQueryTree;
-import com.linkedin.pinot.common.utils.request.RequestUtils;
-import com.linkedin.pinot.pql.parsers.Pql2Compiler;
+import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.FilterOperator;
+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.Test;
 
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/MultipleOrEqualitiesToInClauseFilterQueryTreeOptimizerTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/MultipleOrEqualitiesToInClauseFilterQueryTreeOptimizerTest.java
index ad8df61..2a1145b 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/MultipleOrEqualitiesToInClauseFilterQueryTreeOptimizerTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/MultipleOrEqualitiesToInClauseFilterQueryTreeOptimizerTest.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.requesthandler;
+package org.apache.pinot.broker.requesthandler;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.utils.StringUtil;
-import com.linkedin.pinot.common.utils.request.RequestUtils;
-import com.linkedin.pinot.pql.parsers.Pql2Compiler;
+import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.utils.StringUtil;
+import org.apache.pinot.common.utils.request.RequestUtils;
+import org.apache.pinot.pql.parsers.Pql2Compiler;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
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 c27a266..52745c3 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.requesthandler;
+package org.apache.pinot.broker.requesthandler;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.BrokerRequest;
 import java.util.Collections;
 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 b8e4078..a3ce665 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.requesthandler;
+package org.apache.pinot.broker.requesthandler;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.utils.request.FilterQueryTree;
-import com.linkedin.pinot.common.utils.request.RequestUtils;
-import com.linkedin.pinot.pql.parsers.Pql2Compiler;
+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;
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 411feed..7d845cd 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing;
+package org.apache.pinot.broker.routing;
 
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.config.TableConfig.Builder;
-import com.linkedin.pinot.common.config.TableNameBuilder;
-import com.linkedin.pinot.common.utils.CommonConstants.Helix.TableType;
+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;
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 a1410ad..c04b6c8 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
@@ -16,20 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing;
+package org.apache.pinot.broker.routing;
 
-import com.linkedin.pinot.broker.routing.builder.HighLevelConsumerBasedRoutingTableBuilder;
-import com.linkedin.pinot.broker.routing.builder.RoutingTableBuilder;
-import com.linkedin.pinot.broker.util.FakePropertyStore;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.config.TableConfig.Builder;
-import com.linkedin.pinot.common.config.TableNameBuilder;
-import com.linkedin.pinot.common.metadata.ZKMetadataProvider;
-import com.linkedin.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
-import com.linkedin.pinot.common.utils.CommonConstants.Helix.TableType;
-import com.linkedin.pinot.common.utils.HLCSegmentName;
-import com.linkedin.pinot.common.utils.LLCSegmentName;
+import org.apache.pinot.broker.routing.builder.HighLevelConsumerBasedRoutingTableBuilder;
+import org.apache.pinot.broker.routing.builder.RoutingTableBuilder;
+import org.apache.pinot.broker.util.FakePropertyStore;
+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.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
+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;
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 922ec74..3a4542b 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
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing;
+package org.apache.pinot.broker.routing;
 
-import com.linkedin.pinot.broker.routing.TimeBoundaryService.TimeBoundaryInfo;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.metadata.ZKMetadataProvider;
-import com.linkedin.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.CommonConstants.Segment.SegmentType;
-import com.linkedin.pinot.common.utils.StringUtil;
-import com.linkedin.pinot.common.utils.ZkStarter;
+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;
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 a41f375..740e876 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
+package org.apache.pinot.broker.routing.builder;
 
-import com.linkedin.pinot.broker.routing.RoutingTableLookupRequest;
-import com.linkedin.pinot.common.config.TableConfig;
+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;
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 51d0f1e..e161479 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
+package org.apache.pinot.broker.routing.builder;
 
-import com.linkedin.pinot.broker.routing.RoutingTableLookupRequest;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.HLCSegmentName;
+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;
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 ab9d6a0..3bc81d1 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
+package org.apache.pinot.broker.routing.builder;
 
-import com.linkedin.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.CommonConstants;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
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 8242ecb..6a161fc 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
+package org.apache.pinot.broker.routing.builder;
 
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.LLCSegmentName;
-import com.linkedin.pinot.common.utils.SegmentName;
+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;
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 20ee440..018f3d5 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
@@ -16,22 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
-
-import com.linkedin.pinot.broker.util.FakePropertyStore;
-import com.linkedin.pinot.broker.routing.RoutingTableLookupRequest;
-import com.linkedin.pinot.common.config.ReplicaGroupStrategyConfig;
-import com.linkedin.pinot.common.config.RoutingConfig;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.metadata.ZKMetadataProvider;
-import com.linkedin.pinot.common.metadata.segment.ColumnPartitionMetadata;
-import com.linkedin.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
-import com.linkedin.pinot.common.metadata.segment.SegmentPartitionMetadata;
-import com.linkedin.pinot.common.metadata.segment.SegmentZKMetadata;
-import com.linkedin.pinot.common.partition.ReplicaGroupPartitionAssignment;
-import com.linkedin.pinot.common.partition.ReplicaGroupPartitionAssignmentGenerator;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.pql.parsers.Pql2Compiler;
+package org.apache.pinot.broker.routing.builder;
+
+import org.apache.pinot.broker.util.FakePropertyStore;
+import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
+import org.apache.pinot.common.config.ReplicaGroupStrategyConfig;
+import org.apache.pinot.common.config.RoutingConfig;
+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.OfflineSegmentZKMetadata;
+import org.apache.pinot.common.metadata.segment.SegmentPartitionMetadata;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+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;
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 3b91b28..b02ed86 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
@@ -16,22 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
-
-import com.linkedin.pinot.broker.util.FakePropertyStore;
-import com.linkedin.pinot.broker.routing.RoutingTableLookupRequest;
-import com.linkedin.pinot.common.config.ColumnPartitionConfig;
-import com.linkedin.pinot.common.config.RoutingConfig;
-import com.linkedin.pinot.common.config.SegmentPartitionConfig;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.metadata.ZKMetadataProvider;
-import com.linkedin.pinot.common.metadata.segment.ColumnPartitionMetadata;
-import com.linkedin.pinot.common.metadata.segment.LLCRealtimeSegmentZKMetadata;
-import com.linkedin.pinot.common.metadata.segment.SegmentPartitionMetadata;
-import com.linkedin.pinot.common.metadata.segment.SegmentZKMetadata;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.LLCSegmentName;
-import com.linkedin.pinot.pql.parsers.Pql2Compiler;
+package org.apache.pinot.broker.routing.builder;
+
+import org.apache.pinot.broker.util.FakePropertyStore;
+import org.apache.pinot.broker.routing.RoutingTableLookupRequest;
+import org.apache.pinot.common.config.ColumnPartitionConfig;
+import org.apache.pinot.common.config.RoutingConfig;
+import org.apache.pinot.common.config.SegmentPartitionConfig;
+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.LLCRealtimeSegmentZKMetadata;
+import org.apache.pinot.common.metadata.segment.SegmentPartitionMetadata;
+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;
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 9fc6ea9..e27da1b 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.builder;
+package org.apache.pinot.broker.routing.builder;
 
-import com.linkedin.pinot.common.config.RoutingConfig;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.config.TableNameBuilder;
-import com.linkedin.pinot.common.utils.CommonConstants;
+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 202eb74..7b8440a 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
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.routing.selector;
+package org.apache.pinot.broker.routing.selector;
 
-import com.linkedin.pinot.broker.util.FakePropertyStore;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.lineage.SegmentMergeLineage;
-import com.linkedin.pinot.common.lineage.SegmentMergeLineageAccessHelper;
-import com.linkedin.pinot.common.utils.CommonConstants;
+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;
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/util/FakePropertyStore.java b/pinot-broker/src/test/java/org/apache/pinot/broker/util/FakePropertyStore.java
index 41e4893..9d68307 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/util/FakePropertyStore.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/util/FakePropertyStore.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.broker.util;
+package org.apache.pinot.broker.util;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/pinot-broker/src/test/resources/SampleExternalView.json b/pinot-broker/src/test/resources/SampleExternalView.json
index 36e26cb..44eea3b 100644
--- a/pinot-broker/src/test/resources/SampleExternalView.json
+++ b/pinot-broker/src/test/resources/SampleExternalView.json
@@ -1327,4 +1327,4 @@
       ,"Server_server11208.abc.com_8001":"ONLINE"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/pinot-broker/src/test/resources/log4j.properties b/pinot-broker/src/test/resources/log4j.properties
index 0453d9d..9f399d0 100644
--- a/pinot-broker/src/test/resources/log4j.properties
+++ b/pinot-broker/src/test/resources/log4j.properties
@@ -15,7 +15,7 @@
 #
 
 log4j.rootLogger=WARN, stdout
-log4j.logger.com.linkedin.pinot=WARN
+log4j.logger.org.apache.pinot=WARN
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.Target=System.out
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
diff --git a/pinot-common/pom.xml b/pinot-common/pom.xml
index 21d64e5..4817adc 100644
--- a/pinot-common/pom.xml
+++ b/pinot-common/pom.xml
@@ -25,7 +25,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>pinot</artifactId>
-    <groupId>com.linkedin.pinot</groupId>
+    <groupId>org.apache.pinot</groupId>
     <version>0.016</version>
   </parent>
   <artifactId>pinot-common</artifactId>
@@ -303,7 +303,7 @@
       <artifactId>zookeeper</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.linkedin.pinot</groupId>
+      <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-filesystem</artifactId>
     </dependency>
     <dependency>
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/Utils.java b/pinot-common/src/main/java/org/apache/pinot/common/Utils.java
index f1052df..a126185 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/Utils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/Utils.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common;
+package org.apache.pinot.common;
 
 import java.io.IOException;
 import java.net.JarURLConnection;
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 b26c240..6886271 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
-import com.linkedin.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.CommonConstants;
 import io.vavr.collection.List;
 import io.vavr.collection.Map;
 import java.util.Collection;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/ChildKeyHandler.java b/pinot-common/src/main/java/org/apache/pinot/common/config/ChildKeyHandler.java
index 3eb854f..3e012fd 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/ChildKeyHandler.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/ChildKeyHandler.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import io.vavr.collection.Map;
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/ChildKeyTransformer.java b/pinot-common/src/main/java/org/apache/pinot/common/config/ChildKeyTransformer.java
index 6ac3140..d9c000d 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/ChildKeyTransformer.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/ChildKeyTransformer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import io.vavr.collection.Map;
 
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 c62d4a6..4b13c57 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+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 com.linkedin.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.EqualityUtils;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nonnull;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/ColumnPartitionMapChildKeyHandler.java b/pinot-common/src/main/java/org/apache/pinot/common/config/ColumnPartitionMapChildKeyHandler.java
index 4f85029..76574b1 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/ColumnPartitionMapChildKeyHandler.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/ColumnPartitionMapChildKeyHandler.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 /**
  * Child key handler for the column partition map.
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 756d0cd..2431f5f 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
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
-import com.linkedin.pinot.common.data.Schema;
-import com.linkedin.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.data.Schema;
+import org.apache.pinot.common.utils.EqualityUtils;
 
-import static com.linkedin.pinot.common.utils.EqualityUtils.hashCodeOf;
-import static com.linkedin.pinot.common.utils.EqualityUtils.isEqual;
-import static com.linkedin.pinot.common.utils.EqualityUtils.isNullOrNotSameClass;
+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;
 
 
 /**
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 616e27d..a82143a 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
-import com.linkedin.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.EqualityUtils;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import com.typesafe.config.ConfigIncludeContext;
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 5325ffb..ddd94f9 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
-import com.linkedin.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.EqualityUtils;
 import io.vavr.Tuple;
 import io.vavr.Tuple2;
 import io.vavr.collection.List;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/ConfigDoc.java b/pinot-common/src/main/java/org/apache/pinot/common/config/ConfigDoc.java
index 2583699..12b69ef 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/ConfigDoc.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/ConfigDoc.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/ConfigKey.java b/pinot-common/src/main/java/org/apache/pinot/common/config/ConfigKey.java
index 1a1194f..5b0ad12 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/ConfigKey.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/ConfigKey.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/ConfigNodeLifecycleAware.java b/pinot-common/src/main/java/org/apache/pinot/common/config/ConfigNodeLifecycleAware.java
index d4ce459..cbfaf6e 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/ConfigNodeLifecycleAware.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/ConfigNodeLifecycleAware.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 /**
  * Interface for configuration nodes that require pre or post configuration.
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 f06b7f3..2ac8d72 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
-import com.linkedin.pinot.common.Utils;
+import org.apache.pinot.common.Utils;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import com.typesafe.config.ConfigIncludeContext;
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 089852a..2257778 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
-import com.linkedin.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.EqualityUtils;
 import java.util.concurrent.TimeUnit;
 
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/DurationDsl.java b/pinot-common/src/main/java/org/apache/pinot/common/config/DurationDsl.java
index c9c54c2..f5e26eb 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/DurationDsl.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/DurationDsl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
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 4c9b7be..a81cf8b 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.linkedin.pinot.common.data.StarTreeIndexSpec;
-import com.linkedin.pinot.common.utils.EqualityUtils;
+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;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/NamedListChildKeyHandler.java b/pinot-common/src/main/java/org/apache/pinot/common/config/NamedListChildKeyHandler.java
index 9084b13..0f78dd6 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/NamedListChildKeyHandler.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/NamedListChildKeyHandler.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import io.vavr.Tuple;
 import io.vavr.collection.List;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/NestedConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/config/NestedConfig.java
index 656a775..42fadcb 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/NestedConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/NestedConfig.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/OfflineTagConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/config/OfflineTagConfig.java
index 4575066..ec089f5 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/OfflineTagConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/OfflineTagConfig.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 /**
  * Wrapper class over TableConfig for an offline table
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 091dcfc..410ba03 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
-import com.linkedin.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.EqualityUtils;
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.Nonnull;
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 7dded32..d3136b6 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.linkedin.pinot.common.utils.DataSize;
-import com.linkedin.pinot.common.utils.EqualityUtils;
+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.slf4j.Logger;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/RealtimeTagConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/config/RealtimeTagConfig.java
index 17a4a67..f5cd5b1 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/RealtimeTagConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/RealtimeTagConfig.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 /**
  * Wrapper class over TableConfig for a realtime table
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/RemapTableTypesChildKeyTransformer.java b/pinot-common/src/main/java/org/apache/pinot/common/config/RemapTableTypesChildKeyTransformer.java
index f09f732..add64a9 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/RemapTableTypesChildKeyTransformer.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/RemapTableTypesChildKeyTransformer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import io.vavr.Tuple;
 import io.vavr.collection.HashMap;
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 3f6b717..01c419a 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.linkedin.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.EqualityUtils;
 import javax.annotation.Nullable;
 
 /**
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 663fff5..1530b3b 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.linkedin.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.EqualityUtils;
 import java.util.HashMap;
 import java.util.Map;
 
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 f9788bc..adad360 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
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 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 com.linkedin.pinot.common.utils.EqualityUtils;
-import com.linkedin.pinot.common.utils.JsonUtils;
+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;
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 ebb563d..820b8dc 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.linkedin.pinot.common.utils.EqualityUtils;
-import com.linkedin.pinot.startree.hll.HllConfig;
+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/Serializer.java b/pinot-common/src/main/java/org/apache/pinot/common/config/Serializer.java
index fc04190..a95dd08 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/Serializer.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/Serializer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/SimpleMapChildKeyHandler.java b/pinot-common/src/main/java/org/apache/pinot/common/config/SimpleMapChildKeyHandler.java
index ed38f4d..a0f031b 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/SimpleMapChildKeyHandler.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/SimpleMapChildKeyHandler.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import io.vavr.collection.Map;
 import java.util.HashMap;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/SingleKeyDsl.java b/pinot-common/src/main/java/org/apache/pinot/common/config/SingleKeyDsl.java
index aa8674f..29bb3fb 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/SingleKeyDsl.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/SingleKeyDsl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 /**
  * Interface for config DSLs, which transform strings into configuration objects that can be used by multiple fields.
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/StarTreeIndexConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/config/StarTreeIndexConfig.java
index 3ab06ae..34cf57e 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/StarTreeIndexConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/StarTreeIndexConfig.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import java.util.List;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/StreamConsumptionConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/config/StreamConsumptionConfig.java
index 180bc6b..e9f5e1b 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/StreamConsumptionConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/StreamConsumptionConfig.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
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 8ff2b1d..b7a6ac6 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
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 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 com.linkedin.pinot.common.data.StarTreeIndexSpec;
-import com.linkedin.pinot.common.utils.CommonConstants.Helix.TableType;
-import com.linkedin.pinot.common.utils.EqualityUtils;
-import com.linkedin.pinot.common.utils.JsonUtils;
-import com.linkedin.pinot.startree.hll.HllConfig;
+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;
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 5526015..5bdd7e4 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.linkedin.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.EqualityUtils;
 import java.lang.reflect.Field;
 import java.util.Map;
 import org.slf4j.Logger;
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 3f1bfd8..4b57bfe 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import com.google.common.base.Preconditions;
-import com.linkedin.pinot.common.utils.CommonConstants.Helix.TableType;
-import com.linkedin.pinot.common.utils.SegmentName;
+import org.apache.pinot.common.utils.CommonConstants.Helix.TableType;
+import org.apache.pinot.common.utils.SegmentName;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
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 45a559f..d68c848 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.linkedin.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.EqualityUtils;
 import java.util.Map;
 
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/TagConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/config/TagConfig.java
index e02cabf..3dba931 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/TagConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/TagConfig.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 /**
  * Abstract base class for tag configs
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/TagNameUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/config/TagNameUtils.java
index fc82050..9dd1cb9 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/TagNameUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/TagNameUtils.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
-import com.linkedin.pinot.common.utils.ServerType;
-import com.linkedin.pinot.common.utils.TenantRole;
+import org.apache.pinot.common.utils.ServerType;
+import org.apache.pinot.common.utils.TenantRole;
 
 
 public class TagNameUtils {
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/TagOverrideConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/config/TagOverrideConfig.java
index fa2532e..0137a3a 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/TagOverrideConfig.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/TagOverrideConfig.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.linkedin.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.EqualityUtils;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/TaskConfigMapChildKeyHandler.java b/pinot-common/src/main/java/org/apache/pinot/common/config/TaskConfigMapChildKeyHandler.java
index b4ac8f5..a3a8bbe 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/TaskConfigMapChildKeyHandler.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/TaskConfigMapChildKeyHandler.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import io.vavr.Tuple;
 import io.vavr.collection.HashMap;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/Tenant.java b/pinot-common/src/main/java/org/apache/pinot/common/config/Tenant.java
index fd30116..95134de 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/Tenant.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/Tenant.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.linkedin.pinot.common.utils.EqualityUtils;
-import com.linkedin.pinot.common.utils.TenantRole;
+import org.apache.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.TenantRole;
 
 
 @JsonIgnoreProperties(ignoreUnknown = true)
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 3918001..bb9d7fb 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.linkedin.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.EqualityUtils;
 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/TypedMapChildKeyHandler.java b/pinot-common/src/main/java/org/apache/pinot/common/config/TypedMapChildKeyHandler.java
index 7b0ce30..3f94369 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/TypedMapChildKeyHandler.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/TypedMapChildKeyHandler.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import io.vavr.Tuple;
 import io.vavr.collection.Map;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/UseChildKeyHandler.java b/pinot-common/src/main/java/org/apache/pinot/common/config/UseChildKeyHandler.java
index 152830a..bea5385 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/UseChildKeyHandler.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/UseChildKeyHandler.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/UseChildKeyTransformers.java b/pinot-common/src/main/java/org/apache/pinot/common/config/UseChildKeyTransformers.java
index af44f14..945e46c 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/UseChildKeyTransformers.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/UseChildKeyTransformers.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/UseDsl.java b/pinot-common/src/main/java/org/apache/pinot/common/config/UseDsl.java
index f680162..b0e04eb 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/UseDsl.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/UseDsl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
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 4772a20..dbb4f66 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
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+package org.apache.pinot.common.data;
 
 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 com.linkedin.pinot.common.config.ConfigKey;
-import com.linkedin.pinot.common.utils.EqualityUtils;
+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/DateTimeFieldSpecChildKeyHandler.java b/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeFieldSpecChildKeyHandler.java
index 34722cc..25e9ec5 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeFieldSpecChildKeyHandler.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/data/DateTimeFieldSpecChildKeyHandler.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+package org.apache.pinot.common.data;
 
-import com.linkedin.pinot.common.config.NamedListChildKeyHandler;
+import org.apache.pinot.common.config.NamedListChildKeyHandler;
 
 
 /**
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 ec9e029..8060891 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+package org.apache.pinot.common.data;
 
-import com.linkedin.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.EqualityUtils;
 import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -26,7 +26,7 @@ import org.joda.time.DateTimeZone;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 
-import static com.linkedin.pinot.common.data.DateTimeFieldSpec.*;
+import static org.apache.pinot.common.data.DateTimeFieldSpec.*;
 
 
 public class DateTimeFormatPatternSpec {
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 4e2aa9c..3b0cfb5 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
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+package org.apache.pinot.common.data;
 
-import com.linkedin.pinot.common.utils.EqualityUtils;
+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 com.linkedin.pinot.common.data.DateTimeFieldSpec.TimeFormat;
+import org.apache.pinot.common.data.DateTimeFieldSpec.TimeFormat;
 import org.apache.commons.lang.StringUtils;
 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 93d58df..81097e2 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+package org.apache.pinot.common.data;
 
-import com.linkedin.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.EqualityUtils;
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.lang3.EnumUtils;
 import org.joda.time.DurationFieldType;
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 773f956..302375c 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+package org.apache.pinot.common.data;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
-import com.linkedin.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.EqualityUtils;
 import org.apache.commons.lang3.EnumUtils;
 
 import java.util.concurrent.TimeUnit;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/data/DimensionFieldSpec.java b/pinot-common/src/main/java/org/apache/pinot/common/data/DimensionFieldSpec.java
index db9937b..388c1ec 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/data/DimensionFieldSpec.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/data/DimensionFieldSpec.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+package org.apache.pinot.common.data;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/data/DimensionFieldSpecChildKeyHandler.java b/pinot-common/src/main/java/org/apache/pinot/common/data/DimensionFieldSpecChildKeyHandler.java
index 188e020..6a83299 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/data/DimensionFieldSpecChildKeyHandler.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/data/DimensionFieldSpecChildKeyHandler.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+package org.apache.pinot.common.data;
 
-import com.linkedin.pinot.common.config.NamedListChildKeyHandler;
+import org.apache.pinot.common.config.NamedListChildKeyHandler;
 
 
 /**
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 8fb1a15..95c0746 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
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+package org.apache.pinot.common.data;
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.linkedin.pinot.common.Utils;
-import com.linkedin.pinot.common.config.ConfigKey;
-import com.linkedin.pinot.common.config.ConfigNodeLifecycleAware;
-import com.linkedin.pinot.common.utils.EqualityUtils;
-import com.linkedin.pinot.common.utils.JsonUtils;
+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;
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 852ae01..1d25f34 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
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+package org.apache.pinot.common.data;
 
 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 com.linkedin.pinot.common.config.ConfigKey;
-import com.linkedin.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.config.ConfigKey;
+import org.apache.pinot.common.utils.EqualityUtils;
 import javax.annotation.Nonnull;
 
 
@@ -132,7 +132,7 @@ public final class MetricFieldSpec extends FieldSpec {
    * <p>It is currently used for derived field recognition in star tree <code>MetricBuffer</code>, may have other use
    * cases later.
    * <p>Generally, a customized type value should be converted to a standard
-   * {@link com.linkedin.pinot.common.data.FieldSpec.DataType} for storage, and converted back when needed.
+   * {@link org.apache.pinot.common.data.FieldSpec.DataType} for storage, and converted back when needed.
    */
   public enum DerivedMetricType {
     // HLL derived metric type.
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/data/MetricFieldSpecChildKeyHandler.java b/pinot-common/src/main/java/org/apache/pinot/common/data/MetricFieldSpecChildKeyHandler.java
index 9b0ebb3..ca80dd4 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/data/MetricFieldSpecChildKeyHandler.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/data/MetricFieldSpecChildKeyHandler.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+package org.apache.pinot.common.data;
 
-import com.linkedin.pinot.common.config.NamedListChildKeyHandler;
+import org.apache.pinot.common.config.NamedListChildKeyHandler;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/data/RowEvent.java b/pinot-common/src/main/java/org/apache/pinot/common/data/RowEvent.java
index a9a0d7e..c033c36 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/data/RowEvent.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/data/RowEvent.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+package org.apache.pinot.common.data;
 
 import java.util.Map;
 
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 ec38211..b1df4c9 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+package org.apache.pinot.common.data;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -24,12 +24,12 @@ 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 com.linkedin.pinot.common.config.ConfigKey;
-import com.linkedin.pinot.common.config.UseChildKeyHandler;
-import com.linkedin.pinot.common.data.FieldSpec.DataType;
-import com.linkedin.pinot.common.data.FieldSpec.FieldType;
-import com.linkedin.pinot.common.utils.EqualityUtils;
-import com.linkedin.pinot.common.utils.JsonUtils;
+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;
@@ -49,9 +49,9 @@ import org.slf4j.LoggerFactory;
 /**
  * The <code>Schema</code> class is defined for each table to describe the details of the table's fields (columns).
  * <p>Four field types are supported: DIMENSION, METRIC, TIME, DATE_TIME.
- * ({@link com.linkedin.pinot.common.data.DimensionFieldSpec}, {@link com.linkedin.pinot.common.data.MetricFieldSpec},
- * {@link com.linkedin.pinot.common.data.TimeFieldSpec}, {@link com.linkedin.pinot.common.data.DateTimeFieldSpec})
- * <p>For each field, a {@link com.linkedin.pinot.common.data.FieldSpec} is defined to provide the details of the field.
+ * ({@link org.apache.pinot.common.data.DimensionFieldSpec}, {@link org.apache.pinot.common.data.MetricFieldSpec},
+ * {@link org.apache.pinot.common.data.TimeFieldSpec}, {@link org.apache.pinot.common.data.DateTimeFieldSpec})
+ * <p>For each field, a {@link org.apache.pinot.common.data.FieldSpec} is defined to provide the details of the field.
  * <p>There could be multiple DIMENSION or METRIC or DATE_TIME fields, but at most 1 TIME field.
  * <p>In pinot, we store data using 5 <code>DataType</code>s: INT, LONG, FLOAT, DOUBLE, STRING. All other
  * <code>DataType</code>s will be converted to one of them.
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/data/Segment.java b/pinot-common/src/main/java/org/apache/pinot/common/data/Segment.java
index 5b5985e..5931535 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/data/Segment.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/data/Segment.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+package org.apache.pinot.common.data;
 
 import javax.annotation.Nonnull;
 
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 92cfd3b..0a65230 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
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+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 com.linkedin.pinot.common.config.ConfigKey;
-import com.linkedin.pinot.common.segment.StarTreeMetadata;
-import com.linkedin.pinot.common.utils.EqualityUtils;
-import com.linkedin.pinot.common.utils.JsonUtils;
+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;
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 823247d..a7e2f90 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
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+package org.apache.pinot.common.data;
 
 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 com.linkedin.pinot.common.config.ConfigKey;
-import com.linkedin.pinot.common.utils.EqualityUtils;
-import com.linkedin.pinot.common.utils.JsonUtils;
+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;
 
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 32791de..08b76fa 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
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+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 com.linkedin.pinot.common.config.ConfigKey;
-import com.linkedin.pinot.common.data.FieldSpec.DataType;
-import com.linkedin.pinot.common.utils.EqualityUtils;
-import com.linkedin.pinot.common.utils.JsonUtils;
+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;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/exception/HttpErrorStatusException.java b/pinot-common/src/main/java/org/apache/pinot/common/exception/HttpErrorStatusException.java
index 4e05371..ac5071d 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/exception/HttpErrorStatusException.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/exception/HttpErrorStatusException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.exception;
+package org.apache.pinot.common.exception;
 
 public class HttpErrorStatusException extends Exception {
   private final int _statusCode;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/exception/InvalidConfigException.java b/pinot-common/src/main/java/org/apache/pinot/common/exception/InvalidConfigException.java
index 7744df1..70d068f 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/exception/InvalidConfigException.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/exception/InvalidConfigException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.exception;
+package org.apache.pinot.common.exception;
 
 public class InvalidConfigException extends Exception {
 
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 4de49b9..26e27ce 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.exception;
+package org.apache.pinot.common.exception;
 
-import com.linkedin.pinot.common.response.ProcessingException;
+import org.apache.pinot.common.response.ProcessingException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/exception/TableNotFoundException.java b/pinot-common/src/main/java/org/apache/pinot/common/exception/TableNotFoundException.java
index 0786a15..9091324 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/exception/TableNotFoundException.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/exception/TableNotFoundException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.exception;
+package org.apache.pinot.common.exception;
 
 public class TableNotFoundException extends Exception {
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/http/MultiGetRequest.java b/pinot-common/src/main/java/org/apache/pinot/common/http/MultiGetRequest.java
index 76366d0..6bd69d9 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/http/MultiGetRequest.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/http/MultiGetRequest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.http;
+package org.apache.pinot.common.http;
 
 import java.util.List;
 import java.util.concurrent.CompletionService;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentGroup.java b/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentGroup.java
index 1ca4057..ce6beda 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentGroup.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentGroup.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.lineage;
+package org.apache.pinot.common.lineage;
 
 import java.util.List;
 import java.util.Set;
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 ee83370..2c46aef 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.lineage;
+package org.apache.pinot.common.lineage;
 
-import com.linkedin.pinot.common.exception.InvalidConfigException;
-import com.linkedin.pinot.common.utils.EqualityUtils;
+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;
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 07420ca..86002f7 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.lineage;
+package org.apache.pinot.common.lineage;
 
-import com.linkedin.pinot.common.metadata.ZKMetadataProvider;
-import com.linkedin.pinot.common.utils.retry.RetryPolicies;
-import com.linkedin.pinot.common.utils.retry.RetryPolicy;
+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;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/messages/SegmentRefreshMessage.java b/pinot-common/src/main/java/org/apache/pinot/common/messages/SegmentRefreshMessage.java
index 2532163..62041af 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/messages/SegmentRefreshMessage.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/messages/SegmentRefreshMessage.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.messages;
+package org.apache.pinot.common.messages;
 
 import java.util.UUID;
 import org.apache.helix.model.Message;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/messages/SegmentReloadMessage.java b/pinot-common/src/main/java/org/apache/pinot/common/messages/SegmentReloadMessage.java
index f87ccb1..8ba3334 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/messages/SegmentReloadMessage.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/messages/SegmentReloadMessage.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.messages;
+package org.apache.pinot.common.messages;
 
 import com.google.common.base.Preconditions;
 import java.util.UUID;
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 594c549..5b90846 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.messages;
+package org.apache.pinot.common.messages;
 
 import com.google.common.base.Preconditions;
 import org.apache.helix.model.Message;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metadata/ZKMetadata.java b/pinot-common/src/main/java/org/apache/pinot/common/metadata/ZKMetadata.java
index 22b3d52..a620ff0 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metadata/ZKMetadata.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metadata/ZKMetadata.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metadata;
+package org.apache.pinot.common.metadata;
 
 import org.apache.helix.ZNRecord;
 
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 711a7d4..aa403a0 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
@@ -16,19 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metadata;
-
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.config.TableNameBuilder;
-import com.linkedin.pinot.common.data.Schema;
-import com.linkedin.pinot.common.metadata.instance.InstanceZKMetadata;
-import com.linkedin.pinot.common.metadata.segment.LLCRealtimeSegmentZKMetadata;
-import com.linkedin.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
-import com.linkedin.pinot.common.metadata.segment.RealtimeSegmentZKMetadata;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.SchemaUtils;
-import com.linkedin.pinot.common.utils.SegmentName;
-import com.linkedin.pinot.common.utils.StringUtil;
+package org.apache.pinot.common.metadata;
+
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.data.Schema;
+import org.apache.pinot.common.metadata.instance.InstanceZKMetadata;
+import org.apache.pinot.common.metadata.segment.LLCRealtimeSegmentZKMetadata;
+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.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;
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 f9adbbf..116972f 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
@@ -16,19 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metadata.instance;
+package org.apache.pinot.common.metadata.instance;
 
-import com.linkedin.pinot.common.config.TableNameBuilder;
-import com.linkedin.pinot.common.metadata.ZKMetadata;
-import com.linkedin.pinot.common.utils.StringUtil;
+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 static com.linkedin.pinot.common.utils.EqualityUtils.hashCodeOf;
-import static com.linkedin.pinot.common.utils.EqualityUtils.isEqual;
-import static com.linkedin.pinot.common.utils.EqualityUtils.isNullOrNotSameClass;
-import static com.linkedin.pinot.common.utils.EqualityUtils.isSameReference;
+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;
 
 
 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 12cfc14..95b3c83 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metadata.segment;
+package org.apache.pinot.common.metadata.segment;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -28,8 +28,8 @@ 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 com.linkedin.pinot.common.config.ColumnPartitionConfig;
-import com.linkedin.pinot.common.utils.EqualityUtils;
+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;
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 797ef25..66a6abc 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
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metadata.segment;
+package org.apache.pinot.common.metadata.segment;
 
 import java.util.Map;
 import org.apache.helix.ZNRecord;
-import static com.linkedin.pinot.common.utils.EqualityUtils.hashCodeOf;
-import static com.linkedin.pinot.common.utils.EqualityUtils.isEqual;
-import static com.linkedin.pinot.common.utils.EqualityUtils.isNullOrNotSameClass;
-import static com.linkedin.pinot.common.utils.EqualityUtils.isSameReference;
+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;
 
 
 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 34c6804..45dac2c 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
@@ -16,18 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metadata.segment;
+package org.apache.pinot.common.metadata.segment;
 
 import java.util.Map;
 
 import org.apache.helix.ZNRecord;
 
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.CommonConstants.Segment.SegmentType;
-import static com.linkedin.pinot.common.utils.EqualityUtils.isEqual;
-import static com.linkedin.pinot.common.utils.EqualityUtils.hashCodeOf;
-import static com.linkedin.pinot.common.utils.EqualityUtils.isSameReference;
-import static com.linkedin.pinot.common.utils.EqualityUtils.isNullOrNotSameClass;
+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;
 
 
 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 a644d26..b1850a1 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
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metadata.segment;
+package org.apache.pinot.common.metadata.segment;
 
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.CommonConstants.Segment.Realtime.Status;
-import com.linkedin.pinot.common.utils.CommonConstants.Segment.SegmentType;
+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 com.linkedin.pinot.common.utils.EqualityUtils.*;
+import static org.apache.pinot.common.utils.EqualityUtils.*;
 
 
 public class RealtimeSegmentZKMetadata extends SegmentZKMetadata {
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 4fe59a6..06766e7 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metadata.segment;
+package org.apache.pinot.common.metadata.segment;
 
 /**
  * Copyright (C) 2014-2018 LinkedIn Corp. (pinot-core@linkedin.com)
@@ -38,7 +38,7 @@ 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 com.linkedin.pinot.common.utils.JsonUtils;
+import org.apache.pinot.common.utils.JsonUtils;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
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 8de8070..d19480a 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
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metadata.segment;
+package org.apache.pinot.common.metadata.segment;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.linkedin.pinot.common.metadata.ZKMetadata;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.CommonConstants.Segment.SegmentType;
-import com.linkedin.pinot.common.utils.JsonUtils;
+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;
@@ -34,7 +34,7 @@ import org.joda.time.Interval;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.linkedin.pinot.common.utils.EqualityUtils.*;
+import static org.apache.pinot.common.utils.EqualityUtils.*;
 
 
 public abstract class SegmentZKMetadata implements ZKMetadata {
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 a8714e4..f6a3917 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metadata.segment;
+package org.apache.pinot.common.metadata.segment;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.linkedin.pinot.common.utils.JsonUtils;
+import org.apache.pinot.common.utils.JsonUtils;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Iterator;
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 86f5eec..268be18 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.linkedin.pinot.common.Utils;
-import com.linkedin.pinot.common.request.BrokerRequest;
+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;
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 4afc93a..f127d00 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
 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 926c839..b39b7be 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
 import java.util.ArrayList;
 import java.util.Collection;
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 f0dd89e..2618ab9 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
 import java.util.Collection;
 import java.util.List;
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 670e824..d93e437 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/AggregatedMetricsRegistry.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/AggregatedMetricsRegistry.java
index 7f77b56..6b8a74c 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/AggregatedMetricsRegistry.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/AggregatedMetricsRegistry.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
 import com.yammer.metrics.core.Clock;
 import com.yammer.metrics.core.Gauge;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerGauge.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerGauge.java
index 501d5da..257741d 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerGauge.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerGauge.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
-import com.linkedin.pinot.common.Utils;
+import org.apache.pinot.common.Utils;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMeter.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMeter.java
index dfcc538..55c05a5 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMeter.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMeter.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
-import com.linkedin.pinot.common.Utils;
+import org.apache.pinot.common.Utils;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMetrics.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMetrics.java
index 667ddd4..eaa73d6 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMetrics.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMetrics.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
 import com.yammer.metrics.core.MetricsRegistry;
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerQueryPhase.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerQueryPhase.java
index d2ace35..075d252 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerQueryPhase.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerQueryPhase.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
-import com.linkedin.pinot.common.Utils;
+import org.apache.pinot.common.Utils;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerTimer.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerTimer.java
index f041f46..932b019 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerTimer.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerTimer.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
-import com.linkedin.pinot.common.Utils;
+import org.apache.pinot.common.Utils;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerGauge.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerGauge.java
index 891a161..38ba4df 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerGauge.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerGauge.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
-import com.linkedin.pinot.common.Utils;
+import org.apache.pinot.common.Utils;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerMeter.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerMeter.java
index 070bf78..647948d 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerMeter.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerMeter.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
-import com.linkedin.pinot.common.Utils;
+import org.apache.pinot.common.Utils;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerMetrics.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerMetrics.java
index 3d54ed1..734f82e 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerMetrics.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerMetrics.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
 import com.yammer.metrics.core.MetricsRegistry;
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerTimer.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerTimer.java
index 4a87f5c..b0421ba 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerTimer.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerTimer.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
-import com.linkedin.pinot.common.Utils;
+import org.apache.pinot.common.Utils;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/JmxReporterMetricsRegistryRegistrationListener.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/JmxReporterMetricsRegistryRegistrationListener.java
index afdf4c0..1c2cf15 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/JmxReporterMetricsRegistryRegistrationListener.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/JmxReporterMetricsRegistryRegistrationListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
 import com.yammer.metrics.core.MetricsRegistry;
 import com.yammer.metrics.reporting.JmxReporter;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/LatencyMetric.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/LatencyMetric.java
index 75190ff..0e70f3d 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/LatencyMetric.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/LatencyMetric.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
 import com.yammer.metrics.core.Sampling;
 import com.yammer.metrics.core.Summarizable;
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 56071ad..fbb0fbf 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
 import com.yammer.metrics.core.Timer;
 import java.lang.reflect.Constructor;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/MetricsRegistryRegistrationListener.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/MetricsRegistryRegistrationListener.java
index 877fc77..53d2193 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/MetricsRegistryRegistrationListener.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/MetricsRegistryRegistrationListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
 import com.yammer.metrics.core.MetricsRegistry;
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerGauge.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerGauge.java
index 732918e..d57c02c 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerGauge.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerGauge.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
-import com.linkedin.pinot.common.Utils;
+import org.apache.pinot.common.Utils;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerMeter.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerMeter.java
index 1dfc9c2..e4a6ffa 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerMeter.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerMeter.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
-import com.linkedin.pinot.common.Utils;
+import org.apache.pinot.common.Utils;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerMetrics.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerMetrics.java
index 61938d1..56d91c2 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerMetrics.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerMetrics.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
 import com.yammer.metrics.core.MetricsRegistry;
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerQueryPhase.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerQueryPhase.java
index e07bd3f..a1748a8 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerQueryPhase.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerQueryPhase.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
-import com.linkedin.pinot.common.Utils;
+import org.apache.pinot.common.Utils;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerTimer.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerTimer.java
index 360f58e..29dc348 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerTimer.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerTimer.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
-import com.linkedin.pinot.common.Utils;
+import org.apache.pinot.common.Utils;
 
 
 /**
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 c9b7c4b..b1da713 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
 import java.util.HashMap;
 import java.util.HashSet;
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 75b940a..ffb9290 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.partition;
+package org.apache.pinot.common.partition;
 
-import com.linkedin.pinot.common.utils.EqualityUtils;
+import org.apache.pinot.common.utils.EqualityUtils;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/partition/ReplicaGroupPartitionAssignment.java b/pinot-common/src/main/java/org/apache/pinot/common/partition/ReplicaGroupPartitionAssignment.java
index fd8ec94..5e69d54 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/partition/ReplicaGroupPartitionAssignment.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/partition/ReplicaGroupPartitionAssignment.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.partition;
+package org.apache.pinot.common.partition;
 
 import java.util.ArrayList;
 import java.util.HashSet;
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 708b5a3..df42b42 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.partition;
+package org.apache.pinot.common.partition;
 
 import com.google.common.base.Preconditions;
-import com.linkedin.pinot.common.config.ReplicaGroupStrategyConfig;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.metadata.ZKMetadataProvider;
+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;
@@ -124,4 +124,4 @@ public class ReplicaGroupPartitionAssignmentGenerator {
     }
     return partitionAssignment;
   }
-}
\ No newline at end of file
+}
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 f3ef9a7..9198e0e 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
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.partition;
+package org.apache.pinot.common.partition;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
-import com.linkedin.pinot.common.config.RealtimeTagConfig;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.exception.InvalidConfigException;
-import com.linkedin.pinot.common.utils.EqualityUtils;
-import com.linkedin.pinot.common.utils.LLCSegmentName;
-import com.linkedin.pinot.common.utils.helix.HelixHelper;
+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;
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 350f7fc..805281a 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.protocols;
+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 com.linkedin.pinot.common.utils.JsonUtils;
+import org.apache.pinot.common.utils.JsonUtils;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
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 deb09f8..c5af786 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
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.query;
+package org.apache.pinot.common.query;
 
-import com.linkedin.pinot.common.metrics.BrokerMetrics;
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.response.BrokerResponse;
-import com.linkedin.pinot.common.response.ServerInstance;
-import com.linkedin.pinot.common.utils.DataTable;
+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;
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 78d2482..59f1460 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.query;
+package org.apache.pinot.common.query;
 
-import com.linkedin.pinot.common.response.BrokerResponse;
-import com.linkedin.pinot.common.response.BrokerResponseFactory;
+import org.apache.pinot.common.response.BrokerResponse;
+import org.apache.pinot.common.response.BrokerResponseFactory;
 import java.util.HashMap;
 import java.util.Map;
 
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 31170fd..2fb0ecc 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
@@ -22,7 +22,7 @@
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
-package com.linkedin.pinot.common.request;
+package org.apache.pinot.common.request;
 
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
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 1dddae8..0c8d058 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
@@ -22,7 +22,7 @@
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
-package com.linkedin.pinot.common.request;
+package org.apache.pinot.common.request;
 
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
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 79032bb..8926036 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
@@ -22,7 +22,7 @@
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
-package com.linkedin.pinot.common.request;
+package org.apache.pinot.common.request;
 
 
 import java.util.Map;
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 c06abf1..26a4bc2 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
@@ -22,7 +22,7 @@
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
-package com.linkedin.pinot.common.request;
+package org.apache.pinot.common.request;
 
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
@@ -770,7 +770,7 @@ public class FilterQuery implements org.apache.thrift.TBase<FilterQuery, FilterQ
             break;
           case 4: // OPERATOR
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.operator = com.linkedin.pinot.common.request.FilterOperator.findByValue(iprot.readI32());
+              struct.operator = org.apache.pinot.common.request.FilterOperator.findByValue(iprot.readI32());
               struct.setOperatorIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -930,7 +930,7 @@ public class FilterQuery implements org.apache.thrift.TBase<FilterQuery, FilterQ
         struct.setValueIsSet(true);
       }
       if (incoming.get(2)) {
-        struct.operator = com.linkedin.pinot.common.request.FilterOperator.findByValue(iprot.readI32());
+        struct.operator = org.apache.pinot.common.request.FilterOperator.findByValue(iprot.readI32());
         struct.setOperatorIsSet(true);
       }
       if (incoming.get(3)) {
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 b35008f..9a9b2d4 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
@@ -22,7 +22,7 @@
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
-package com.linkedin.pinot.common.request;
+package org.apache.pinot.common.request;
 
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
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 f03c742..ab13dde 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
@@ -22,7 +22,7 @@
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
-package com.linkedin.pinot.common.request;
+package org.apache.pinot.common.request;
 
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
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 f394c40..51cd76a 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
@@ -22,7 +22,7 @@
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
-package com.linkedin.pinot.common.request;
+package org.apache.pinot.common.request;
 
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
@@ -771,7 +771,7 @@ public class HavingFilterQuery implements org.apache.thrift.TBase<HavingFilterQu
             break;
           case 4: // OPERATOR
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.operator = com.linkedin.pinot.common.request.FilterOperator.findByValue(iprot.readI32());
+              struct.operator = org.apache.pinot.common.request.FilterOperator.findByValue(iprot.readI32());
               struct.setOperatorIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -932,7 +932,7 @@ public class HavingFilterQuery implements org.apache.thrift.TBase<HavingFilterQu
         struct.setValueIsSet(true);
       }
       if (incoming.get(2)) {
-        struct.operator = com.linkedin.pinot.common.request.FilterOperator.findByValue(iprot.readI32());
+        struct.operator = org.apache.pinot.common.request.FilterOperator.findByValue(iprot.readI32());
         struct.setOperatorIsSet(true);
       }
       if (incoming.get(3)) {
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 8fcf085..cb0f061 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
@@ -22,7 +22,7 @@
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
-package com.linkedin.pinot.common.request;
+package org.apache.pinot.common.request;
 
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
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 4c34b08..a6bb5e8 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
@@ -22,7 +22,7 @@
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
-package com.linkedin.pinot.common.request;
+package org.apache.pinot.common.request;
 
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
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 048acd0..1a984c7 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
@@ -22,7 +22,7 @@
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
-package com.linkedin.pinot.common.request;
+package org.apache.pinot.common.request;
 
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
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 afaebf0..02a605f 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
@@ -22,7 +22,7 @@
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
-package com.linkedin.pinot.common.request;
+package org.apache.pinot.common.request;
 
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
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 8b4eb99..16cbfd5 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
@@ -22,7 +22,7 @@
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
-package com.linkedin.pinot.common.request;
+package org.apache.pinot.common.request;
 
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
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 9519529..b0ca792 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
@@ -22,7 +22,7 @@
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
-package com.linkedin.pinot.common.request;
+package org.apache.pinot.common.request;
 
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
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 c09249f..b50d91c 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
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.request.transform;
-
-import com.linkedin.pinot.common.utils.EqualityUtils;
-import com.linkedin.pinot.pql.parsers.Pql2CompilationException;
-import com.linkedin.pinot.pql.parsers.Pql2Compiler;
-import com.linkedin.pinot.pql.parsers.pql2.ast.AstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.FunctionCallAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.IdentifierAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.LiteralAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.StringLiteralAstNode;
+package org.apache.pinot.common.request.transform;
+
+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;
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 34e473e..e9967f8 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.response;
+package org.apache.pinot.common.response;
 
-import com.linkedin.pinot.common.response.broker.QueryProcessingException;
+import org.apache.pinot.common.response.broker.QueryProcessingException;
 import java.util.List;
 
 
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 cdc68b0..ddd5607 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.response;
+package org.apache.pinot.common.response;
 
-import com.linkedin.pinot.common.response.broker.BrokerResponseNative;
+import org.apache.pinot.common.response.broker.BrokerResponseNative;
 import java.util.List;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
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 3515979..f9f8518 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
@@ -22,7 +22,7 @@
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
-package com.linkedin.pinot.common.response;
+package org.apache.pinot.common.response;
 
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
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 a1fd5d8..acb53f1 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.response;
+package org.apache.pinot.common.response;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -25,7 +25,7 @@ import org.apache.commons.lang3.tuple.Triple;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.google.common.net.InternetDomainName;
-import com.linkedin.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.CommonConstants;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/response/broker/AggregationResult.java b/pinot-common/src/main/java/org/apache/pinot/common/response/broker/AggregationResult.java
index 2bcff48..56b25c2 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/response/broker/AggregationResult.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/response/broker/AggregationResult.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.response.broker;
+package org.apache.pinot.common.response.broker;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
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 fadc945..b7b3839 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
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.response.broker;
+package org.apache.pinot.common.response.broker;
 
 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 com.linkedin.pinot.common.exception.QueryException;
-import com.linkedin.pinot.common.response.BrokerResponse;
-import com.linkedin.pinot.common.response.ProcessingException;
-import com.linkedin.pinot.common.utils.JsonUtils;
+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;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/response/broker/GroupByResult.java b/pinot-common/src/main/java/org/apache/pinot/common/response/broker/GroupByResult.java
index 6a12eed..3e09e4d 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/response/broker/GroupByResult.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/response/broker/GroupByResult.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.response.broker;
+package org.apache.pinot.common.response.broker;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/response/broker/QueryProcessingException.java b/pinot-common/src/main/java/org/apache/pinot/common/response/broker/QueryProcessingException.java
index 3d35a62..531d743 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/response/broker/QueryProcessingException.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/response/broker/QueryProcessingException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.response.broker;
+package org.apache.pinot.common.response.broker;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/response/broker/SelectionResults.java b/pinot-common/src/main/java/org/apache/pinot/common/response/broker/SelectionResults.java
index 8c6baf5..abffd5b 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/response/broker/SelectionResults.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/response/broker/SelectionResults.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.response.broker;
+package org.apache.pinot.common.response.broker;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
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 35894fe..1151350 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.restlet.resources;
+package org.apache.pinot.common.restlet.resources;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.linkedin.pinot.common.partition.PartitionAssignment;
+import org.apache.pinot.common.partition.PartitionAssignment;
 import java.util.Map;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -63,4 +63,4 @@ public class RebalanceResult {
   public void setStatus(String status) {
     this.status = status;
   }
-}
\ No newline at end of file
+}
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 bf21347..e74d5b7 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.restlet.resources;
+package org.apache.pinot.common.restlet.resources;
 
-import com.linkedin.pinot.common.utils.JsonUtils;
+import org.apache.pinot.common.utils.JsonUtils;
 import java.io.IOException;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/SegmentSizeInfo.java b/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/SegmentSizeInfo.java
index 90bda37..362c8a5 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/SegmentSizeInfo.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/SegmentSizeInfo.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.restlet.resources;
+package org.apache.pinot.common.restlet.resources;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/TableSegments.java b/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/TableSegments.java
index 342bcfa..093d9e4 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/TableSegments.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/TableSegments.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.restlet.resources;
+package org.apache.pinot.common.restlet.resources;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/TableSizeInfo.java b/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/TableSizeInfo.java
index 1e8753b..548a78e 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/TableSizeInfo.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/TableSizeInfo.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.restlet.resources;
+package org.apache.pinot.common.restlet.resources;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import java.util.ArrayList;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/TablesList.java b/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/TablesList.java
index bcf990b..3fb3ce3 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/TablesList.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/TablesList.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.restlet.resources;
+package org.apache.pinot.common.restlet.resources;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/segment/ReadMode.java b/pinot-common/src/main/java/org/apache/pinot/common/segment/ReadMode.java
index e76cc2c..147b886 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/segment/ReadMode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/segment/ReadMode.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.segment;
+package org.apache.pinot.common.segment;
 
-import com.linkedin.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.CommonConstants;
 
 
 public enum ReadMode {
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 db92dd8..fe43091 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.segment;
+package org.apache.pinot.common.segment;
 
-import com.linkedin.pinot.common.data.MetricFieldSpec;
-import com.linkedin.pinot.common.data.Schema;
+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.joda.time.Duration;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/segment/StarTreeMetadata.java b/pinot-common/src/main/java/org/apache/pinot/common/segment/StarTreeMetadata.java
index 5368b2d..33c6567 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/segment/StarTreeMetadata.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/segment/StarTreeMetadata.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.segment;
+package org.apache.pinot.common.segment;
 
 import java.util.List;
 
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 aaed49c..a6e2217 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.segment.fetcher;
+package org.apache.pinot.common.segment.fetcher;
 
 import com.google.common.base.Strings;
-import com.linkedin.pinot.common.utils.retry.RetryPolicies;
-import com.linkedin.pinot.common.utils.retry.RetryPolicy;
+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;
@@ -32,8 +32,8 @@ import org.apache.hadoop.security.UserGroupInformation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.linkedin.pinot.common.utils.CommonConstants.SegmentOperations.HadoopSegmentOperations.*;
-import static com.linkedin.pinot.common.utils.CommonConstants.SegmentOperations.*;
+import static org.apache.pinot.common.utils.CommonConstants.SegmentOperations.HadoopSegmentOperations.*;
+import static org.apache.pinot.common.utils.CommonConstants.SegmentOperations.*;
 
 
 public class HdfsSegmentFetcher implements SegmentFetcher {
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 4a4655d..bb942c1 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.segment.fetcher;
+package org.apache.pinot.common.segment.fetcher;
 
-import com.linkedin.pinot.common.exception.HttpErrorStatusException;
-import com.linkedin.pinot.common.utils.FileUploadDownloadClient;
-import com.linkedin.pinot.common.utils.retry.RetryPolicies;
+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;
@@ -29,7 +29,7 @@ import org.apache.commons.configuration.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.linkedin.pinot.common.utils.CommonConstants.SegmentOperations.*;
+import static org.apache.pinot.common.utils.CommonConstants.SegmentOperations.*;
 
 
 public class HttpSegmentFetcher implements SegmentFetcher {
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 042a3b3..6ae5737 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.segment.fetcher;
+package org.apache.pinot.common.segment.fetcher;
 
-import com.linkedin.pinot.common.utils.ClientSSLContextGenerator;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.FileUploadDownloadClient;
+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;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/LocalFileSegmentFetcher.java b/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/LocalFileSegmentFetcher.java
index 9a832a1..9ff1c7e 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/LocalFileSegmentFetcher.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/LocalFileSegmentFetcher.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.segment.fetcher;
+package org.apache.pinot.common.segment.fetcher;
 
 import java.io.File;
 import java.util.Collections;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/NoOpFetcher.java b/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/NoOpFetcher.java
index f9be3b6..7d69059 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/NoOpFetcher.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/NoOpFetcher.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.segment.fetcher;
+package org.apache.pinot.common.segment.fetcher;
 
 import java.io.File;
 import java.util.Collections;
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 2eca103..f408182 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.segment.fetcher;
+package org.apache.pinot.common.segment.fetcher;
 
-import com.linkedin.pinot.filesystem.PinotFS;
-import com.linkedin.pinot.filesystem.PinotFSFactory;
+import org.apache.pinot.filesystem.PinotFS;
+import org.apache.pinot.filesystem.PinotFSFactory;
 import java.io.File;
 import java.net.URI;
 import java.util.Collections;
@@ -53,4 +53,4 @@ public class PinotFSSegmentFetcher implements SegmentFetcher {
   public Set<String> getProtectedConfigKeys() {
     return Collections.emptySet();
   }
-}
\ No newline at end of file
+}
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/SegmentFetcher.java b/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/SegmentFetcher.java
index e9496af..940bb79 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/SegmentFetcher.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/SegmentFetcher.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.segment.fetcher;
+package org.apache.pinot.common.segment.fetcher;
 
 import java.io.File;
 import java.util.Set;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/SegmentFetcherFactory.java b/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/SegmentFetcherFactory.java
index 5c86877..c37959d 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/SegmentFetcherFactory.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/SegmentFetcherFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.segment.fetcher;
+package org.apache.pinot.common.segment.fetcher;
 
 import com.google.common.base.Preconditions;
 import java.net.URI;
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 28cbb01..48b676f 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
-import com.linkedin.pinot.common.Utils;
+import org.apache.pinot.common.Utils;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
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 14874d5..2096f09 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
-import com.linkedin.pinot.common.response.BrokerResponseFactory;
+import org.apache.pinot.common.response.BrokerResponseFactory;
 import java.io.File;
 
 
@@ -169,12 +169,12 @@ public class CommonConstants {
     public static final String DEFAULT_INSTANCE_SEGMENT_TAR_DIR =
         DEFAULT_INSTANCE_BASE_DIR + File.separator + "segmentTar";
     public static final String DEFAULT_DATA_MANAGER_CLASS =
-        "com.linkedin.pinot.server.starter.helix.HelixInstanceDataManager";
+        "org.apache.pinot.server.starter.helix.HelixInstanceDataManager";
     public static final String DEFAULT_QUERY_EXECUTOR_CLASS =
-        "com.linkedin.pinot.core.query.executor.ServerQueryExecutorV1Impl";
+        "org.apache.pinot.core.query.executor.ServerQueryExecutorV1Impl";
     public static final long DEFAULT_QUERY_EXECUTOR_TIMEOUT_MS = 15_000L;
     public static final String DEFAULT_REQUEST_HANDLER_FACTORY_CLASS =
-        "com.linkedin.pinot.server.request.SimpleRequestHandlerFactory";
+        "org.apache.pinot.server.request.SimpleRequestHandlerFactory";
     public static final String PREFIX_OF_CONFIG_OF_SEGMENT_FETCHER_FACTORY = "pinot.server.segment.fetcher";
     public static final String PREFIX_OF_CONFIG_OF_SEGMENT_UPLOADER = "pinot.server.segment.uploader";
     public static final String DEFAULT_STAR_TREE_FORMAT_VERSION = "OFF_HEAP";
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 5c3ede2..2cf1014 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
-import com.linkedin.pinot.common.data.FieldSpec;
+import org.apache.pinot.common.data.FieldSpec;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/DataSize.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/DataSize.java
index 60d0ace..af5a54e 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/DataSize.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/DataSize.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
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 253e055..dd5c434 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
-import com.linkedin.pinot.common.response.ProcessingException;
+import org.apache.pinot.common.response.ProcessingException;
 import java.io.IOException;
 import java.util.Map;
 import javax.annotation.Nonnull;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/EqualityUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/EqualityUtils.java
index ad34556..99847de 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/EqualityUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/EqualityUtils.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
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 d1e3351..cc6a130 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import com.google.common.base.Preconditions;
-import com.linkedin.pinot.common.exception.HttpErrorStatusException;
+import org.apache.pinot.common.exception.HttpErrorStatusException;
 import java.io.BufferedOutputStream;
 import java.io.Closeable;
 import java.io.File;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/FileUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/FileUtils.java
index fe4c442..e94063b 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/FileUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/FileUtils.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import java.io.File;
 import java.io.IOException;
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 f88c576..dc51681 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 // old style name (that needs to be recognized, but not built anymore)
 //  return StringUtils.join(
@@ -35,7 +35,7 @@ package com.linkedin.pinot.common.utils;
 //    groupId: tableName_REALTIME_1433316466991_0
 //    partitionRange: 0
 //    sequenceNumber: 1465314044238
-// see com.linkedin.pinot.controller.helix.core.PinotTableIdealStateBuilder#getGroupIdFromRealtimeDataTable for details on the groupId
+// 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;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/HashUtil.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/HashUtil.java
index cc70c3f..089a632 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/HashUtil.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/HashUtil.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
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 c23beae..a307856 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -27,7 +27,7 @@ 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 com.linkedin.pinot.common.data.FieldSpec;
+import org.apache.pinot.common.data.FieldSpec;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
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 de4b111..6c23ffc 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import java.io.File;
 import java.security.Permission;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/LLCSegmentName.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/LLCSegmentName.java
index 7a6b0ec..fab2e81 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/LLCSegmentName.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/LLCSegmentName.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/LLCUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/LLCUtils.java
index c396a35..b0d3f3d 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/LLCUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/LLCUtils.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/LogUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/LogUtils.java
index 77bd179..4e8a624 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/LogUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/LogUtils.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import java.util.Enumeration;
 import java.util.List;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/NamedThreadFactory.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/NamedThreadFactory.java
index b83db67..c35aed2 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/NamedThreadFactory.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/NamedThreadFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/NetUtil.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/NetUtil.java
index a216bf4..0ec49aa 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/NetUtil.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/NetUtil.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import java.net.DatagramSocket;
 import java.net.InetAddress;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/Pairs.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/Pairs.java
index cbb465c..c0542d1 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/Pairs.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/Pairs.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import java.util.Comparator;
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/PrimitiveArrayUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/PrimitiveArrayUtils.java
index 9aa3d1c..0cc6441 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/PrimitiveArrayUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/PrimitiveArrayUtils.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import org.apache.commons.lang3.ArrayUtils;
 
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 3facc62..8c6baa9 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import com.google.common.base.Preconditions;
-import com.linkedin.pinot.common.data.FieldSpec;
-import com.linkedin.pinot.common.data.Schema;
+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;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/SegmentName.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/SegmentName.java
index d9d5e9e..9bd555c 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/SegmentName.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/SegmentName.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 public abstract class SegmentName {
   public static final String SEPARATOR = "__";
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/ServerType.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/ServerType.java
index 3f385b0..b17ff06 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/ServerType.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/ServerType.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 public enum ServerType {
   OFFLINE, REALTIME
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 643ddb0..3e2486c 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
-import com.linkedin.pinot.common.config.TableNameBuilder;
+import org.apache.pinot.common.config.TableNameBuilder;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/SimpleHttpResponse.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/SimpleHttpResponse.java
index 14f10d1..3429072 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/SimpleHttpResponse.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/SimpleHttpResponse.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 public class SimpleHttpResponse {
   private int _statusCode;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/StringUtil.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/StringUtil.java
index a383af5..e871b32 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/StringUtil.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/StringUtil.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import java.io.UnsupportedEncodingException;
 import org.apache.commons.lang.StringUtils;
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 8806998..4b4e884 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
-import com.linkedin.pinot.common.Utils;
+import org.apache.pinot.common.Utils;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/TenantRole.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/TenantRole.java
index d3884ae..21a2911 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/TenantRole.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/TenantRole.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 public enum TenantRole {
   SERVER,
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 3ca1e8f..2e41f70 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import java.io.File;
 import java.io.IOException;
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 6bfd6f3..92b63da 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
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.helix;
+package org.apache.pinot.common.utils.helix;
 
 import com.google.common.base.Function;
-import com.linkedin.pinot.common.config.TagNameUtils;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.EqualityUtils;
-import com.linkedin.pinot.common.utils.retry.RetryPolicies;
-import com.linkedin.pinot.common.utils.retry.RetryPolicy;
+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;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/helix/PinotHelixPropertyStoreZnRecordProvider.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/helix/PinotHelixPropertyStoreZnRecordProvider.java
index 80aee65..718393a 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/helix/PinotHelixPropertyStoreZnRecordProvider.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/helix/PinotHelixPropertyStoreZnRecordProvider.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.helix;
+package org.apache.pinot.common.utils.helix;
 
 import org.apache.helix.AccessOption;
 import org.apache.helix.ZNRecord;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/primitive/ByteArray.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/primitive/ByteArray.java
index 9a08a8b..6ce798e 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/primitive/ByteArray.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/primitive/ByteArray.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.primitive;
+package org.apache.pinot.common.utils.primitive;
 
 import java.util.Arrays;
 import javax.annotation.Nonnull;
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 9437a15..7a3e8d8 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.request;
+package org.apache.pinot.common.utils.request;
 
 import com.google.common.collect.Lists;
-import com.linkedin.pinot.common.request.FilterOperator;
-import com.linkedin.pinot.common.utils.StringUtil;
+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;
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 d77b9d0..1f85949 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.request;
+package org.apache.pinot.common.utils.request;
 
-import com.linkedin.pinot.common.request.AggregationInfo;
-import com.linkedin.pinot.common.request.FilterOperator;
+import org.apache.pinot.common.request.AggregationInfo;
+import org.apache.pinot.common.request.FilterOperator;
 import java.util.List;
 
 
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 30457d9..c0be718 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.request;
+package org.apache.pinot.common.utils.request;
 
-import com.linkedin.pinot.common.request.FilterOperator;
+import org.apache.pinot.common.request.FilterOperator;
 import java.util.List;
 
 
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 034d915..2b93f4c 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
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.request;
-
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.request.FilterQuery;
-import com.linkedin.pinot.common.request.FilterQueryMap;
-import com.linkedin.pinot.common.request.HavingFilterQuery;
-import com.linkedin.pinot.common.request.HavingFilterQueryMap;
-import com.linkedin.pinot.common.request.Selection;
-import com.linkedin.pinot.common.request.SelectionSort;
-import com.linkedin.pinot.common.request.transform.TransformExpressionTree;
+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;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/AttemptFailureException.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/AttemptFailureException.java
index 8845de6..c9f1554 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/AttemptFailureException.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/AttemptFailureException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.retry;
+package org.apache.pinot.common.utils.retry;
 
 import java.util.concurrent.Callable;
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/AttemptsExceededException.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/AttemptsExceededException.java
index 9fcacbd..d50152f 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/AttemptsExceededException.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/AttemptsExceededException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.retry;
+package org.apache.pinot.common.utils.retry;
 
 /**
  * The <code>AttemptsExceededException</code> indicates that the operation did not succeed within maximum number of
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/BaseRetryPolicy.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/BaseRetryPolicy.java
index ba49b46..ce10c1c 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/BaseRetryPolicy.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/BaseRetryPolicy.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.retry;
+package org.apache.pinot.common.utils.retry;
 
 import java.util.concurrent.Callable;
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/ExponentialBackoffRetryPolicy.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/ExponentialBackoffRetryPolicy.java
index 58864ad..7c49acc 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/ExponentialBackoffRetryPolicy.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/ExponentialBackoffRetryPolicy.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.retry;
+package org.apache.pinot.common.utils.retry;
 
 import java.util.concurrent.ThreadLocalRandom;
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/FixedDelayRetryPolicy.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/FixedDelayRetryPolicy.java
index 81eada8..7ba3c48 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/FixedDelayRetryPolicy.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/FixedDelayRetryPolicy.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.retry;
+package org.apache.pinot.common.utils.retry;
 
 /**
  * Delay policy with fixed delay between attempts.
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/NoDelayRetryPolicy.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/NoDelayRetryPolicy.java
index ace0b15..0627fa8 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/NoDelayRetryPolicy.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/NoDelayRetryPolicy.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.retry;
+package org.apache.pinot.common.utils.retry;
 
 /**
  * Retry policy without delay between attempts.
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/RetriableOperationException.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/RetriableOperationException.java
index 47cccbc..c1f55e4 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/RetriableOperationException.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/RetriableOperationException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.retry;
+package org.apache.pinot.common.utils.retry;
 
 /**
  * The <code>RetriableOperationException</code> indicates that the retriable operation threw an exception.
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/RetryPolicies.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/RetryPolicies.java
index c6fc404..8870bf9 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/RetryPolicies.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/RetryPolicies.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.retry;
+package org.apache.pinot.common.utils.retry;
 
 /**
  * Factory for retry policies.
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/RetryPolicy.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/RetryPolicy.java
index 920de1d..4ded2ed 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/RetryPolicy.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/retry/RetryPolicy.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.retry;
+package org.apache.pinot.common.utils.retry;
 
 import java.util.concurrent.Callable;
 
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 d794fe5..5930532 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.time;
+package org.apache.pinot.common.utils.time;
 
 import com.google.common.base.Preconditions;
-import com.linkedin.pinot.common.data.TimeGranularitySpec;
+import org.apache.pinot.common.data.TimeGranularitySpec;
 import java.util.concurrent.TimeUnit;
 
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/time/TimeUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/time/TimeUtils.java
index bf49cdb..a88923f 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/time/TimeUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/time/TimeUtils.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.time;
+package org.apache.pinot.common.utils.time;
 
 import java.util.HashMap;
 import java.util.Map;
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 89efc7e..434a858 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.webhdfs;
+package org.apache.pinot.common.utils.webhdfs;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/AbstractCompiler.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/AbstractCompiler.java
index c26a635..a14f907 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/AbstractCompiler.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/AbstractCompiler.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers;
+package org.apache.pinot.pql.parsers;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.request.transform.TransformExpressionTree;
+import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.transform.TransformExpressionTree;
 
 /**
  * Interface for PQL compilers.
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 19e6174..741fa3f 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
@@ -16,39 +16,39 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers;
-
-import com.linkedin.pinot.pql.parsers.pql2.ast.AstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.BetweenPredicateAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.BinaryMathOpAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.BooleanOperatorAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.ComparisonPredicateAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.ExpressionParenthesisGroupAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.FloatingPointLiteralAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.FunctionCallAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.GroupByAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.HavingAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.IdentifierAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.InPredicateAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.IntegerLiteralAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.IsPredicateAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.LimitAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.OptionAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.OptionsAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.OrderByAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.OrderByExpressionAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.OutputColumnAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.OutputColumnListAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.PredicateListAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.PredicateParenthesisGroupAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.RegexpLikePredicateAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.SelectAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.StarColumnListAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.StarExpressionAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.StringLiteralAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.TableNameAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.TopAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.WhereAstNode;
+package org.apache.pinot.pql.parsers;
+
+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;
+import org.apache.pinot.pql.parsers.pql2.ast.BooleanOperatorAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.ComparisonPredicateAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.ExpressionParenthesisGroupAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.FloatingPointLiteralAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.FunctionCallAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.GroupByAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.HavingAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.IdentifierAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.InPredicateAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.IntegerLiteralAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.IsPredicateAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.LimitAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.OptionAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.OptionsAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.OrderByAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.OrderByExpressionAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.OutputColumnAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.OutputColumnListAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.PredicateListAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.PredicateParenthesisGroupAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.RegexpLikePredicateAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.SelectAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.StarColumnListAstNode;
+import org.apache.pinot.pql.parsers.pql2.ast.StarExpressionAstNode;
+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/Pql2CompilationException.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/Pql2CompilationException.java
index f936edb..98b2976 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/Pql2CompilationException.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/Pql2CompilationException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers;
+package org.apache.pinot.pql.parsers;
 
 import org.antlr.v4.runtime.RecognitionException;
 
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 178bcf8..5c1fb60 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
@@ -16,19 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers;
-
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.request.transform.TransformExpressionTree;
-import com.linkedin.pinot.pql.parsers.pql2.ast.AstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.BaseAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.BetweenPredicateAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.ComparisonPredicateAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.FunctionCallAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.HavingAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.InPredicateAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.OutputColumnAstNode;
-import com.linkedin.pinot.pql.parsers.pql2.ast.RegexpLikePredicateAstNode;
+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;
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 99721df..9cdd550 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.BrokerRequest;
 import java.util.List;
 
 
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 dc6413a..1cbaa92 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.BrokerRequest;
 import java.util.ArrayList;
 import java.util.List;
 
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 1239e4c..ed5d1ba 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.request.FilterOperator;
-import com.linkedin.pinot.common.utils.request.FilterQueryTree;
-import com.linkedin.pinot.common.utils.request.HavingQueryTree;
-import com.linkedin.pinot.pql.parsers.Pql2CompilationException;
+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/BinaryMathOpAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/BinaryMathOpAstNode.java
index 8660e2e..4e8d5e4 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/BinaryMathOpAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/BinaryMathOpAstNode.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
 /**
  * AST node for binary math operands (such as addition or division)
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 204659b..9f02d64 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.BrokerRequest;
 import java.util.List;
 
 
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 421a664..ff8991a 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.request.FilterOperator;
-import com.linkedin.pinot.common.utils.request.FilterQueryTree;
-import com.linkedin.pinot.common.utils.request.HavingQueryTree;
-import com.linkedin.pinot.pql.parsers.Pql2CompilationException;
+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/ExpressionParenthesisGroupAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/ExpressionParenthesisGroupAstNode.java
index 1f86548..447e35c 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/ExpressionParenthesisGroupAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/ExpressionParenthesisGroupAstNode.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
 /**
  * AST node for math operands in their own parenthesis group.
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/FloatingPointLiteralAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/FloatingPointLiteralAstNode.java
index a35f4f8..2e18965 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/FloatingPointLiteralAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/FloatingPointLiteralAstNode.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
 /**
  * Floating point literal AST node.
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 a4fba71..fbccf00 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.request.AggregationInfo;
-import com.linkedin.pinot.common.request.transform.TransformExpressionTree;
-import com.linkedin.pinot.common.utils.EqualityUtils;
-import com.linkedin.pinot.pql.parsers.Pql2CompilationException;
+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/GroupByAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/GroupByAstNode.java
index 8c90a40..b2aa973 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/GroupByAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/GroupByAstNode.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.request.GroupBy;
-import com.linkedin.pinot.common.request.transform.TransformExpressionTree;
+import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.GroupBy;
+import org.apache.pinot.common.request.transform.TransformExpressionTree;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/HavingAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/HavingAstNode.java
index 57be147..a0b2dc9 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/HavingAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/HavingAstNode.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.utils.request.RequestUtils;
+import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.utils.request.RequestUtils;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/IdentifierAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/IdentifierAstNode.java
index 7f92cee..1a0a090 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/IdentifierAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/IdentifierAstNode.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
 /**
  * AST node for identifiers (column names).
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 bd9c9cd..aa636c4 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
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.request.FilterOperator;
-import com.linkedin.pinot.common.utils.StringUtil;
-import com.linkedin.pinot.common.utils.request.FilterQueryTree;
-import com.linkedin.pinot.common.utils.request.HavingQueryTree;
-import com.linkedin.pinot.pql.parsers.Pql2CompilationException;
+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;
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/IntegerLiteralAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/IntegerLiteralAstNode.java
index 3f17df6..886368e 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/IntegerLiteralAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/IntegerLiteralAstNode.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
 /**
  * AST node for integer literals.
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/IsPredicateAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/IsPredicateAstNode.java
index 16e6874..9cb001e 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/IsPredicateAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/IsPredicateAstNode.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.pql.parsers.Pql2CompilationException;
+import org.apache.pinot.pql.parsers.Pql2CompilationException;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/LimitAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/LimitAstNode.java
index 39482f0..22fdb5e 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/LimitAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/LimitAstNode.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
 /**
  * AST node for LIMIT clauses.
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/LiteralAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/LiteralAstNode.java
index 69cc998..133eda3 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/LiteralAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/LiteralAstNode.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
 /**
  * Literal AST node common interface.
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OptionAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OptionAstNode.java
index e99e185..11b50f8 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OptionAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OptionAstNode.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.pql.parsers.Pql2CompilationException;
+import org.apache.pinot.common.request.BrokerRequest;
+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 e27f017..c5d54ef 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.BrokerRequest;
 import java.util.HashMap;
 
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OrderByAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OrderByAstNode.java
index ad5cdd7..56a8c45 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OrderByAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OrderByAstNode.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.request.Selection;
-import com.linkedin.pinot.common.request.SelectionSort;
-import com.linkedin.pinot.pql.parsers.Pql2CompilationException;
+import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.Selection;
+import org.apache.pinot.common.request.SelectionSort;
+import org.apache.pinot.pql.parsers.Pql2CompilationException;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OrderByExpressionAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OrderByExpressionAstNode.java
index 2ed526d..20345a9 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OrderByExpressionAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OrderByExpressionAstNode.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
 /**
  * AST node for an expression in an ORDER BY clause.
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OutputColumnAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OutputColumnAstNode.java
index 0c1e075..3c08387 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OutputColumnAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OutputColumnAstNode.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.request.Selection;
-import com.linkedin.pinot.pql.parsers.Pql2CompilationException;
+import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.Selection;
+import org.apache.pinot.pql.parsers.Pql2CompilationException;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OutputColumnListAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OutputColumnListAstNode.java
index 3ae16fb..a9d0a8b 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OutputColumnListAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/OutputColumnListAstNode.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.BrokerRequest;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/PredicateAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/PredicateAstNode.java
index ceb9144..3907d19 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/PredicateAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/PredicateAstNode.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.utils.request.FilterQueryTree;
-import com.linkedin.pinot.common.utils.request.HavingQueryTree;
+import org.apache.pinot.common.utils.request.FilterQueryTree;
+import org.apache.pinot.common.utils.request.HavingQueryTree;
 
 /**
  * Common interface and implementation for predicate AST nodes.
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 842eba2..ac4354f 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.request.FilterOperator;
-import com.linkedin.pinot.common.utils.request.FilterQueryTree;
-import com.linkedin.pinot.common.utils.request.HavingQueryTree;
+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/PredicateParenthesisGroupAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/PredicateParenthesisGroupAstNode.java
index 2eba51d..ad31cb9 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/PredicateParenthesisGroupAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/PredicateParenthesisGroupAstNode.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.utils.request.FilterQueryTree;
-import com.linkedin.pinot.common.utils.request.HavingQueryTree;
+import org.apache.pinot.common.utils.request.FilterQueryTree;
+import org.apache.pinot.common.utils.request.HavingQueryTree;
 
 
 /**
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 d234261..5eb5df7 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
@@ -16,18 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.linkedin.pinot.common.request.FilterOperator;
-import com.linkedin.pinot.common.utils.StringUtil;
-import com.linkedin.pinot.common.utils.request.FilterQueryTree;
-import com.linkedin.pinot.common.utils.request.HavingQueryTree;
-import com.linkedin.pinot.pql.parsers.Pql2CompilationException;
+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;
 
 public class RegexpLikePredicateAstNode extends PredicateAstNode {
   private static final String SEPERATOR = "\t\t";
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/SelectAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/SelectAstNode.java
index f9e7cf7..001920e 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/SelectAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/SelectAstNode.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.request.GroupBy;
-import com.linkedin.pinot.common.request.QuerySource;
-import com.linkedin.pinot.common.request.Selection;
-import com.linkedin.pinot.pql.parsers.Pql2CompilationException;
+import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.GroupBy;
+import org.apache.pinot.common.request.QuerySource;
+import org.apache.pinot.common.request.Selection;
+import org.apache.pinot.pql.parsers.Pql2CompilationException;
 
 
 /**
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 e5217d3..5a05378 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.request.Selection;
+import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.Selection;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/StarExpressionAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/StarExpressionAstNode.java
index ecff4f7..475d9a9 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/StarExpressionAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/StarExpressionAstNode.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
 /**
  * AST node for the star expression, such as the star in COUNT(*).
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/StringLiteralAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/StringLiteralAstNode.java
index 531669c..9e25426 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/StringLiteralAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/StringLiteralAstNode.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
 /**
  * AST node for a quoted string literal.
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/TableNameAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/TableNameAstNode.java
index 80c973f..203b648 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/TableNameAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/TableNameAstNode.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
 /**
  * AST node for a table name.
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/TopAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/TopAstNode.java
index 0899c92..4efe455 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/TopAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/TopAstNode.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.exception.QueryException;
+import org.apache.pinot.common.exception.QueryException;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/WhereAstNode.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/WhereAstNode.java
index b324de2..e351ef5 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/WhereAstNode.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/WhereAstNode.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.pql2.ast;
+package org.apache.pinot.pql.parsers.pql2.ast;
 
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.utils.request.RequestUtils;
+import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.utils.request.RequestUtils;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/utils/Pair.java b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/utils/Pair.java
index 8612e98..143fb1a 100644
--- a/pinot-common/src/main/java/org/apache/pinot/pql/parsers/utils/Pair.java
+++ b/pinot-common/src/main/java/org/apache/pinot/pql/parsers/utils/Pair.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers.utils;
+package org.apache.pinot.pql.parsers.utils;
 
 import java.io.Serializable;
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/serde/SerDe.java b/pinot-common/src/main/java/org/apache/pinot/serde/SerDe.java
index e8b347d..117786b 100644
--- a/pinot-common/src/main/java/org/apache/pinot/serde/SerDe.java
+++ b/pinot-common/src/main/java/org/apache/pinot/serde/SerDe.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.serde;
+package org.apache.pinot.serde;
 
 import javax.annotation.concurrent.NotThreadSafe;
 import org.apache.thrift.TBase;
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 b00e89a..7b9be85 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
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.startree.hll;
+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 com.linkedin.pinot.common.config.ConfigKey;
-import com.linkedin.pinot.common.utils.JsonUtils;
+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;
@@ -31,7 +31,7 @@ import java.util.Set;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import static com.linkedin.pinot.common.utils.EqualityUtils.*;
+import static org.apache.pinot.common.utils.EqualityUtils.*;
 
 
 /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/startree/hll/HllConstants.java b/pinot-common/src/main/java/org/apache/pinot/startree/hll/HllConstants.java
index 71e02cc..73951be 100644
--- a/pinot-common/src/main/java/org/apache/pinot/startree/hll/HllConstants.java
+++ b/pinot-common/src/main/java/org/apache/pinot/startree/hll/HllConstants.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.startree.hll;
+package org.apache.pinot.startree.hll;
 
 public class HllConstants {
     public static final int DEFAULT_LOG2M = 8;
diff --git a/pinot-common/src/main/java/org/apache/pinot/startree/hll/HllSizeUtils.java b/pinot-common/src/main/java/org/apache/pinot/startree/hll/HllSizeUtils.java
index 8e8b35b..7133169 100644
--- a/pinot-common/src/main/java/org/apache/pinot/startree/hll/HllSizeUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/startree/hll/HllSizeUtils.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.startree.hll;
+package org.apache.pinot.startree.hll;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableBiMap;
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 4c0c339..723f1b2 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
-import com.linkedin.pinot.common.data.StarTreeIndexSpec;
-import com.linkedin.pinot.common.utils.JsonUtils;
+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;
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 76e6971..a692ad0 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
-import com.linkedin.pinot.common.utils.JsonUtils;
+import org.apache.pinot.common.utils.JsonUtils;
 import java.io.IOException;
 import org.apache.commons.configuration.ConfigurationRuntimeException;
 import org.testng.Assert;
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 8630ea8..19c4dc3 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
-import com.linkedin.pinot.common.data.StarTreeIndexSpec;
-import com.linkedin.pinot.common.utils.CommonConstants.Helix.TableType;
-import com.linkedin.pinot.startree.hll.HllConfig;
+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;
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 423d2d1..a96f29e 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
-import com.linkedin.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.CommonConstants;
 import java.util.ArrayList;
 import java.util.List;
 import org.testng.Assert;
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 f98efdb..c8467ee 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
-import com.linkedin.pinot.common.utils.JsonUtils;
-import com.linkedin.pinot.common.utils.TenantRole;
+import org.apache.pinot.common.utils.JsonUtils;
+import org.apache.pinot.common.utils.TenantRole;
 import java.io.IOException;
 import org.testng.annotations.Test;
 
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 1ee7cbc..4c670a2 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
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.config;
+package org.apache.pinot.common.config;
 
 import com.google.common.collect.Lists;
-import com.linkedin.pinot.common.config.CombinedConfig;
-import com.linkedin.pinot.common.config.CombinedConfigLoader;
-import com.linkedin.pinot.common.config.Deserializer;
-import com.linkedin.pinot.common.config.Serializer;
-import com.linkedin.pinot.common.config.TableConfig;
+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 07eac38..65768cb 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+package org.apache.pinot.common.data;
 
-import com.linkedin.pinot.common.data.DateTimeFieldSpec.TimeFormat;
+import org.apache.pinot.common.data.DateTimeFieldSpec.TimeFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TimeZone;
@@ -188,58 +188,58 @@ public class DateTimeFormatSpecTest {
 
     entries.add(new Object[] {
         "1:HOURS:EPOCH", 1, TimeUnit.HOURS,
-        com.linkedin.pinot.common.data.DateTimeFieldSpec.TimeFormat.EPOCH, null, DateTimeZone.UTC
+        org.apache.pinot.common.data.DateTimeFieldSpec.TimeFormat.EPOCH, null, DateTimeZone.UTC
     });
 
     entries.add(new Object[] {
         "5:MINUTES:EPOCH", 5, TimeUnit.MINUTES,
-        com.linkedin.pinot.common.data.DateTimeFieldSpec.TimeFormat.EPOCH, null, DateTimeZone.UTC
+        org.apache.pinot.common.data.DateTimeFieldSpec.TimeFormat.EPOCH, null, DateTimeZone.UTC
     });
 
     entries.add(new Object[] {
         "1:DAYS:SIMPLE_DATE_FORMAT:yyyyMMdd", 1, TimeUnit.DAYS,
-        com.linkedin.pinot.common.data.DateTimeFieldSpec.TimeFormat.SIMPLE_DATE_FORMAT, "yyyyMMdd", DateTimeZone.UTC
+        org.apache.pinot.common.data.DateTimeFieldSpec.TimeFormat.SIMPLE_DATE_FORMAT, "yyyyMMdd", DateTimeZone.UTC
     });
 
     entries.add(new Object[] {
         "1:DAYS:SIMPLE_DATE_FORMAT:yyyyMMdd tz(IST)", 1, TimeUnit.DAYS,
-        com.linkedin.pinot.common.data.DateTimeFieldSpec.TimeFormat.SIMPLE_DATE_FORMAT, "yyyyMMdd",
+        org.apache.pinot.common.data.DateTimeFieldSpec.TimeFormat.SIMPLE_DATE_FORMAT, "yyyyMMdd",
         DateTimeZone.forTimeZone(TimeZone.getTimeZone("IST"))
     });
 
     entries.add(new Object[] {
         "1:DAYS:SIMPLE_DATE_FORMAT:yyyyMMdd          tz(IST)", 1, TimeUnit.DAYS,
-        com.linkedin.pinot.common.data.DateTimeFieldSpec.TimeFormat.SIMPLE_DATE_FORMAT, "yyyyMMdd",
+        org.apache.pinot.common.data.DateTimeFieldSpec.TimeFormat.SIMPLE_DATE_FORMAT, "yyyyMMdd",
         DateTimeZone.forTimeZone(TimeZone.getTimeZone("IST"))
     });
 
     entries.add(new Object[] {
         "1:DAYS:SIMPLE_DATE_FORMAT:yyyyMMdd tz  (   IST   )  ", 1, TimeUnit.DAYS,
-        com.linkedin.pinot.common.data.DateTimeFieldSpec.TimeFormat.SIMPLE_DATE_FORMAT, "yyyyMMdd",
+        org.apache.pinot.common.data.DateTimeFieldSpec.TimeFormat.SIMPLE_DATE_FORMAT, "yyyyMMdd",
         DateTimeZone.forTimeZone(TimeZone.getTimeZone("IST"))
     });
 
     entries.add(new Object[] {
         "1:HOURS:SIMPLE_DATE_FORMAT:yyyyMMdd HH", 1, TimeUnit.HOURS,
-        com.linkedin.pinot.common.data.DateTimeFieldSpec.TimeFormat.SIMPLE_DATE_FORMAT,
+        org.apache.pinot.common.data.DateTimeFieldSpec.TimeFormat.SIMPLE_DATE_FORMAT,
         "yyyyMMdd HH", DateTimeZone.UTC
     });
 
     entries.add(new Object[] {
         "1:HOURS:SIMPLE_DATE_FORMAT:yyyyMMdd HH tz(dummy)", 1, TimeUnit.HOURS,
-        com.linkedin.pinot.common.data.DateTimeFieldSpec.TimeFormat.SIMPLE_DATE_FORMAT,
+        org.apache.pinot.common.data.DateTimeFieldSpec.TimeFormat.SIMPLE_DATE_FORMAT,
         "yyyyMMdd HH", DateTimeZone.UTC
     });
 
     entries.add(new Object[] {
         "1:HOURS:SIMPLE_DATE_FORMAT:M/d/yyyy h:mm:ss a", 1, TimeUnit.HOURS,
-        com.linkedin.pinot.common.data.DateTimeFieldSpec.TimeFormat.SIMPLE_DATE_FORMAT,
+        org.apache.pinot.common.data.DateTimeFieldSpec.TimeFormat.SIMPLE_DATE_FORMAT,
         "M/d/yyyy h:mm:ss a", DateTimeZone.UTC
     });
 
     entries.add(new Object[] {
         "1:HOURS:SIMPLE_DATE_FORMAT:M/d/yyyy h:mm:ss a tz(Asia/Tokyo)", 1, TimeUnit.HOURS,
-        com.linkedin.pinot.common.data.DateTimeFieldSpec.TimeFormat.SIMPLE_DATE_FORMAT,
+        org.apache.pinot.common.data.DateTimeFieldSpec.TimeFormat.SIMPLE_DATE_FORMAT,
         "M/d/yyyy h:mm:ss a", DateTimeZone.forTimeZone(TimeZone.getTimeZone("Asia/Tokyo"))
     });
     return entries.toArray(new Object[entries.size()][]);
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 fd81303..f9146d6 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+package org.apache.pinot.common.data;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
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 87efe6a..44dd161 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+package org.apache.pinot.common.data;
 
-import com.linkedin.pinot.common.utils.JsonUtils;
+import org.apache.pinot.common.utils.JsonUtils;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
@@ -29,7 +29,7 @@ import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import static com.linkedin.pinot.common.data.FieldSpec.DataType.*;
+import static org.apache.pinot.common.data.FieldSpec.DataType.*;
 
 
 /**
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 9889d3a..59623c6 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.data;
+package org.apache.pinot.common.data;
 
-import com.linkedin.pinot.common.data.TimeGranularitySpec.TimeFormat;
-import com.linkedin.pinot.common.utils.SchemaUtils;
+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;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/http/MultiGetRequestTest.java b/pinot-common/src/test/java/org/apache/pinot/common/http/MultiGetRequestTest.java
index 995819a..9c97f86 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/http/MultiGetRequestTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/http/MultiGetRequestTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.http;
+package org.apache.pinot.common.http;
 
 import com.google.common.base.Throwables;
 import com.sun.net.httpserver.HttpExchange;
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 997e6a7..780e5b4 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
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.lineage;
+package org.apache.pinot.common.lineage;
 
-import com.linkedin.pinot.common.exception.InvalidConfigException;
+import org.apache.pinot.common.exception.InvalidConfigException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
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 5d95bdd..9771a1b 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metadata;
+package org.apache.pinot.common.metadata;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -25,7 +25,7 @@ import org.apache.helix.ZNRecord;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import com.linkedin.pinot.common.metadata.instance.InstanceZKMetadata;
+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 539464a..17c2692 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
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metadata;
+package org.apache.pinot.common.metadata;
 
-import com.linkedin.pinot.common.data.DateTimeFieldSpec;
-import com.linkedin.pinot.common.data.DimensionFieldSpec;
-import com.linkedin.pinot.common.data.MetricFieldSpec;
-import com.linkedin.pinot.common.data.Schema;
-import com.linkedin.pinot.common.data.TimeFieldSpec;
-import com.linkedin.pinot.common.metadata.instance.InstanceZKMetadata;
-import com.linkedin.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
-import com.linkedin.pinot.common.metadata.segment.RealtimeSegmentZKMetadata;
-import com.linkedin.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.common.data.DateTimeFieldSpec;
+import org.apache.pinot.common.data.DimensionFieldSpec;
+import org.apache.pinot.common.data.MetricFieldSpec;
+import org.apache.pinot.common.data.Schema;
+import org.apache.pinot.common.data.TimeFieldSpec;
+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 f10bf17..2ffacdb 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metadata;
+package org.apache.pinot.common.metadata;
 
 import java.util.Arrays;
 import java.util.List;
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 572f8d4..f9b51d9 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
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metadata;
-
-import com.linkedin.pinot.common.metadata.segment.ColumnPartitionMetadata;
-import com.linkedin.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
-import com.linkedin.pinot.common.metadata.segment.RealtimeSegmentZKMetadata;
-import com.linkedin.pinot.common.metadata.segment.SegmentPartitionMetadata;
-import com.linkedin.pinot.common.metadata.segment.SegmentZKMetadata;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.CommonConstants.Segment.Realtime.Status;
-import com.linkedin.pinot.common.utils.CommonConstants.Segment.SegmentType;
+package org.apache.pinot.common.metadata;
+
+import org.apache.pinot.common.metadata.segment.ColumnPartitionMetadata;
+import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
+import org.apache.pinot.common.metadata.segment.RealtimeSegmentZKMetadata;
+import org.apache.pinot.common.metadata.segment.SegmentPartitionMetadata;
+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;
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 00b4445..7362ef8 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.metrics;
+package org.apache.pinot.common.metrics;
 
 import com.yammer.metrics.core.MetricName;
 import com.yammer.metrics.core.MetricsRegistry;
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 b012dfc..dc659ef 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
@@ -16,18 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.partition;
+package org.apache.pinot.common.partition;
 
 import com.google.common.collect.Lists;
-import com.linkedin.pinot.common.config.TableNameBuilder;
-import com.linkedin.pinot.common.utils.LLCSegmentName;
+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 static com.linkedin.pinot.common.utils.CommonConstants.Helix.StateModel.RealtimeSegmentOnlineOfflineStateModel.*;
+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 98ca98d..d1f72ca 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
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.partition;
+package org.apache.pinot.common.partition;
 
 import com.google.common.collect.Lists;
-import com.linkedin.pinot.common.config.SegmentsValidationAndRetentionConfig;
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.config.TenantConfig;
-import com.linkedin.pinot.common.utils.LLCSegmentName;
+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;
@@ -317,4 +317,4 @@ public class StreamPartitionAssignmentGeneratorTest {
       _consumingInstances = consumingInstances;
     }
   }
-}
\ No newline at end of file
+}
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 8f0d583..801132a 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.query.gen;
+package org.apache.pinot.common.query.gen;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -42,7 +42,7 @@ import org.apache.avro.util.Utf8;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.Predicate;
 
-import com.linkedin.pinot.common.data.FieldSpec.DataType;
+import org.apache.pinot.common.data.FieldSpec.DataType;
 
 public class AvroQueryGenerator {
 
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/request/transform/TransformExpressionTreeTest.java b/pinot-common/src/test/java/org/apache/pinot/common/request/transform/TransformExpressionTreeTest.java
index 5d2ed67..820264f 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/request/transform/TransformExpressionTreeTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/request/transform/TransformExpressionTreeTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.request.transform;
+package org.apache.pinot.common.request.transform;
 
 import java.util.List;
 import org.testng.Assert;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/segment/fetcher/SegmentFetcherFactoryTest.java b/pinot-common/src/test/java/org/apache/pinot/common/segment/fetcher/SegmentFetcherFactoryTest.java
index 1c12feb..f43732d 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/segment/fetcher/SegmentFetcherFactoryTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/segment/fetcher/SegmentFetcherFactoryTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.segment.fetcher;
+package org.apache.pinot.common.segment.fetcher;
 
 import java.io.File;
 import java.lang.reflect.Constructor;
@@ -108,4 +108,4 @@ public class SegmentFetcherFactoryTest {
       return Collections.emptySet();
     }
   }
-}
\ No newline at end of file
+}
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 f5e5b86..ce25a70 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
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
-import com.linkedin.pinot.common.data.FieldSpec;
+import org.apache.pinot.common.data.FieldSpec;
 import java.util.Arrays;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import static com.linkedin.pinot.common.utils.DataSchema.ColumnDataType.*;
+import static org.apache.pinot.common.utils.DataSchema.ColumnDataType.*;
 
 
 public class DataSchemaTest {
@@ -178,4 +178,4 @@ public class DataSchemaTest {
     Assert.assertEquals(fromDataType(FieldSpec.DataType.STRING, true), STRING);
     Assert.assertEquals(fromDataType(FieldSpec.DataType.STRING, false), STRING_ARRAY);
   }
-}
\ No newline at end of file
+}
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/DataSizeTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/DataSizeTest.java
index 964a8de..5241d59 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/utils/DataSizeTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/DataSizeTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/EqualityUtilsTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/EqualityUtilsTest.java
index 5f779a3..f1410b5 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/utils/EqualityUtilsTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/EqualityUtilsTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
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 53e882a..3e5fe2f 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.linkedin.pinot.common.utils.FileUploadDownloadClient.FileUploadType;
+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;
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 a1f0b22..8e5ae73 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import java.util.Arrays;
 import org.testng.Assert;
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/ServiceStatusTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/ServiceStatusTest.java
index e1db99f..a96d015 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/utils/ServiceStatusTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/ServiceStatusTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import com.google.common.collect.ImmutableList;
 import java.util.Collections;
@@ -217,4 +217,4 @@ public class ServiceStatusTest {
       _externalView = externalView;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/StringUtilTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/StringUtilTest.java
index 769bbe5..62e0671 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/utils/StringUtilTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/StringUtilTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import org.testng.annotations.Test;
 
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/TarGzCompressionUtilsTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/TarGzCompressionUtilsTest.java
index d63f178..23d83ab 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/utils/TarGzCompressionUtilsTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/TarGzCompressionUtilsTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
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 17adc03..254b073 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils;
+package org.apache.pinot.common.utils;
 
-import com.linkedin.pinot.common.Utils;
-import com.linkedin.pinot.common.utils.time.TimeUtils;
+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/retry/RetryPolicyTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/retry/RetryPolicyTest.java
index 5bd4ef7..5216342 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/utils/retry/RetryPolicyTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/retry/RetryPolicyTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.retry;
+package org.apache.pinot.common.utils.retry;
 
 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 ade7572..a6db55c 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
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.common.utils.time;
+package org.apache.pinot.common.utils.time;
 
-import com.linkedin.pinot.common.data.FieldSpec;
-import com.linkedin.pinot.common.data.TimeGranularitySpec;
+import org.apache.pinot.common.data.FieldSpec;
+import org.apache.pinot.common.data.TimeGranularitySpec;
 import java.util.concurrent.TimeUnit;
 import org.testng.annotations.Test;
 
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 d1b8319..d01ae6f 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
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.pql.parsers;
-
-import com.linkedin.pinot.common.request.AggregationInfo;
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.request.FilterOperator;
-import com.linkedin.pinot.common.request.GroupBy;
-import com.linkedin.pinot.common.request.transform.TransformExpressionTree;
-import com.linkedin.pinot.pql.parsers.pql2.ast.TopAstNode;
+package org.apache.pinot.pql.parsers;
+
+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;
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 4df372b..a5db9d6 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.request;
+package org.apache.pinot.request;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,18 +26,18 @@ import org.apache.thrift.TSerializer;
 import org.apache.thrift.protocol.TCompactProtocol;
 import org.testng.annotations.Test;
 
-import com.linkedin.pinot.common.metrics.MetricsHelper;
-import com.linkedin.pinot.common.metrics.MetricsHelper.TimerContext;
-import com.linkedin.pinot.common.request.AggregationInfo;
-import com.linkedin.pinot.common.request.BrokerRequest;
-import com.linkedin.pinot.common.request.FilterOperator;
-import com.linkedin.pinot.common.request.FilterQuery;
-import com.linkedin.pinot.common.request.FilterQueryMap;
-import com.linkedin.pinot.common.request.GroupBy;
-import com.linkedin.pinot.common.request.QuerySource;
-import com.linkedin.pinot.common.request.QueryType;
-import com.linkedin.pinot.common.request.Selection;
-import com.linkedin.pinot.common.request.SelectionSort;
+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;
+import org.apache.pinot.common.request.FilterQuery;
+import org.apache.pinot.common.request.FilterQueryMap;
+import org.apache.pinot.common.request.GroupBy;
+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;
 
 
 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 4635384..256bcc4 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.request;
+package org.apache.pinot.request;
 
-import com.linkedin.pinot.common.exception.QueryException;
-import com.linkedin.pinot.common.response.broker.BrokerResponseNative;
-import com.linkedin.pinot.common.response.broker.QueryProcessingException;
+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-common/src/test/resources/log4j.properties b/pinot-common/src/test/resources/log4j.properties
index 0453d9d..9f399d0 100644
--- a/pinot-common/src/test/resources/log4j.properties
+++ b/pinot-common/src/test/resources/log4j.properties
@@ -15,7 +15,7 @@
 #
 
 log4j.rootLogger=WARN, stdout
-log4j.logger.com.linkedin.pinot=WARN
+log4j.logger.org.apache.pinot=WARN
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.Target=System.out
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
diff --git a/pinot-common/src/test/resources/test-table-config.conf b/pinot-common/src/test/resources/test-table-config.conf
index a1977fa..3693e11 100644
--- a/pinot-common/src/test/resources/test-table-config.conf
+++ b/pinot-common/src/test/resources/test-table-config.conf
@@ -29,4 +29,4 @@ table {
     frequency: daily
     type: refresh
   }
-}
\ No newline at end of file
+}
diff --git a/pinot-common/src/thrift/request.thrift b/pinot-common/src/thrift/request.thrift
index ae09a3f..8108991 100644
--- a/pinot-common/src/thrift/request.thrift
+++ b/pinot-common/src/thrift/request.thrift
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-namespace java com.linkedin.pinot.common.request
+namespace java org.apache.pinot.common.request
 
 /**
  * AUTO GENERATED: DO NOT EDIT
diff --git a/pinot-common/src/thrift/response.thrift b/pinot-common/src/thrift/response.thrift
index 467cd04..57a32e5 100644
--- a/pinot-common/src/thrift/response.thrift
+++ b/pinot-common/src/thrift/response.thrift
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-namespace java com.linkedin.pinot.common.response
+namespace java org.apache.pinot.common.response
 
 /**
  * Processing exception
diff --git a/pinot-controller/pom.xml b/pinot-controller/pom.xml
index ddb45db..ff04e68 100644
--- a/pinot-controller/pom.xml
+++ b/pinot-controller/pom.xml
@@ -24,11 +24,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>pinot</artifactId>
-    <groupId>com.linkedin.pinot</groupId>
+    <groupId>org.apache.pinot</groupId>
     <version>0.016</version>
   </parent>
 
-  <groupId>com.linkedin.pinot</groupId>
+  <groupId>org.apache.pinot</groupId>
   <artifactId>pinot-controller</artifactId>
   <version>0.016</version>
   <name>pinot-controller</name>
@@ -61,21 +61,21 @@
   </profiles>
   <dependencies>
     <dependency>
-      <groupId>com.linkedin.pinot</groupId>
+      <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.linkedin.pinot</groupId>
+      <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.linkedin.pinot</groupId>
+      <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-core</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>com.linkedin.pinot</groupId>
+      <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-server</artifactId>
       <scope>test</scope>
       <exclusions>
@@ -91,7 +91,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.linkedin.pinot</groupId>
+      <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-common</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
@@ -220,7 +220,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>com.linkedin.pinot</groupId>
+      <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-filesystem</artifactId>
     </dependency>
   </dependencies>
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 863f3cc..0651e4d 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
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.controller;
+package org.apache.pinot.controller;
 
-import com.linkedin.pinot.common.protocols.SegmentCompletionProtocol;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.StringUtil;
-import com.linkedin.pinot.filesystem.LocalPinotFS;
+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;
@@ -116,7 +116,7 @@ public class ControllerConf extends PropertiesConfiguration {
   private static final boolean DEFAULT_ENABLE_SPLIT_COMMIT = false;
   private static final int DEFAULT_JERSEY_ADMIN_PORT = 21000;
   private static final String DEFAULT_ACCESS_CONTROL_FACTORY_CLASS =
-      "com.linkedin.pinot.controller.api.access.AllowAllAccessFactory";
+      "org.apache.pinot.controller.api.access.AllowAllAccessFactory";
   private static final long DEFAULT_SEGMENT_UPLOAD_TIMEOUT_IN_MILLIS = 600_000L; // 10 minutes
   private static final int DEFAULT_REALTIME_SEGMENT_METADATA_COMMIT_NUMLOCKS = 64;
   private static final boolean DEFAULT_ENABLE_STORAGE_QUOTA_CHECK = true;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerLeadershipManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerLeadershipManager.java
index 61fa7b5..ed6b71f 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerLeadershipManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerLeadershipManager.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.controller;
+package org.apache.pinot.controller;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
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 2bca8ae..0dd7dfa 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
@@ -16,37 +16,37 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.controller;
+package org.apache.pinot.controller;
 
 import com.google.common.primitives.Longs;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.linkedin.pinot.common.Utils;
-import com.linkedin.pinot.common.metrics.ControllerMeter;
-import com.linkedin.pinot.common.metrics.ControllerMetrics;
-import com.linkedin.pinot.common.metrics.MetricsHelper;
-import com.linkedin.pinot.common.metrics.ValidationMetrics;
-import com.linkedin.pinot.common.segment.fetcher.SegmentFetcherFactory;
-import com.linkedin.pinot.common.utils.CommonConstants;
-import com.linkedin.pinot.common.utils.ServiceStatus;
-import com.linkedin.pinot.controller.api.ControllerAdminApiApplication;
-import com.linkedin.pinot.controller.api.access.AccessControlFactory;
-import com.linkedin.pinot.controller.api.events.MetadataEventNotifierFactory;
-import com.linkedin.pinot.controller.helix.SegmentStatusChecker;
-import com.linkedin.pinot.controller.helix.core.PinotHelixResourceManager;
-import com.linkedin.pinot.controller.helix.core.minion.PinotHelixTaskResourceManager;
-import com.linkedin.pinot.controller.helix.core.minion.PinotTaskManager;
-import com.linkedin.pinot.controller.helix.core.periodictask.ControllerPeriodicTaskScheduler;
-import com.linkedin.pinot.controller.helix.core.realtime.PinotLLCRealtimeSegmentManager;
-import com.linkedin.pinot.controller.helix.core.realtime.PinotRealtimeSegmentManager;
-import com.linkedin.pinot.controller.helix.core.rebalance.RebalanceSegmentStrategyFactory;
-import com.linkedin.pinot.controller.helix.core.relocation.RealtimeSegmentRelocator;
-import com.linkedin.pinot.controller.helix.core.retention.RetentionManager;
-import com.linkedin.pinot.controller.validation.BrokerResourceValidationManager;
-import com.linkedin.pinot.controller.validation.OfflineSegmentIntervalChecker;
-import com.linkedin.pinot.controller.validation.RealtimeSegmentValidationManager;
-import com.linkedin.pinot.core.crypt.PinotCrypterFactory;
-import com.linkedin.pinot.core.periodictask.PeriodicTask;
-import com.linkedin.pinot.filesystem.PinotFSFactory;
+import org.apache.pinot.common.Utils;
+import org.apache.pinot.common.metrics.ControllerMeter;
+import org.apache.pinot.common.metrics.ControllerMetrics;
+import org.apache.pinot.common.metrics.MetricsHelper;
+import org.apache.pinot.common.metrics.ValidationMetrics;
+import org.apache.pinot.common.segment.fetcher.SegmentFetcherFactory;
+import org.apache.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.ServiceStatus;
+import org.apache.pinot.controller.api.ControllerAdminApiApplication;
+import org.apache.pinot.controller.api.access.AccessControlFactory;
+import org.apache.pinot.controller.api.events.MetadataEventNotifierFactory;
+import org.apache.pinot.controller.helix.SegmentStatusChecker;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
+import org.apache.pinot.controller.helix.core.minion.PinotHelixTaskResourceManager;
+import org.apache.pinot.controller.helix.core.minion.PinotTaskManager;
+import org.apache.pinot.controller.helix.core.periodictask.ControllerPeriodicTaskScheduler;
+import org.apache.pinot.controller.helix.core.realtime.PinotLLCRealtimeSegmentManager;
+import org.apache.pinot.controller.helix.core.realtime.PinotRealtimeSegmentManager;
+import org.apache.pinot.controller.helix.core.rebalance.RebalanceSegmentStrategyFactory;
+import org.apache.pinot.controller.helix.core.relocation.RealtimeSegmentRelocator;
+import org.apache.pinot.controller.helix.core.retention.RetentionManager;
+import org.apache.pinot.controller.validation.BrokerResourceValidationManager;
+import org.apache.pinot.controller.validation.OfflineSegmentIntervalChecker;
+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;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/LeadershipChangeSubscriber.java b/pinot-controller/src/main/java/org/apache/pinot/controller/LeadershipChangeSubscriber.java
index 508b314..d2c646f 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/LeadershipChangeSubscriber.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/LeadershipChangeSubscriber.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.controller;
+package org.apache.pinot.controller;
 
 /**
  * Interface for a subscriber to the {@link ControllerLeadershipManager}
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/CallableHttpGet.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/CallableHttpGet.java
index 7c71387..98c064c 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/CallableHttpGet.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/CallableHttpGet.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.controller.api;
+package org.apache.pinot.controller.api;
 
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.GetMethod;
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 bdf2dba..48fcc03 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.controller.api;
+package org.apache.pinot.controller.api;
 
 import java.io.IOException;
 import java.net.URI;
@@ -44,7 +44,7 @@ public class ControllerAdminApiApplication extends ResourceConfig {
   private HttpServer httpServer;
   private URI baseUri;
   private boolean started = false;
-  private static final String RESOURCE_PACKAGE = "com.linkedin.pinot.controller.api.resources";
+  private static final String RESOURCE_PACKAGE = "org.apache.pinot.controller.api.resources";
   private static String CONSOLE_WEB_PATH;
   private final boolean _useHttps;
 
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/AccessControl.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/AccessControl.java
index 1de4eb1..7e8b161 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/AccessControl.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/AccessControl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.controller.api.access;
+package org.apache.pinot.controller.api.access;
 
 import javax.ws.rs.core.HttpHeaders;
 
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/AccessControlFactory.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/AccessControlFactory.java
index 69998ba..12020f1 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/AccessControlFactory.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/AccessControlFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.controller.api.access;
+package org.apache.pinot.controller.api.access;
 
 public interface AccessControlFactory {
 
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/AllowAllAccessFactory.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/AllowAllAccessFactory.java
index a3e9a0d..eca054a 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/AllowAllAccessFactory.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/AllowAllAccessFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.controller.api.access;
+package org.apache.pinot.controller.api.access;
 
 import javax.ws.rs.core.HttpHeaders;
 
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/DefaultMetadataEventNotifier.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/DefaultMetadataEventNotifier.java
index ce50b23..4bfa393 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/DefaultMetadataEventNotifier.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/DefaultMetadataEventNotifier.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.controller.api.events;
+package org.apache.pinot.controller.api.events;
 
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.data.Schema;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.data.Schema;
 
 public class DefaultMetadataEventNotifier implements MetadataEventNotifier {
   public void notifyOnSchemaEvents(Schema schema, SchemaEventType eventType) {
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/DefaultMetadataEventNotifierFactory.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/DefaultMetadataEventNotifierFactory.java
index 6219f7a..b23333a 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/DefaultMetadataEventNotifierFactory.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/DefaultMetadataEventNotifierFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.controller.api.events;
+package org.apache.pinot.controller.api.events;
 
 import org.apache.commons.configuration.Configuration;
 
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/MetadataEventNotifier.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/MetadataEventNotifier.java
index fdfc372..f31ab76 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/MetadataEventNotifier.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/MetadataEventNotifier.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.controller.api.events;
+package org.apache.pinot.controller.api.events;
 
-import com.linkedin.pinot.common.config.TableConfig;
-import com.linkedin.pinot.common.data.Schema;
+import org.apache.pinot.common.config.TableConfig;
+import org.apache.pinot.common.data.Schema;
 
 public interface MetadataEventNotifier {
   void notifyOnSchemaEvents(Schema schema, SchemaEventType eventType);
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/MetadataEventNotifierFactory.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/MetadataEventNotifierFactory.java
index 41a153a..6f3ff4b 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/MetadataEventNotifierFactory.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/MetadataEventNotifierFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.controller.api.events;
+package org.apache.pinot.controller.api.events;
 
 import org.apache.commons.configuration.Configuration;
 import org.slf4j.Logger;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/SchemaEventType.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/SchemaEventType.java
index 1b76558..2396787 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/SchemaEventType.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/SchemaEventType.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.controller.api.events;
+package org.apache.pinot.controller.api.events;
 
 public enum SchemaEventType {
   CREATE, UPDATE, DELETE
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 5f0a174..315bf18 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.controller.api.pojos;
+package org.apache.pinot.controller.api.pojos;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.linkedin.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.CommonConstants;
 import org.apache.helix.model.InstanceConfig;
 
 
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 f7e24d1..1fa232a 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
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.controller.api.resources;
+package org.apache.pinot.controller.api.resources;
 
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
-import com.linkedin.pinot.common.utils.CommonConstants;
+import org.apache.pinot.common.utils.CommonConstants;
 import javax.ws.rs.WebApplicationException;
 
 
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ControllerApplicationException.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ControllerApplicationException.java
index 4c2e2e6..e559551 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ControllerApplicationException.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ControllerApplicationException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.controller.api.resources;
+package org.apache.pinot.controller.api.resources;
 
 import javax.annotation.Nullable;
 import javax.ws.rs.WebApplicationException;
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 286fe2b..4021b6a 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.linkedin.pinot.controller.api.resources;
+package org.apache.pinot.controller.api.resources;
 
... 30846 lines suppressed ...


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org