This is an automated email from the ASF dual-hosted git repository. jlli pushed a commit to branch helix-1.0 in repository https://gitbox.apache.org/repos/asf/pinot.git
commit 68c0c953c5af47f8b191d6948a6d551d98ce77a5 Author: Jack Li(Analytics Engineering) <[email protected]> AuthorDate: Tue Mar 8 22:07:25 2022 -0800 Upgrade Helix to 1.0.2 --- .../broker/broker/helix/BaseBrokerStarter.java | 2 +- ...okerResourceOnlineOfflineStateModelFactory.java | 2 +- .../HelixExternalViewBasedQueryQuotaManager.java | 4 ++-- .../pinot/broker/routing/RoutingManager.java | 2 +- .../SegmentLineageBasedSegmentPreSelector.java | 2 +- .../SegmentPreSelectorFactory.java | 2 +- .../routing/segmentpruner/EmptySegmentPruner.java | 2 +- .../segmentpruner/PartitionSegmentPruner.java | 2 +- .../segmentpruner/SegmentPrunerFactory.java | 2 +- .../routing/segmentpruner/TimeSegmentPruner.java | 2 +- .../routing/timeboundary/TimeBoundaryManager.java | 2 +- ...elixExternalViewBasedQueryQuotaManagerTest.java | 6 ++--- .../segmentpreselector/SegmentPreSelectorTest.java | 2 +- .../routing/segmentpruner/SegmentPrunerTest.java | 2 +- .../timeboundary/TimeBoundaryManagerTest.java | 2 +- .../pinot/broker/util/FakePropertyStore.java | 4 ++-- .../common/assignment/InstancePartitions.java | 2 +- .../common/assignment/InstancePartitionsUtils.java | 4 ++-- .../pinot/common/config/provider/TableCache.java | 6 ++--- .../pinot/common/lineage/SegmentLineage.java | 2 +- .../common/lineage/SegmentLineageAccessHelper.java | 4 ++-- .../messages/RoutingTableRebuildMessage.java | 2 +- .../common/messages/RunPeriodicTaskMessage.java | 2 +- .../common/messages/SegmentRefreshMessage.java | 2 +- .../common/messages/SegmentReloadMessage.java | 2 +- .../common/messages/TableConfigRefreshMessage.java | 2 +- .../apache/pinot/common/metadata/ZKMetadata.java | 2 +- .../pinot/common/metadata/ZKMetadataProvider.java | 4 ++-- .../metadata/instance/InstanceZKMetadata.java | 2 +- .../common/metadata/segment/SegmentZKMetadata.java | 2 +- .../pinot/common/minion/BaseTaskMetadata.java | 2 +- .../common/minion/MergeRollupTaskMetadata.java | 2 +- .../common/minion/MinionTaskMetadataUtils.java | 4 ++-- .../RealtimeToOfflineSegmentsTaskMetadata.java | 2 +- .../org/apache/pinot/common/utils/SchemaUtils.java | 2 +- .../pinot/common/utils/ServiceStartableUtils.java | 26 +++++++++++++++------- .../org/apache/pinot/common/utils/ZkStarter.java | 2 +- .../pinot/common/utils/config/InstanceUtils.java | 2 +- .../common/utils/config/TableConfigUtils.java | 2 +- .../pinot/common/utils/helix/HelixHelper.java | 4 ++-- .../PinotHelixPropertyStoreZnRecordProvider.java | 2 +- .../pinot/common/lineage/SegmentLineageTest.java | 2 +- .../common/metadata/InstanceZKMetadataTest.java | 2 +- .../pinot/common/metadata/MetadataUtils.java | 2 +- .../RealtimeToOfflineSegmentsTaskMetadataTest.java | 2 +- .../common/metadata/SegmentZKMetadataTest.java | 2 +- .../common/minion/MinionTaskMetadataUtilsTest.java | 4 ++-- .../pinot/common/tier/TierSegmentSelectorTest.java | 2 +- .../common/utils/config/InstanceUtilsTest.java | 2 +- .../api/resources/PinotSegmentRestletResource.java | 2 +- .../api/resources/PinotTableRestletResource.java | 2 +- .../api/resources/ZookeeperResource.java | 2 +- .../pinot/controller/api/upload/ZKOperator.java | 2 +- ...erResourceOnlineOfflineStateModelGenerator.java | 2 +- .../helix/core/PinotHelixResourceManager.java | 2 +- ...lixSegmentOnlineOfflineStateModelGenerator.java | 2 +- .../helix/core/PinotTableIdealStateBuilder.java | 2 +- .../helix/core/SegmentDeletionManager.java | 2 +- .../helix/core/minion/ClusterInfoAccessor.java | 2 +- .../helix/core/minion/PinotTaskManager.java | 2 +- .../core/minion/TableTaskSchedulerUpdater.java | 2 +- .../helix/core/minion/TaskTypeMetricsUpdater.java | 2 +- .../realtime/PinotLLCRealtimeSegmentManager.java | 2 +- .../core/realtime/PinotRealtimeSegmentManager.java | 6 ++--- .../helix/core/rebalance/TableRebalancer.java | 2 +- .../helix/core/retention/RetentionManager.java | 2 +- .../helix/core/util/HelixSetupUtils.java | 5 +++-- .../controller/util/AutoAddInvertedIndex.java | 2 +- .../controller/util/TableRetentionValidator.java | 2 +- .../pinot/controller/ControllerTestUtils.java | 2 +- .../pinot/controller/helix/ControllerTest.java | 2 +- .../controller/helix/SegmentStatusCheckerTest.java | 2 +- .../helix/core/PinotHelixResourceManagerTest.java | 4 ++-- .../OfflineDimTableSegmentAssignmentTest.java | 2 +- .../OfflineReplicaGroupSegmentAssignmentTest.java | 2 +- .../PinotLLCRealtimeSegmentManagerTest.java | 2 +- .../core/util/SegmentDeletionManagerTest.java | 2 +- .../core/data/manager/BaseTableDataManager.java | 2 +- .../core/data/manager/InstanceDataManager.java | 2 +- .../manager/offline/TableDataManagerProvider.java | 2 +- .../offline/DimensionTableDataManagerTest.java | 2 +- ...fflineSegmentsMinionClusterIntegrationTest.java | 2 +- .../org/apache/pinot/minion/MinionContext.java | 2 +- .../executor/MinionTaskZkMetadataManager.java | 2 +- .../apache/pinot/perf/BenchmarkQueryEngine.java | 6 ++--- .../mergerollup/MergeRollupTaskGenerator.java | 2 +- .../RealtimeToOfflineSegmentsTaskExecutor.java | 2 +- .../RealtimeToOfflineSegmentsTaskGenerator.java | 2 +- .../mergerollup/MergeRollupTaskExecutorTest.java | 2 +- .../minion/tasks/purge/PurgeTaskExecutorTest.java | 2 +- .../RealtimeToOfflineSegmentsTaskExecutorTest.java | 2 +- .../local/data/manager/TableDataManager.java | 2 +- .../starter/ServerQueriesDisabledTracker.java | 2 +- .../server/starter/helix/BaseServerStarter.java | 2 +- .../starter/helix/HelixInstanceDataManager.java | 2 +- .../org/apache/pinot/tools/PinotZKChanger.java | 2 +- .../org/apache/pinot/tools/UpdateSegmentState.java | 2 +- .../tools/admin/command/MoveReplicaGroup.java | 2 +- .../OfflineSegmentIntervalCheckerCommand.java | 2 +- .../admin/command/ShowClusterInfoCommand.java | 2 +- .../tools/admin/command/ValidateConfigCommand.java | 2 +- pom.xml | 2 +- 102 files changed, 138 insertions(+), 127 deletions(-) diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java index 3db3f88..d1331cd 100644 --- a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java +++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java @@ -32,11 +32,11 @@ import org.apache.helix.HelixManager; import org.apache.helix.HelixManagerFactory; import org.apache.helix.InstanceType; import org.apache.helix.SystemPropertyKeys; -import org.apache.helix.ZNRecord; import org.apache.helix.model.IdealState; import org.apache.helix.model.InstanceConfig; import org.apache.helix.model.Message; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.broker.broker.AccessControlFactory; import org.apache.pinot.broker.broker.BrokerAdminApiApplication; import org.apache.pinot.broker.queryquota.HelixExternalViewBasedQueryQuotaManager; 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 6250d1b..700144e 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 @@ -20,13 +20,13 @@ package org.apache.pinot.broker.broker.helix; import org.apache.helix.HelixDataAccessor; import org.apache.helix.NotificationContext; -import org.apache.helix.ZNRecord; import org.apache.helix.model.Message; import org.apache.helix.participant.statemachine.StateModel; import org.apache.helix.participant.statemachine.StateModelFactory; import org.apache.helix.participant.statemachine.StateModelInfo; import org.apache.helix.participant.statemachine.Transition; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.broker.queryquota.HelixExternalViewBasedQueryQuotaManager; import org.apache.pinot.broker.routing.RoutingManager; import org.apache.pinot.common.metadata.ZKMetadataProvider; diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/queryquota/HelixExternalViewBasedQueryQuotaManager.java b/pinot-broker/src/main/java/org/apache/pinot/broker/queryquota/HelixExternalViewBasedQueryQuotaManager.java index 67df9c6..04db0f6 100644 --- a/pinot-broker/src/main/java/org/apache/pinot/broker/queryquota/HelixExternalViewBasedQueryQuotaManager.java +++ b/pinot-broker/src/main/java/org/apache/pinot/broker/queryquota/HelixExternalViewBasedQueryQuotaManager.java @@ -25,13 +25,13 @@ import java.util.Iterator; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import org.I0Itec.zkclient.exception.ZkNoNodeException; import org.apache.helix.AccessOption; import org.apache.helix.HelixConstants; import org.apache.helix.HelixManager; -import org.apache.helix.ZNRecord; import org.apache.helix.model.ExternalView; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; +import org.apache.helix.zookeeper.zkclient.exception.ZkNoNodeException; import org.apache.pinot.broker.broker.helix.ClusterChangeHandler; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.metrics.BrokerGauge; diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/RoutingManager.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/RoutingManager.java index ef97aee..7152ad6 100644 --- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/RoutingManager.java +++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/RoutingManager.java @@ -33,11 +33,11 @@ import org.apache.helix.BaseDataAccessor; import org.apache.helix.HelixConstants.ChangeType; import org.apache.helix.HelixDataAccessor; import org.apache.helix.HelixManager; -import org.apache.helix.ZNRecord; import org.apache.helix.model.ExternalView; import org.apache.helix.model.IdealState; import org.apache.helix.model.InstanceConfig; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.broker.broker.helix.ClusterChangeHandler; import org.apache.pinot.broker.routing.instanceselector.InstanceSelector; import org.apache.pinot.broker.routing.instanceselector.InstanceSelectorFactory; diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpreselector/SegmentLineageBasedSegmentPreSelector.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpreselector/SegmentLineageBasedSegmentPreSelector.java index b9b4092..c6dfd83 100644 --- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpreselector/SegmentLineageBasedSegmentPreSelector.java +++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpreselector/SegmentLineageBasedSegmentPreSelector.java @@ -19,8 +19,8 @@ package org.apache.pinot.broker.routing.segmentpreselector; import java.util.Set; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.lineage.SegmentLineage; import org.apache.pinot.common.lineage.SegmentLineageAccessHelper; import org.apache.pinot.common.lineage.SegmentLineageUtils; diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpreselector/SegmentPreSelectorFactory.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpreselector/SegmentPreSelectorFactory.java index 5385870..7aa20d2 100644 --- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpreselector/SegmentPreSelectorFactory.java +++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpreselector/SegmentPreSelectorFactory.java @@ -18,8 +18,8 @@ */ package org.apache.pinot.broker.routing.segmentpreselector; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.spi.config.table.TableConfig; diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/EmptySegmentPruner.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/EmptySegmentPruner.java index 6e55fd0..7a7b66b 100644 --- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/EmptySegmentPruner.java +++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/EmptySegmentPruner.java @@ -25,10 +25,10 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import javax.annotation.Nullable; import org.apache.helix.AccessOption; -import org.apache.helix.ZNRecord; import org.apache.helix.model.ExternalView; import org.apache.helix.model.IdealState; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.request.BrokerRequest; import org.apache.pinot.spi.config.table.TableConfig; diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/PartitionSegmentPruner.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/PartitionSegmentPruner.java index 8775589..6495edd 100644 --- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/PartitionSegmentPruner.java +++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/PartitionSegmentPruner.java @@ -26,10 +26,10 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import javax.annotation.Nullable; import org.apache.helix.AccessOption; -import org.apache.helix.ZNRecord; import org.apache.helix.model.ExternalView; import org.apache.helix.model.IdealState; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.metadata.segment.SegmentPartitionMetadata; import org.apache.pinot.common.request.BrokerRequest; diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/SegmentPrunerFactory.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/SegmentPrunerFactory.java index b5adeba..0c11b0a 100644 --- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/SegmentPrunerFactory.java +++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/SegmentPrunerFactory.java @@ -22,8 +22,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import javax.annotation.Nullable; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.segment.local.utils.TableConfigUtils; import org.apache.pinot.spi.config.table.ColumnPartitionConfig; import org.apache.pinot.spi.config.table.RoutingConfig; diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/TimeSegmentPruner.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/TimeSegmentPruner.java index e84dabc..5ed1b7f 100644 --- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/TimeSegmentPruner.java +++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/TimeSegmentPruner.java @@ -30,10 +30,10 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Nullable; import org.apache.commons.lang3.StringUtils; import org.apache.helix.AccessOption; -import org.apache.helix.ZNRecord; import org.apache.helix.model.ExternalView; import org.apache.helix.model.IdealState; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.broker.routing.segmentpruner.interval.Interval; import org.apache.pinot.broker.routing.segmentpruner.interval.IntervalTree; import org.apache.pinot.common.metadata.ZKMetadataProvider; diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/timeboundary/TimeBoundaryManager.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/timeboundary/TimeBoundaryManager.java index e781443..6d8a25b 100644 --- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/timeboundary/TimeBoundaryManager.java +++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/timeboundary/TimeBoundaryManager.java @@ -27,10 +27,10 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import javax.annotation.Nullable; import org.apache.helix.AccessOption; -import org.apache.helix.ZNRecord; import org.apache.helix.model.ExternalView; import org.apache.helix.model.IdealState; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.broker.routing.segmentpreselector.SegmentPreSelector; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.spi.config.table.TableConfig; diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/queryquota/HelixExternalViewBasedQueryQuotaManagerTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/queryquota/HelixExternalViewBasedQueryQuotaManagerTest.java index 479ffcd..fa1bcfb 100644 --- a/pinot-broker/src/test/java/org/apache/pinot/broker/queryquota/HelixExternalViewBasedQueryQuotaManagerTest.java +++ b/pinot-broker/src/test/java/org/apache/pinot/broker/queryquota/HelixExternalViewBasedQueryQuotaManagerTest.java @@ -25,16 +25,16 @@ import org.apache.commons.lang.StringUtils; import org.apache.helix.HelixAdmin; import org.apache.helix.HelixManager; import org.apache.helix.InstanceType; -import org.apache.helix.ZNRecord; import org.apache.helix.manager.zk.ZKHelixAdmin; import org.apache.helix.manager.zk.ZKHelixManager; import org.apache.helix.manager.zk.ZNRecordSerializer; import org.apache.helix.manager.zk.ZkBaseDataAccessor; import org.apache.helix.manager.zk.ZkClient; -import org.apache.helix.manager.zk.client.HelixZkClient; import org.apache.helix.model.ExternalView; import org.apache.helix.model.HelixConfigScope; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.api.client.RealmAwareZkClient; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.metrics.BrokerMetrics; import org.apache.pinot.common.utils.StringUtil; @@ -113,7 +113,7 @@ public class HelixExternalViewBasedQueryQuotaManagerTest { public class FakeZKHelixAdmin extends ZKHelixAdmin { private Map<String, String> _instanceConfigMap; - public FakeZKHelixAdmin(HelixZkClient zkClient) { + public FakeZKHelixAdmin(RealmAwareZkClient zkClient) { super(zkClient); _instanceConfigMap = new HashMap<>(); } diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentpreselector/SegmentPreSelectorTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentpreselector/SegmentPreSelectorTest.java index 545845c..e775758 100644 --- a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentpreselector/SegmentPreSelectorTest.java +++ b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentpreselector/SegmentPreSelectorTest.java @@ -23,9 +23,9 @@ import java.util.Collections; import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.helix.ZNRecord; import org.apache.helix.model.ExternalView; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.broker.util.FakePropertyStore; import org.apache.pinot.common.lineage.LineageEntry; import org.apache.pinot.common.lineage.LineageEntryState; diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentpruner/SegmentPrunerTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentpruner/SegmentPrunerTest.java index 9f330e0..15ddac9 100644 --- a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentpruner/SegmentPrunerTest.java +++ b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentpruner/SegmentPrunerTest.java @@ -26,13 +26,13 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.apache.helix.ZNRecord; import org.apache.helix.manager.zk.ZNRecordSerializer; import org.apache.helix.manager.zk.ZkBaseDataAccessor; import org.apache.helix.manager.zk.ZkClient; import org.apache.helix.model.ExternalView; import org.apache.helix.model.IdealState; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.metadata.segment.SegmentPartitionMetadata; import org.apache.pinot.common.metadata.segment.SegmentZKMetadata; diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/timeboundary/TimeBoundaryManagerTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/timeboundary/TimeBoundaryManagerTest.java index 757f603..4af2a5f 100644 --- a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/timeboundary/TimeBoundaryManagerTest.java +++ b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/timeboundary/TimeBoundaryManagerTest.java @@ -23,13 +23,13 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.apache.helix.ZNRecord; import org.apache.helix.manager.zk.ZNRecordSerializer; import org.apache.helix.manager.zk.ZkBaseDataAccessor; import org.apache.helix.manager.zk.ZkClient; import org.apache.helix.model.ExternalView; import org.apache.helix.model.IdealState; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.metadata.segment.SegmentZKMetadata; import org.apache.pinot.controller.helix.ControllerTest; 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 fa3e9ca..3e26fab 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 @@ -20,10 +20,10 @@ package org.apache.pinot.broker.util; import java.util.HashMap; import java.util.Map; -import org.I0Itec.zkclient.IZkDataListener; -import org.apache.helix.ZNRecord; import org.apache.helix.manager.zk.ZkBaseDataAccessor; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; +import org.apache.helix.zookeeper.zkclient.IZkDataListener; import org.apache.zookeeper.data.Stat; diff --git a/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstancePartitions.java b/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstancePartitions.java index c511077..6e95220 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstancePartitions.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstancePartitions.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import java.util.List; import java.util.Map; import java.util.TreeMap; -import org.apache.helix.ZNRecord; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.spi.utils.JsonUtils; diff --git a/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstancePartitionsUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstancePartitionsUtils.java index b6dd5a3..7e960e2 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstancePartitionsUtils.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstancePartitionsUtils.java @@ -22,12 +22,12 @@ import com.google.common.base.Preconditions; import java.util.Collections; import java.util.List; import javax.annotation.Nullable; -import org.I0Itec.zkclient.exception.ZkException; import org.apache.helix.AccessOption; import org.apache.helix.HelixManager; -import org.apache.helix.ZNRecord; import org.apache.helix.store.HelixPropertyStore; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; +import org.apache.helix.zookeeper.zkclient.exception.ZkException; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.utils.config.TagNameUtils; import org.apache.pinot.common.utils.helix.HelixHelper; diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/provider/TableCache.java b/pinot-common/src/main/java/org/apache/pinot/common/config/provider/TableCache.java index 040263e..1535237 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/config/provider/TableCache.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/config/provider/TableCache.java @@ -28,12 +28,12 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import javax.annotation.Nullable; -import org.I0Itec.zkclient.IZkChildListener; -import org.I0Itec.zkclient.IZkDataListener; import org.apache.commons.collections.CollectionUtils; import org.apache.helix.AccessOption; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; +import org.apache.helix.zookeeper.zkclient.IZkChildListener; +import org.apache.helix.zookeeper.zkclient.IZkDataListener; import org.apache.pinot.common.utils.SchemaUtils; import org.apache.pinot.common.utils.config.TableConfigUtils; import org.apache.pinot.spi.config.provider.PinotConfigProvider; diff --git a/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentLineage.java b/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentLineage.java index e35d690..f5f1b0e 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentLineage.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentLineage.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import org.apache.commons.lang3.StringUtils; -import org.apache.helix.ZNRecord; +import org.apache.helix.zookeeper.datamodel.ZNRecord; /** diff --git a/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentLineageAccessHelper.java b/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentLineageAccessHelper.java index c6d1fe2..52ca831 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentLineageAccessHelper.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentLineageAccessHelper.java @@ -18,10 +18,10 @@ */ package org.apache.pinot.common.lineage; -import org.I0Itec.zkclient.exception.ZkBadVersionException; import org.apache.helix.AccessOption; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; +import org.apache.helix.zookeeper.zkclient.exception.ZkBadVersionException; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.zookeeper.data.Stat; diff --git a/pinot-common/src/main/java/org/apache/pinot/common/messages/RoutingTableRebuildMessage.java b/pinot-common/src/main/java/org/apache/pinot/common/messages/RoutingTableRebuildMessage.java index 7b36aa3..47891eb 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/messages/RoutingTableRebuildMessage.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/messages/RoutingTableRebuildMessage.java @@ -19,8 +19,8 @@ package org.apache.pinot.common.messages; import java.util.UUID; -import org.apache.helix.ZNRecord; import org.apache.helix.model.Message; +import org.apache.helix.zookeeper.datamodel.ZNRecord; /** diff --git a/pinot-common/src/main/java/org/apache/pinot/common/messages/RunPeriodicTaskMessage.java b/pinot-common/src/main/java/org/apache/pinot/common/messages/RunPeriodicTaskMessage.java index 11ee6cf..84ecb98 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/messages/RunPeriodicTaskMessage.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/messages/RunPeriodicTaskMessage.java @@ -19,8 +19,8 @@ package org.apache.pinot.common.messages; import java.util.UUID; -import org.apache.helix.ZNRecord; import org.apache.helix.model.Message; +import org.apache.helix.zookeeper.datamodel.ZNRecord; /** 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 aeaa33a..aac01bb 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 @@ -19,8 +19,8 @@ package org.apache.pinot.common.messages; import java.util.UUID; -import org.apache.helix.ZNRecord; import org.apache.helix.model.Message; +import org.apache.helix.zookeeper.datamodel.ZNRecord; /** 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 e45e985..689eb8a 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 @@ -22,8 +22,8 @@ import com.google.common.base.Preconditions; import java.util.UUID; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.apache.helix.ZNRecord; import org.apache.helix.model.Message; +import org.apache.helix.zookeeper.datamodel.ZNRecord; /** diff --git a/pinot-common/src/main/java/org/apache/pinot/common/messages/TableConfigRefreshMessage.java b/pinot-common/src/main/java/org/apache/pinot/common/messages/TableConfigRefreshMessage.java index fd944b7..70e65a9 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/messages/TableConfigRefreshMessage.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/messages/TableConfigRefreshMessage.java @@ -19,8 +19,8 @@ package org.apache.pinot.common.messages; import java.util.UUID; -import org.apache.helix.ZNRecord; import org.apache.helix.model.Message; +import org.apache.helix.zookeeper.datamodel.ZNRecord; /** 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 a620ff0..9fe3984 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 @@ -18,7 +18,7 @@ */ package org.apache.pinot.common.metadata; -import org.apache.helix.ZNRecord; +import org.apache.helix.zookeeper.datamodel.ZNRecord; public interface ZKMetadata { 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 505c681..a626bad 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 @@ -22,10 +22,10 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import javax.annotation.Nullable; -import org.I0Itec.zkclient.exception.ZkBadVersionException; import org.apache.helix.AccessOption; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; +import org.apache.helix.zookeeper.zkclient.exception.ZkBadVersionException; import org.apache.pinot.common.metadata.instance.InstanceZKMetadata; import org.apache.pinot.common.metadata.segment.SegmentZKMetadata; import org.apache.pinot.common.utils.SchemaUtils; 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 8ab499a..32fd868 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 @@ -20,7 +20,7 @@ package org.apache.pinot.common.metadata.instance; import java.util.HashMap; import java.util.Map; -import org.apache.helix.ZNRecord; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.ZKMetadata; import org.apache.pinot.common.utils.StringUtil; import org.apache.pinot.spi.utils.builder.TableNameBuilder; 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 13264a1..d238e8f 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 @@ -21,7 +21,7 @@ package org.apache.pinot.common.metadata.segment; import java.util.Map; import java.util.TreeMap; import java.util.concurrent.TimeUnit; -import org.apache.helix.ZNRecord; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.ZKMetadata; import org.apache.pinot.spi.utils.CommonConstants.Segment; import org.apache.pinot.spi.utils.CommonConstants.Segment.Realtime.Status; diff --git a/pinot-common/src/main/java/org/apache/pinot/common/minion/BaseTaskMetadata.java b/pinot-common/src/main/java/org/apache/pinot/common/minion/BaseTaskMetadata.java index 4e89989..e2e47cb 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/minion/BaseTaskMetadata.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/minion/BaseTaskMetadata.java @@ -19,7 +19,7 @@ package org.apache.pinot.common.minion; import com.fasterxml.jackson.core.JsonProcessingException; -import org.apache.helix.ZNRecord; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.spi.utils.JsonUtils; diff --git a/pinot-common/src/main/java/org/apache/pinot/common/minion/MergeRollupTaskMetadata.java b/pinot-common/src/main/java/org/apache/pinot/common/minion/MergeRollupTaskMetadata.java index 3ed10b7..c7cfacc 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/minion/MergeRollupTaskMetadata.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/minion/MergeRollupTaskMetadata.java @@ -20,7 +20,7 @@ package org.apache.pinot.common.minion; import java.util.HashMap; import java.util.Map; -import org.apache.helix.ZNRecord; +import org.apache.helix.zookeeper.datamodel.ZNRecord; /** diff --git a/pinot-common/src/main/java/org/apache/pinot/common/minion/MinionTaskMetadataUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/minion/MinionTaskMetadataUtils.java index 5a11202..35dc68b 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/minion/MinionTaskMetadataUtils.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/minion/MinionTaskMetadataUtils.java @@ -19,10 +19,10 @@ package org.apache.pinot.common.minion; import javax.annotation.Nullable; -import org.I0Itec.zkclient.exception.ZkException; import org.apache.helix.AccessOption; -import org.apache.helix.ZNRecord; import org.apache.helix.store.HelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; +import org.apache.helix.zookeeper.zkclient.exception.ZkException; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.zookeeper.data.Stat; diff --git a/pinot-common/src/main/java/org/apache/pinot/common/minion/RealtimeToOfflineSegmentsTaskMetadata.java b/pinot-common/src/main/java/org/apache/pinot/common/minion/RealtimeToOfflineSegmentsTaskMetadata.java index 1ce9e09..b20e9fb 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/minion/RealtimeToOfflineSegmentsTaskMetadata.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/minion/RealtimeToOfflineSegmentsTaskMetadata.java @@ -18,7 +18,7 @@ */ package org.apache.pinot.common.minion; -import org.apache.helix.ZNRecord; +import org.apache.helix.zookeeper.datamodel.ZNRecord; /** 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 c7f3c99..842684f 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 @@ -32,7 +32,7 @@ import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity; import org.apache.commons.httpclient.methods.multipart.Part; import org.apache.commons.httpclient.methods.multipart.StringPart; import org.apache.commons.httpclient.params.HttpMethodParams; -import org.apache.helix.ZNRecord; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.spi.data.FieldSpec; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.data.TimeGranularitySpec; diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/ServiceStartableUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/ServiceStartableUtils.java index dbc8448..bb665b8 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/utils/ServiceStartableUtils.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/ServiceStartableUtils.java @@ -20,10 +20,9 @@ package org.apache.pinot.common.utils; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.apache.helix.ZNRecord; -import org.apache.helix.manager.zk.ZNRecordSerializer; -import org.apache.helix.manager.zk.client.HelixZkClient; -import org.apache.helix.manager.zk.client.SharedZkClientFactory; +import org.apache.helix.zookeeper.datamodel.ZNRecord; +import org.apache.helix.zookeeper.datamodel.serializer.ZNRecordSerializer; +import org.apache.helix.zookeeper.impl.client.ZkClient; import org.apache.pinot.spi.env.PinotConfiguration; import org.apache.pinot.spi.services.ServiceRole; import org.slf4j.Logger; @@ -48,10 +47,21 @@ public class ServiceStartableUtils { */ public static void applyClusterConfig(PinotConfiguration instanceConfig, String zkAddress, String clusterName, ServiceRole serviceRole) { - HelixZkClient.ZkClientConfig zkClientConfig = new HelixZkClient.ZkClientConfig(); - zkClientConfig.setZkSerializer(new ZNRecordSerializer()).setConnectInitTimeout(ZK_TIMEOUT_MS); - HelixZkClient zkClient = SharedZkClientFactory.getInstance() - .buildZkClient(new HelixZkClient.ZkConnectionConfig(zkAddress), zkClientConfig); + + ZkClient zkClient = new ZkClient.Builder().setZkSerializer(new ZNRecordSerializer()).setZkServer(zkAddress) + .setConnectionTimeout(ZK_TIMEOUT_MS).build(); + +// RealmAwareZkClient.RealmAwareZkClientConfig zkClientConfig = new RealmAwareZkClient.RealmAwareZkClientConfig(); +// zkClientConfig.setZkSerializer(new ZNRecordSerializer()).setConnectInitTimeout(ZK_TIMEOUT_MS); +// RealmAwareZkClient.RealmAwareZkConnectionConfig.Builder zkConnectionConfigBuilder = +// new RealmAwareZkClient.RealmAwareZkConnectionConfig.Builder(); +// RealmAwareZkClient zkClient; +// try { +// zkClient = SharedZkClientFactory.getInstance().buildZkClient(zkConnectionConfigBuilder.build(), zkClientConfig); +// } catch (InvalidRoutingDataException e) { +// LOGGER.error("Exception when building the zk client", e); +// return; +// } zkClient.waitUntilConnected(ZK_TIMEOUT_MS, TimeUnit.MILLISECONDS); try { 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 9515fc7..de3be51 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/utils/ZkStarter.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/ZkStarter.java @@ -22,7 +22,7 @@ import java.io.File; import java.io.IOException; import java.net.InetSocketAddress; import java.util.concurrent.TimeUnit; -import org.I0Itec.zkclient.ZkClient; +import org.apache.helix.zookeeper.impl.client.ZkClient; import org.apache.pinot.spi.utils.NetUtils; import org.apache.zookeeper.server.ServerConfig; import org.apache.zookeeper.server.ZooKeeperServerMain; diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/config/InstanceUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/config/InstanceUtils.java index 6977638..4501567 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/utils/config/InstanceUtils.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/config/InstanceUtils.java @@ -23,8 +23,8 @@ import java.util.Map; import java.util.TreeMap; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; -import org.apache.helix.ZNRecord; import org.apache.helix.model.InstanceConfig; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.spi.config.instance.Instance; import org.apache.pinot.spi.utils.CommonConstants.Helix; diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/config/TableConfigUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/config/TableConfigUtils.java index 44e0ac7..bed02f3 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/utils/config/TableConfigUtils.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/config/TableConfigUtils.java @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.helix.ZNRecord; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.spi.config.table.FieldConfig; import org.apache.pinot.spi.config.table.IndexingConfig; import org.apache.pinot.spi.config.table.QueryConfig; 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 8534ede..0aa5a4a 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 @@ -30,7 +30,6 @@ import java.util.concurrent.Callable; import java.util.function.Supplier; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.I0Itec.zkclient.exception.ZkBadVersionException; import org.apache.commons.collections.CollectionUtils; import org.apache.helix.AccessOption; import org.apache.helix.HelixAdmin; @@ -38,7 +37,6 @@ import org.apache.helix.HelixDataAccessor; import org.apache.helix.HelixManager; import org.apache.helix.PropertyKey; import org.apache.helix.PropertyKey.Builder; -import org.apache.helix.ZNRecord; import org.apache.helix.manager.zk.ZNRecordSerializer; import org.apache.helix.model.ExternalView; import org.apache.helix.model.HelixConfigScope; @@ -46,6 +44,8 @@ import org.apache.helix.model.HelixConfigScope.ConfigScopeProperty; import org.apache.helix.model.IdealState; import org.apache.helix.model.InstanceConfig; import org.apache.helix.model.builder.HelixConfigScopeBuilder; +import org.apache.helix.zookeeper.datamodel.ZNRecord; +import org.apache.helix.zookeeper.zkclient.exception.ZkBadVersionException; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.utils.config.TagNameUtils; import org.apache.pinot.spi.config.table.TableConfig; 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 f2ab9f0..7ff2d6d 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 @@ -19,8 +19,8 @@ package org.apache.pinot.common.utils.helix; import org.apache.helix.AccessOption; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; public class PinotHelixPropertyStoreZnRecordProvider { diff --git a/pinot-common/src/test/java/org/apache/pinot/common/lineage/SegmentLineageTest.java b/pinot-common/src/test/java/org/apache/pinot/common/lineage/SegmentLineageTest.java index 666dfd5..52f64c7 100644 --- a/pinot-common/src/test/java/org/apache/pinot/common/lineage/SegmentLineageTest.java +++ b/pinot-common/src/test/java/org/apache/pinot/common/lineage/SegmentLineageTest.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import org.apache.helix.ZNRecord; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/pinot-common/src/test/java/org/apache/pinot/common/metadata/InstanceZKMetadataTest.java b/pinot-common/src/test/java/org/apache/pinot/common/metadata/InstanceZKMetadataTest.java index 576ef0f..027d8c5 100644 --- a/pinot-common/src/test/java/org/apache/pinot/common/metadata/InstanceZKMetadataTest.java +++ b/pinot-common/src/test/java/org/apache/pinot/common/metadata/InstanceZKMetadataTest.java @@ -20,7 +20,7 @@ package org.apache.pinot.common.metadata; import java.util.HashMap; import java.util.Map; -import org.apache.helix.ZNRecord; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.instance.InstanceZKMetadata; import org.testng.Assert; 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 68d01d0..19dbfb6 100644 --- a/pinot-common/src/test/java/org/apache/pinot/common/metadata/MetadataUtils.java +++ b/pinot-common/src/test/java/org/apache/pinot/common/metadata/MetadataUtils.java @@ -21,7 +21,7 @@ package org.apache.pinot.common.metadata; import java.util.Arrays; import java.util.List; import java.util.Map; -import org.apache.helix.ZNRecord; +import org.apache.helix.zookeeper.datamodel.ZNRecord; public class MetadataUtils { diff --git a/pinot-common/src/test/java/org/apache/pinot/common/metadata/RealtimeToOfflineSegmentsTaskMetadataTest.java b/pinot-common/src/test/java/org/apache/pinot/common/metadata/RealtimeToOfflineSegmentsTaskMetadataTest.java index 23ab243..4f10994 100644 --- a/pinot-common/src/test/java/org/apache/pinot/common/metadata/RealtimeToOfflineSegmentsTaskMetadataTest.java +++ b/pinot-common/src/test/java/org/apache/pinot/common/metadata/RealtimeToOfflineSegmentsTaskMetadataTest.java @@ -18,7 +18,7 @@ */ package org.apache.pinot.common.metadata; -import org.apache.helix.ZNRecord; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.minion.RealtimeToOfflineSegmentsTaskMetadata; import org.testng.annotations.Test; 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 67d8574..72b2293 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 @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.apache.helix.ZNRecord; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.segment.SegmentPartitionMetadata; import org.apache.pinot.common.metadata.segment.SegmentZKMetadata; import org.apache.pinot.segment.spi.partition.metadata.ColumnPartitionMetadata; diff --git a/pinot-common/src/test/java/org/apache/pinot/common/minion/MinionTaskMetadataUtilsTest.java b/pinot-common/src/test/java/org/apache/pinot/common/minion/MinionTaskMetadataUtilsTest.java index 74d247f..975a401 100644 --- a/pinot-common/src/test/java/org/apache/pinot/common/minion/MinionTaskMetadataUtilsTest.java +++ b/pinot-common/src/test/java/org/apache/pinot/common/minion/MinionTaskMetadataUtilsTest.java @@ -18,10 +18,10 @@ */ package org.apache.pinot.common.minion; -import org.I0Itec.zkclient.exception.ZkException; import org.apache.helix.AccessOption; -import org.apache.helix.ZNRecord; import org.apache.helix.store.HelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; +import org.apache.helix.zookeeper.zkclient.exception.ZkException; import org.mockito.Mockito; import org.testng.annotations.Test; diff --git a/pinot-common/src/test/java/org/apache/pinot/common/tier/TierSegmentSelectorTest.java b/pinot-common/src/test/java/org/apache/pinot/common/tier/TierSegmentSelectorTest.java index ae6a8de..f52eee0 100644 --- a/pinot-common/src/test/java/org/apache/pinot/common/tier/TierSegmentSelectorTest.java +++ b/pinot-common/src/test/java/org/apache/pinot/common/tier/TierSegmentSelectorTest.java @@ -20,8 +20,8 @@ package org.apache.pinot.common.tier; import java.util.concurrent.TimeUnit; import org.apache.helix.HelixManager; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.metadata.segment.SegmentZKMetadata; import org.apache.pinot.spi.utils.CommonConstants; diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/config/InstanceUtilsTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/config/InstanceUtilsTest.java index 09cc182..f4b4f9c 100644 --- a/pinot-common/src/test/java/org/apache/pinot/common/utils/config/InstanceUtilsTest.java +++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/config/InstanceUtilsTest.java @@ -23,8 +23,8 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.TreeMap; -import org.apache.helix.ZNRecord; import org.apache.helix.model.InstanceConfig; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.spi.config.instance.Instance; import org.apache.pinot.spi.config.instance.InstanceType; import org.apache.pinot.spi.utils.CommonConstants; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentRestletResource.java index 4f2d31d..cc8598d 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentRestletResource.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentRestletResource.java @@ -51,8 +51,8 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import org.apache.commons.httpclient.HttpConnectionManager; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.exception.InvalidConfigException; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.metadata.segment.SegmentZKMetadata; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableRestletResource.java index 46e7a2e..de12a0d 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableRestletResource.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableRestletResource.java @@ -56,8 +56,8 @@ import org.apache.commons.configuration.BaseConfiguration; import org.apache.commons.configuration.Configuration; import org.apache.commons.httpclient.HttpConnectionManager; import org.apache.helix.AccessOption; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.exception.InvalidConfigException; import org.apache.pinot.common.exception.SchemaNotFoundException; import org.apache.pinot.common.exception.TableNotFoundException; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ZookeeperResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ZookeeperResource.java index 6695f6c..54cffea 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ZookeeperResource.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ZookeeperResource.java @@ -43,9 +43,9 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.apache.commons.lang.StringUtils; -import org.apache.helix.ZNRecord; import org.apache.helix.manager.zk.ZNRecordSerializer; import org.apache.helix.util.GZipCompressionUtil; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.controller.api.access.AccessType; import org.apache.pinot.controller.api.access.Authenticate; import org.apache.pinot.controller.api.exception.ControllerApplicationException; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/ZKOperator.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/ZKOperator.java index 693d42f..8964aef 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/ZKOperator.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/ZKOperator.java @@ -22,7 +22,7 @@ import java.io.File; import java.net.URI; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; -import org.apache.helix.ZNRecord; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.segment.SegmentZKMetadata; import org.apache.pinot.common.metadata.segment.SegmentZKMetadataCustomMapModifier; import org.apache.pinot.common.metrics.ControllerMeter; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixBrokerResourceOnlineOfflineStateModelGenerator.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixBrokerResourceOnlineOfflineStateModelGenerator.java index 6178a03..4d69190 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixBrokerResourceOnlineOfflineStateModelGenerator.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixBrokerResourceOnlineOfflineStateModelGenerator.java @@ -22,9 +22,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.helix.ZNRecord; import org.apache.helix.model.StateModelDefinition; import org.apache.helix.model.StateModelDefinition.StateModelDefinitionProperty; +import org.apache.helix.zookeeper.datamodel.ZNRecord; /** diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java index 107edcc..6e8cfc5 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java @@ -63,7 +63,6 @@ import org.apache.helix.HelixManager; import org.apache.helix.InstanceType; import org.apache.helix.PropertyKey; import org.apache.helix.PropertyKey.Builder; -import org.apache.helix.ZNRecord; import org.apache.helix.model.CurrentState; import org.apache.helix.model.ExternalView; import org.apache.helix.model.HelixConfigScope; @@ -73,6 +72,7 @@ import org.apache.helix.model.LiveInstance; import org.apache.helix.model.ParticipantHistory; import org.apache.helix.model.builder.HelixConfigScopeBuilder; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.assignment.InstanceAssignmentConfigUtils; import org.apache.pinot.common.assignment.InstancePartitions; import org.apache.pinot.common.assignment.InstancePartitionsUtils; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixSegmentOnlineOfflineStateModelGenerator.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixSegmentOnlineOfflineStateModelGenerator.java index d4e42ef..18b6ac0 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixSegmentOnlineOfflineStateModelGenerator.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixSegmentOnlineOfflineStateModelGenerator.java @@ -22,9 +22,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.helix.ZNRecord; import org.apache.helix.model.StateModelDefinition; import org.apache.helix.model.StateModelDefinition.StateModelDefinitionProperty; +import org.apache.helix.zookeeper.datamodel.ZNRecord; /** diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotTableIdealStateBuilder.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotTableIdealStateBuilder.java index 50553cd..2975dab 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotTableIdealStateBuilder.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotTableIdealStateBuilder.java @@ -21,10 +21,10 @@ package org.apache.pinot.controller.helix.core; import java.util.List; import java.util.Map; import org.apache.helix.HelixManager; -import org.apache.helix.ZNRecord; import org.apache.helix.model.IdealState; import org.apache.helix.model.builder.CustomModeISBuilder; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.metadata.instance.InstanceZKMetadata; import org.apache.pinot.common.utils.StringUtil; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java index 43372e2..b7f1a0d 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java @@ -37,10 +37,10 @@ import javax.annotation.Nullable; import org.apache.commons.lang3.StringUtils; import org.apache.helix.AccessOption; import org.apache.helix.HelixAdmin; -import org.apache.helix.ZNRecord; import org.apache.helix.model.ExternalView; import org.apache.helix.model.IdealState; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.utils.SegmentName; import org.apache.pinot.common.utils.URIUtils; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/ClusterInfoAccessor.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/ClusterInfoAccessor.java index fa28662..406e875 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/ClusterInfoAccessor.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/ClusterInfoAccessor.java @@ -22,10 +22,10 @@ import java.util.Collections; import java.util.List; import java.util.Map; import javax.annotation.Nullable; -import org.apache.helix.ZNRecord; import org.apache.helix.model.HelixConfigScope; import org.apache.helix.model.builder.HelixConfigScopeBuilder; import org.apache.helix.task.TaskState; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.lineage.SegmentLineage; import org.apache.pinot.common.lineage.SegmentLineageAccessHelper; import org.apache.pinot.common.metadata.ZKMetadataProvider; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotTaskManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotTaskManager.java index c805e98..b6955db 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotTaskManager.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotTaskManager.java @@ -29,10 +29,10 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import javax.annotation.Nullable; -import org.I0Itec.zkclient.IZkChildListener; import org.apache.commons.collections.CollectionUtils; import org.apache.helix.AccessOption; import org.apache.helix.task.TaskState; +import org.apache.helix.zookeeper.zkclient.IZkChildListener; import org.apache.pinot.common.metrics.ControllerGauge; import org.apache.pinot.common.metrics.ControllerMeter; import org.apache.pinot.common.metrics.ControllerMetrics; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/TableTaskSchedulerUpdater.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/TableTaskSchedulerUpdater.java index 521641b..c64025d 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/TableTaskSchedulerUpdater.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/TableTaskSchedulerUpdater.java @@ -18,7 +18,7 @@ */ package org.apache.pinot.controller.helix.core.minion; -import org.I0Itec.zkclient.IZkDataListener; +import org.apache.helix.zookeeper.zkclient.IZkDataListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/TaskTypeMetricsUpdater.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/TaskTypeMetricsUpdater.java index 6e5407a..6193cb5 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/TaskTypeMetricsUpdater.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/TaskTypeMetricsUpdater.java @@ -18,7 +18,7 @@ */ package org.apache.pinot.controller.helix.core.minion; -import org.I0Itec.zkclient.IZkDataListener; +import org.apache.helix.zookeeper.zkclient.IZkDataListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java index 399f7ec..9649e98 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java @@ -38,9 +38,9 @@ import javax.annotation.Nullable; import org.apache.helix.AccessOption; import org.apache.helix.HelixAdmin; import org.apache.helix.HelixManager; -import org.apache.helix.ZNRecord; import org.apache.helix.model.IdealState; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.assignment.InstancePartitions; import org.apache.pinot.common.assignment.InstancePartitionsUtils; import org.apache.pinot.common.metadata.ZKMetadataProvider; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotRealtimeSegmentManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotRealtimeSegmentManager.java index bb614de..8a63cf7 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotRealtimeSegmentManager.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotRealtimeSegmentManager.java @@ -27,15 +27,15 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.I0Itec.zkclient.IZkChildListener; -import org.I0Itec.zkclient.IZkDataListener; import org.apache.helix.PropertyPathConfig; import org.apache.helix.PropertyType; -import org.apache.helix.ZNRecord; import org.apache.helix.manager.zk.ZNRecordSerializer; import org.apache.helix.manager.zk.ZkClient; import org.apache.helix.model.IdealState; import org.apache.helix.store.HelixPropertyListener; +import org.apache.helix.zookeeper.datamodel.ZNRecord; +import org.apache.helix.zookeeper.zkclient.IZkChildListener; +import org.apache.helix.zookeeper.zkclient.IZkDataListener; import org.apache.pinot.common.Utils; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.metadata.instance.InstanceZKMetadata; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalancer.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalancer.java index d6701c8..597b529 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalancer.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalancer.java @@ -40,9 +40,9 @@ import org.apache.helix.AccessOption; import org.apache.helix.HelixDataAccessor; import org.apache.helix.HelixManager; import org.apache.helix.PropertyKey; -import org.apache.helix.ZNRecord; import org.apache.helix.model.ExternalView; import org.apache.helix.model.IdealState; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.assignment.InstanceAssignmentConfigUtils; import org.apache.pinot.common.assignment.InstancePartitions; import org.apache.pinot.common.assignment.InstancePartitionsUtils; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/retention/RetentionManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/retention/RetentionManager.java index bf24f78..624ee91 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/retention/RetentionManager.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/retention/RetentionManager.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.apache.helix.ZNRecord; import org.apache.helix.model.IdealState; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.lineage.LineageEntry; import org.apache.pinot.common.lineage.LineageEntryState; import org.apache.pinot.common.lineage.SegmentLineage; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/HelixSetupUtils.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/HelixSetupUtils.java index 0acb929..cddecad 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/HelixSetupUtils.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/HelixSetupUtils.java @@ -33,7 +33,6 @@ import org.apache.helix.manager.zk.ZKHelixManager; import org.apache.helix.manager.zk.ZNRecordSerializer; import org.apache.helix.manager.zk.ZkBaseDataAccessor; import org.apache.helix.manager.zk.client.HelixZkClient; -import org.apache.helix.manager.zk.client.SharedZkClientFactory; import org.apache.helix.model.HelixConfigScope; import org.apache.helix.model.HelixConfigScope.ConfigScopeProperty; import org.apache.helix.model.IdealState; @@ -43,6 +42,8 @@ import org.apache.helix.model.StateModelDefinition; import org.apache.helix.model.builder.CustomModeISBuilder; import org.apache.helix.model.builder.FullAutoModeISBuilder; import org.apache.helix.model.builder.HelixConfigScopeBuilder; +import org.apache.helix.zookeeper.api.client.RealmAwareZkClient; +import org.apache.helix.zookeeper.impl.factory.SharedZkClientFactory; import org.apache.pinot.common.utils.helix.LeadControllerUtils; import org.apache.pinot.controller.helix.core.PinotHelixBrokerResourceOnlineOfflineStateModelGenerator; import org.apache.pinot.controller.helix.core.PinotHelixSegmentOnlineOfflineStateModelGenerator; @@ -94,7 +95,7 @@ public class HelixSetupUtils { public static void setupPinotCluster(String helixClusterName, String zkPath, boolean isUpdateStateModel, boolean enableBatchMessageMode, String leadControllerResourceRebalanceStrategy) { - HelixZkClient zkClient = null; + RealmAwareZkClient zkClient = null; try { zkClient = SharedZkClientFactory.getInstance().buildZkClient(new HelixZkClient.ZkConnectionConfig(zkPath), new HelixZkClient.ZkClientConfig().setZkSerializer(new ZNRecordSerializer()) diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/util/AutoAddInvertedIndex.java b/pinot-controller/src/main/java/org/apache/pinot/controller/util/AutoAddInvertedIndex.java index 05ad361..d622ede 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/util/AutoAddInvertedIndex.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/util/AutoAddInvertedIndex.java @@ -34,10 +34,10 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Nonnull; import org.apache.helix.PropertyPathConfig; import org.apache.helix.PropertyType; -import org.apache.helix.ZNRecord; import org.apache.helix.manager.zk.ZKHelixAdmin; import org.apache.helix.manager.zk.ZNRecordSerializer; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.controller.helix.ControllerRequestURLBuilder; import org.apache.pinot.spi.config.table.IndexingConfig; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/util/TableRetentionValidator.java b/pinot-controller/src/main/java/org/apache/pinot/controller/util/TableRetentionValidator.java index c4c68a3..11de01e 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/util/TableRetentionValidator.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/util/TableRetentionValidator.java @@ -25,10 +25,10 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.apache.helix.PropertyPathConfig; import org.apache.helix.PropertyType; -import org.apache.helix.ZNRecord; import org.apache.helix.manager.zk.ZKHelixAdmin; import org.apache.helix.manager.zk.ZNRecordSerializer; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.metadata.segment.SegmentZKMetadata; import org.apache.pinot.common.utils.config.TableConfigUtils; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/ControllerTestUtils.java b/pinot-controller/src/test/java/org/apache/pinot/controller/ControllerTestUtils.java index ad96c0c..57dd001 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/ControllerTestUtils.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/ControllerTestUtils.java @@ -51,7 +51,6 @@ import org.apache.helix.HelixManager; import org.apache.helix.HelixManagerFactory; import org.apache.helix.InstanceType; import org.apache.helix.NotificationContext; -import org.apache.helix.ZNRecord; import org.apache.helix.model.ClusterConfig; import org.apache.helix.model.HelixConfigScope; import org.apache.helix.model.Message; @@ -62,6 +61,7 @@ import org.apache.helix.participant.statemachine.StateModelFactory; import org.apache.helix.participant.statemachine.StateModelInfo; import org.apache.helix.participant.statemachine.Transition; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.utils.ZkStarter; import org.apache.pinot.common.utils.config.TagNameUtils; import org.apache.pinot.controller.api.AccessControlTest; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTest.java index 2111899..052a2be 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTest.java @@ -51,7 +51,6 @@ import org.apache.helix.HelixManager; import org.apache.helix.HelixManagerFactory; import org.apache.helix.InstanceType; import org.apache.helix.NotificationContext; -import org.apache.helix.ZNRecord; import org.apache.helix.model.ClusterConfig; import org.apache.helix.model.HelixConfigScope; import org.apache.helix.model.Message; @@ -62,6 +61,7 @@ import org.apache.helix.participant.statemachine.StateModelFactory; import org.apache.helix.participant.statemachine.StateModelInfo; import org.apache.helix.participant.statemachine.Transition; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.utils.ZkStarter; import org.apache.pinot.common.utils.config.TagNameUtils; import org.apache.pinot.controller.ControllerConf; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/SegmentStatusCheckerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/SegmentStatusCheckerTest.java index 6244265..ff9f578 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/SegmentStatusCheckerTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/SegmentStatusCheckerTest.java @@ -23,10 +23,10 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; import org.apache.helix.AccessOption; -import org.apache.helix.ZNRecord; import org.apache.helix.model.ExternalView; import org.apache.helix.model.IdealState; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.segment.SegmentZKMetadata; import org.apache.pinot.common.metrics.ControllerGauge; import org.apache.pinot.common.metrics.ControllerMetrics; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerTest.java index dfacc0c..fbf6549 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerTest.java @@ -30,11 +30,9 @@ import java.util.List; import java.util.Map; import java.util.Random; import java.util.Set; -import org.I0Itec.zkclient.ZkClient; import org.apache.helix.HelixDataAccessor; import org.apache.helix.PropertyKey; import org.apache.helix.PropertyPathBuilder; -import org.apache.helix.ZNRecord; import org.apache.helix.controller.rebalancer.strategy.CrushEdRebalanceStrategy; import org.apache.helix.controller.stages.ClusterDataCache; import org.apache.helix.manager.zk.ZNRecordSerializer; @@ -43,6 +41,8 @@ import org.apache.helix.model.ExternalView; import org.apache.helix.model.IdealState; import org.apache.helix.model.InstanceConfig; import org.apache.helix.model.MasterSlaveSMD; +import org.apache.helix.zookeeper.datamodel.ZNRecord; +import org.apache.helix.zookeeper.impl.client.ZkClient; import org.apache.pinot.common.exception.InvalidConfigException; import org.apache.pinot.common.exception.TableNotFoundException; import org.apache.pinot.common.lineage.LineageEntryState; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/segment/OfflineDimTableSegmentAssignmentTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/segment/OfflineDimTableSegmentAssignmentTest.java index a991595..79ec716 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/segment/OfflineDimTableSegmentAssignmentTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/segment/OfflineDimTableSegmentAssignmentTest.java @@ -27,8 +27,8 @@ import org.apache.helix.HelixDataAccessor; import org.apache.helix.HelixManager; import org.apache.helix.HelixProperty; import org.apache.helix.PropertyKey; -import org.apache.helix.ZNRecord; import org.apache.helix.model.InstanceConfig; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/segment/OfflineReplicaGroupSegmentAssignmentTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/segment/OfflineReplicaGroupSegmentAssignmentTest.java index 7866b30..55dbbb0 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/segment/OfflineReplicaGroupSegmentAssignmentTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/segment/OfflineReplicaGroupSegmentAssignmentTest.java @@ -27,8 +27,8 @@ import java.util.TreeMap; import org.apache.commons.configuration.BaseConfiguration; import org.apache.commons.configuration.Configuration; import org.apache.helix.HelixManager; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.assignment.InstancePartitions; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.metadata.segment.SegmentPartitionMetadata; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManagerTest.java index 9d048f1..6964d20 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManagerTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManagerTest.java @@ -39,12 +39,12 @@ import javax.ws.rs.core.Response; import org.apache.commons.io.FileUtils; import org.apache.helix.HelixAdmin; import org.apache.helix.HelixManager; -import org.apache.helix.ZNRecord; import org.apache.helix.model.ExternalView; import org.apache.helix.model.HelixConfigScope; import org.apache.helix.model.IdealState; import org.apache.helix.model.InstanceConfig; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.assignment.InstancePartitions; import org.apache.pinot.common.exception.HttpErrorStatusException; import org.apache.pinot.common.metadata.segment.SegmentZKMetadata; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/util/SegmentDeletionManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/util/SegmentDeletionManagerTest.java index 8d56e7c..a617dd8 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/util/SegmentDeletionManagerTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/util/SegmentDeletionManagerTest.java @@ -34,10 +34,10 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Nullable; import org.apache.commons.lang3.StringUtils; import org.apache.helix.HelixAdmin; -import org.apache.helix.ZNRecord; import org.apache.helix.model.ExternalView; import org.apache.helix.model.IdealState; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.controller.helix.core.SegmentDeletionManager; import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig; import org.apache.pinot.spi.config.table.TableConfig; diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/BaseTableDataManager.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/BaseTableDataManager.java index 79d1741..c0f3cf3 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/BaseTableDataManager.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/BaseTableDataManager.java @@ -34,8 +34,8 @@ import javax.annotation.Nullable; import javax.annotation.concurrent.ThreadSafe; import org.apache.commons.io.FileUtils; import org.apache.helix.HelixManager; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.metadata.segment.SegmentZKMetadata; import org.apache.pinot.common.metrics.ServerGauge; diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/InstanceDataManager.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/InstanceDataManager.java index 14d98b3..3677dd2 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/InstanceDataManager.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/InstanceDataManager.java @@ -25,8 +25,8 @@ import javax.annotation.Nullable; import javax.annotation.concurrent.ThreadSafe; import org.apache.commons.configuration.ConfigurationException; import org.apache.helix.HelixManager; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metrics.ServerMetrics; import org.apache.pinot.core.data.manager.realtime.SegmentUploader; import org.apache.pinot.core.util.SegmentRefreshSemaphore; diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/offline/TableDataManagerProvider.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/offline/TableDataManagerProvider.java index 42994ed..3e62702 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/offline/TableDataManagerProvider.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/offline/TableDataManagerProvider.java @@ -21,8 +21,8 @@ package org.apache.pinot.core.data.manager.offline; import com.google.common.cache.LoadingCache; import java.util.concurrent.Semaphore; import org.apache.helix.HelixManager; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metrics.ServerMetrics; import org.apache.pinot.common.restlet.resources.SegmentErrorInfo; import org.apache.pinot.core.data.manager.realtime.RealtimeTableDataManager; diff --git a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/offline/DimensionTableDataManagerTest.java b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/offline/DimensionTableDataManagerTest.java index 0daf200..25afbd0 100644 --- a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/offline/DimensionTableDataManagerTest.java +++ b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/offline/DimensionTableDataManagerTest.java @@ -25,8 +25,8 @@ import java.util.List; import org.apache.commons.io.FileUtils; import org.apache.helix.AccessOption; import org.apache.helix.HelixManager; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metrics.PinotMetricUtils; import org.apache.pinot.common.metrics.ServerMetrics; import org.apache.pinot.segment.local.data.manager.SegmentDataManager; diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/RealtimeToOfflineSegmentsMinionClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/RealtimeToOfflineSegmentsMinionClusterIntegrationTest.java index f7710e2..594d691 100644 --- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/RealtimeToOfflineSegmentsMinionClusterIntegrationTest.java +++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/RealtimeToOfflineSegmentsMinionClusterIntegrationTest.java @@ -23,8 +23,8 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import org.apache.commons.io.FileUtils; -import org.apache.helix.ZNRecord; import org.apache.helix.task.TaskState; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.segment.SegmentZKMetadata; import org.apache.pinot.common.minion.MinionTaskMetadataUtils; import org.apache.pinot.common.minion.RealtimeToOfflineSegmentsTaskMetadata; diff --git a/pinot-minion/src/main/java/org/apache/pinot/minion/MinionContext.java b/pinot-minion/src/main/java/org/apache/pinot/minion/MinionContext.java index cc4b4e1..8f4b9cb 100644 --- a/pinot-minion/src/main/java/org/apache/pinot/minion/MinionContext.java +++ b/pinot-minion/src/main/java/org/apache/pinot/minion/MinionContext.java @@ -20,8 +20,8 @@ package org.apache.pinot.minion; import java.io.File; import javax.net.ssl.SSLContext; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metrics.MinionMetrics; import org.apache.pinot.core.minion.SegmentPurger; diff --git a/pinot-minion/src/main/java/org/apache/pinot/minion/executor/MinionTaskZkMetadataManager.java b/pinot-minion/src/main/java/org/apache/pinot/minion/executor/MinionTaskZkMetadataManager.java index 524453c..7cf2bd8 100644 --- a/pinot-minion/src/main/java/org/apache/pinot/minion/executor/MinionTaskZkMetadataManager.java +++ b/pinot-minion/src/main/java/org/apache/pinot/minion/executor/MinionTaskZkMetadataManager.java @@ -19,7 +19,7 @@ package org.apache.pinot.minion.executor; import org.apache.helix.HelixManager; -import org.apache.helix.ZNRecord; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.minion.MinionTaskMetadataUtils; import org.apache.pinot.common.minion.RealtimeToOfflineSegmentsTaskMetadata; import org.apache.pinot.core.common.MinionConstants.RealtimeToOfflineSegmentsTask; diff --git a/pinot-perf/src/main/java/org/apache/pinot/perf/BenchmarkQueryEngine.java b/pinot-perf/src/main/java/org/apache/pinot/perf/BenchmarkQueryEngine.java index 5d02416..ee6d6b7 100644 --- a/pinot-perf/src/main/java/org/apache/pinot/perf/BenchmarkQueryEngine.java +++ b/pinot-perf/src/main/java/org/apache/pinot/perf/BenchmarkQueryEngine.java @@ -22,9 +22,9 @@ import com.google.common.util.concurrent.Uninterruptibles; import java.io.File; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.I0Itec.zkclient.ZkClient; -import org.apache.helix.ZNRecord; -import org.apache.helix.manager.zk.ZNRecordSerializer; +import org.apache.helix.zookeeper.datamodel.ZNRecord; +import org.apache.helix.zookeeper.datamodel.serializer.ZNRecordSerializer; +import org.apache.helix.zookeeper.impl.client.ZkClient; import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl; import org.apache.pinot.tools.perf.PerfBenchmarkDriver; import org.apache.pinot.tools.perf.PerfBenchmarkDriverConf; diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/MergeRollupTaskGenerator.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/MergeRollupTaskGenerator.java index 63139e6..5105834 100644 --- a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/MergeRollupTaskGenerator.java +++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/MergeRollupTaskGenerator.java @@ -31,8 +31,8 @@ import java.util.concurrent.ConcurrentHashMap; import javax.annotation.Nullable; import org.I0Itec.zkclient.exception.ZkException; import org.apache.commons.lang3.StringUtils; -import org.apache.helix.ZNRecord; import org.apache.helix.task.TaskState; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.lineage.SegmentLineage; import org.apache.pinot.common.lineage.SegmentLineageUtils; import org.apache.pinot.common.metadata.segment.SegmentPartitionMetadata; diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/realtimetoofflinesegments/RealtimeToOfflineSegmentsTaskExecutor.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/realtimetoofflinesegments/RealtimeToOfflineSegmentsTaskExecutor.java index 3fb2fc3..f264fe3 100644 --- a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/realtimetoofflinesegments/RealtimeToOfflineSegmentsTaskExecutor.java +++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/realtimetoofflinesegments/RealtimeToOfflineSegmentsTaskExecutor.java @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; -import org.apache.helix.ZNRecord; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.segment.SegmentZKMetadataCustomMapModifier; import org.apache.pinot.common.minion.RealtimeToOfflineSegmentsTaskMetadata; import org.apache.pinot.core.common.MinionConstants; diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/realtimetoofflinesegments/RealtimeToOfflineSegmentsTaskGenerator.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/realtimetoofflinesegments/RealtimeToOfflineSegmentsTaskGenerator.java index c96d5d4..760d213 100644 --- a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/realtimetoofflinesegments/RealtimeToOfflineSegmentsTaskGenerator.java +++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/realtimetoofflinesegments/RealtimeToOfflineSegmentsTaskGenerator.java @@ -26,8 +26,8 @@ import java.util.List; import java.util.Map; import java.util.Set; import org.apache.commons.lang3.StringUtils; -import org.apache.helix.ZNRecord; import org.apache.helix.task.TaskState; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.segment.SegmentZKMetadata; import org.apache.pinot.common.minion.RealtimeToOfflineSegmentsTaskMetadata; import org.apache.pinot.common.utils.LLCSegmentName; diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/mergerollup/MergeRollupTaskExecutorTest.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/mergerollup/MergeRollupTaskExecutorTest.java index 69a4541..233323a 100644 --- a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/mergerollup/MergeRollupTaskExecutorTest.java +++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/mergerollup/MergeRollupTaskExecutorTest.java @@ -25,8 +25,8 @@ import java.util.List; import java.util.Map; import org.apache.commons.io.FileUtils; import org.apache.helix.AccessOption; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.utils.SchemaUtils; import org.apache.pinot.common.utils.config.TableConfigUtils; import org.apache.pinot.core.common.MinionConstants; diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/purge/PurgeTaskExecutorTest.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/purge/PurgeTaskExecutorTest.java index d260081..8fa8917 100644 --- a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/purge/PurgeTaskExecutorTest.java +++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/purge/PurgeTaskExecutorTest.java @@ -24,8 +24,8 @@ import java.util.Collections; import java.util.List; import org.apache.commons.io.FileUtils; import org.apache.helix.AccessOption; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.utils.config.TableConfigUtils; import org.apache.pinot.core.common.MinionConstants; import org.apache.pinot.core.minion.PinotTaskConfig; diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/realtimetoofflinesegments/RealtimeToOfflineSegmentsTaskExecutorTest.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/realtimetoofflinesegments/RealtimeToOfflineSegmentsTaskExecutorTest.java index 4fcdbf6..62a4eb6 100644 --- a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/realtimetoofflinesegments/RealtimeToOfflineSegmentsTaskExecutorTest.java +++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/realtimetoofflinesegments/RealtimeToOfflineSegmentsTaskExecutorTest.java @@ -26,8 +26,8 @@ import java.util.List; import java.util.Map; import org.apache.commons.io.FileUtils; import org.apache.helix.AccessOption; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.utils.SchemaUtils; import org.apache.pinot.common.utils.config.TableConfigUtils; import org.apache.pinot.core.common.MinionConstants; diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/data/manager/TableDataManager.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/data/manager/TableDataManager.java index 3ae95a6..4502d48 100644 --- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/data/manager/TableDataManager.java +++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/data/manager/TableDataManager.java @@ -25,8 +25,8 @@ import java.util.Map; import javax.annotation.Nullable; import javax.annotation.concurrent.ThreadSafe; import org.apache.helix.HelixManager; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.segment.SegmentZKMetadata; import org.apache.pinot.common.metrics.ServerMetrics; import org.apache.pinot.common.restlet.resources.SegmentErrorInfo; diff --git a/pinot-server/src/main/java/org/apache/pinot/server/starter/ServerQueriesDisabledTracker.java b/pinot-server/src/main/java/org/apache/pinot/server/starter/ServerQueriesDisabledTracker.java index ea4d60a..b082c74 100644 --- a/pinot-server/src/main/java/org/apache/pinot/server/starter/ServerQueriesDisabledTracker.java +++ b/pinot-server/src/main/java/org/apache/pinot/server/starter/ServerQueriesDisabledTracker.java @@ -23,7 +23,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.helix.HelixManager; -import org.apache.helix.ZNRecord; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metrics.ServerMetrics; import org.apache.pinot.spi.utils.CommonConstants; import org.slf4j.Logger; diff --git a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/BaseServerStarter.java b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/BaseServerStarter.java index 01730d7..dbf1374 100644 --- a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/BaseServerStarter.java +++ b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/BaseServerStarter.java @@ -37,7 +37,6 @@ import org.apache.helix.HelixManager; import org.apache.helix.HelixManagerFactory; import org.apache.helix.InstanceType; import org.apache.helix.SystemPropertyKeys; -import org.apache.helix.ZNRecord; import org.apache.helix.manager.zk.ZKHelixAdmin; import org.apache.helix.model.ExternalView; import org.apache.helix.model.HelixConfigScope; @@ -47,6 +46,7 @@ import org.apache.helix.model.InstanceConfig; import org.apache.helix.model.Message; import org.apache.helix.model.builder.HelixConfigScopeBuilder; import org.apache.helix.participant.statemachine.StateModelFactory; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.Utils; import org.apache.pinot.common.config.TlsConfig; import org.apache.pinot.common.metadata.ZKMetadataProvider; diff --git a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixInstanceDataManager.java b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixInstanceDataManager.java index 21d3c90..fc234e7 100644 --- a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixInstanceDataManager.java +++ b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixInstanceDataManager.java @@ -38,8 +38,8 @@ import javax.annotation.Nullable; import javax.annotation.concurrent.ThreadSafe; import org.apache.commons.configuration.ConfigurationException; import org.apache.helix.HelixManager; -import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.metadata.segment.SegmentZKMetadata; import org.apache.pinot.common.metrics.ServerMetrics; diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/PinotZKChanger.java b/pinot-tools/src/main/java/org/apache/pinot/tools/PinotZKChanger.java index 4d545e4..227bbd7 100644 --- a/pinot-tools/src/main/java/org/apache/pinot/tools/PinotZKChanger.java +++ b/pinot-tools/src/main/java/org/apache/pinot/tools/PinotZKChanger.java @@ -28,12 +28,12 @@ import org.apache.helix.HelixManagerFactory; import org.apache.helix.InstanceType; import org.apache.helix.PropertyPathConfig; import org.apache.helix.PropertyType; -import org.apache.helix.ZNRecord; import org.apache.helix.manager.zk.ZKHelixAdmin; import org.apache.helix.manager.zk.ZNRecordSerializer; import org.apache.helix.model.ExternalView; import org.apache.helix.model.IdealState; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.spi.utils.JsonUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/UpdateSegmentState.java b/pinot-tools/src/main/java/org/apache/pinot/tools/UpdateSegmentState.java index 8ed14b0..152049f 100644 --- a/pinot-tools/src/main/java/org/apache/pinot/tools/UpdateSegmentState.java +++ b/pinot-tools/src/main/java/org/apache/pinot/tools/UpdateSegmentState.java @@ -23,11 +23,11 @@ import java.util.List; import java.util.Map; import org.apache.helix.PropertyPathConfig; import org.apache.helix.PropertyType; -import org.apache.helix.ZNRecord; import org.apache.helix.manager.zk.ZKHelixAdmin; import org.apache.helix.manager.zk.ZNRecordSerializer; import org.apache.helix.model.IdealState; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.utils.config.TableConfigUtils; import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.utils.CommonConstants; diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/MoveReplicaGroup.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/MoveReplicaGroup.java index 2c72d5a..7683eaf 100644 --- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/MoveReplicaGroup.java +++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/MoveReplicaGroup.java @@ -37,11 +37,11 @@ import java.util.PriorityQueue; import javax.annotation.Nullable; import org.apache.helix.PropertyPathConfig; import org.apache.helix.PropertyType; -import org.apache.helix.ZNRecord; import org.apache.helix.manager.zk.ZKHelixAdmin; import org.apache.helix.manager.zk.ZNRecordSerializer; import org.apache.helix.model.IdealState; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.utils.config.TableConfigUtils; import org.apache.pinot.common.utils.helix.HelixHelper; import org.apache.pinot.spi.config.table.TableConfig; diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/OfflineSegmentIntervalCheckerCommand.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/OfflineSegmentIntervalCheckerCommand.java index cf0aaba..8250ad1 100644 --- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/OfflineSegmentIntervalCheckerCommand.java +++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/OfflineSegmentIntervalCheckerCommand.java @@ -24,10 +24,10 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.helix.PropertyPathConfig; import org.apache.helix.PropertyType; -import org.apache.helix.ZNRecord; import org.apache.helix.manager.zk.ZKHelixAdmin; import org.apache.helix.manager.zk.ZNRecordSerializer; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.metadata.segment.SegmentZKMetadata; import org.apache.pinot.controller.util.SegmentIntervalUtils; diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/ShowClusterInfoCommand.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/ShowClusterInfoCommand.java index ac06429..c7e07a3 100644 --- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/ShowClusterInfoCommand.java +++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/ShowClusterInfoCommand.java @@ -28,7 +28,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; import org.apache.helix.PropertyKey; -import org.apache.helix.ZNRecord; import org.apache.helix.manager.zk.ZKHelixAdmin; import org.apache.helix.manager.zk.ZKHelixDataAccessor; import org.apache.helix.manager.zk.ZNRecordStreamingSerializer; @@ -38,6 +37,7 @@ import org.apache.helix.model.ExternalView; import org.apache.helix.model.IdealState; import org.apache.helix.model.InstanceConfig; import org.apache.helix.model.LiveInstance; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.spi.utils.CommonConstants; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.apache.pinot.tools.Command; diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/ValidateConfigCommand.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/ValidateConfigCommand.java index 950587f..70cfe87 100644 --- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/ValidateConfigCommand.java +++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/ValidateConfigCommand.java @@ -24,9 +24,9 @@ import java.util.List; import java.util.Set; import org.apache.helix.PropertyPathConfig; import org.apache.helix.PropertyType; -import org.apache.helix.ZNRecord; import org.apache.helix.manager.zk.ZNRecordSerializer; import org.apache.helix.store.zk.ZkHelixPropertyStore; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.utils.SchemaUtils; import org.apache.pinot.common.utils.config.TableConfigUtils; import org.apache.pinot.spi.config.table.TableConfig; diff --git a/pom.xml b/pom.xml index 6317421..f4eb30d 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ <!-- Configuration for unit/integration tests section 1 of 3 (properties) ENDS HERE.--> <avro.version>1.9.2</avro.version> <parquet.version>1.11.1</parquet.version> - <helix.version>0.9.8</helix.version> + <helix.version>1.0.2</helix.version> <zkclient.version>0.7</zkclient.version> <jackson.version>2.10.0</jackson.version> <zookeeper.version>3.5.8</zookeeper.version> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
