diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/PinotBrokerDebug.java b/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/PinotBrokerDebug.java index b5d127a92a8c..3a252fa0448a 100644 --- a/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/PinotBrokerDebug.java +++ b/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/PinotBrokerDebug.java @@ -39,7 +39,7 @@ import org.apache.pinot.broker.routing.timeboundary.TimeBoundaryInfo; import org.apache.pinot.core.transport.ServerInstance; import org.apache.pinot.pql.parsers.Pql2Compiler; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableNameBuilder; 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 a619c1308999..9ea35733f10d 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 @@ -30,7 +30,7 @@ import org.apache.pinot.broker.queryquota.HelixExternalViewBasedQueryQuotaManager; import org.apache.pinot.broker.routing.RoutingManager; import org.apache.pinot.common.metadata.ZKMetadataProvider; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 d40eb0b6657c..172b13ae0f8b 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 @@ -37,9 +37,9 @@ import org.apache.pinot.common.metrics.BrokerMetrics; import org.apache.pinot.common.utils.CommonConstants; import org.apache.pinot.common.utils.helix.HelixHelper; -import org.apache.pinot.spi.config.QuotaConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.QuotaConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.apache.zookeeper.data.Stat; import org.slf4j.Logger; diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java index 909e12f3d7a9..f0125698aa52 100644 --- a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java +++ b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java @@ -70,7 +70,7 @@ import org.apache.pinot.core.query.reduce.BrokerReduceService; import org.apache.pinot.core.transport.ServerInstance; import org.apache.pinot.core.util.QueryOptions; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 989ae72fded9..b44fbd2ba9ed 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 @@ -54,8 +54,8 @@ import org.apache.pinot.common.utils.CommonConstants.Helix.StateModel.RealtimeSegmentOnlineOfflineStateModel; import org.apache.pinot.common.utils.HashUtil; import org.apache.pinot.core.transport.ServerInstance; -import org.apache.pinot.spi.config.QueryConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.QueryConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.apache.zookeeper.data.Stat; import org.slf4j.Logger; diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/InstanceSelectorFactory.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/InstanceSelectorFactory.java index fe446f9f7bec..a951dae2ea79 100644 --- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/InstanceSelectorFactory.java +++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/InstanceSelectorFactory.java @@ -19,9 +19,9 @@ package org.apache.pinot.broker.routing.instanceselector; import org.apache.pinot.common.metrics.BrokerMetrics; -import org.apache.pinot.spi.config.RoutingConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.RoutingConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 c61c08fcb2cb..847edd851517 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 @@ -25,11 +25,11 @@ import javax.annotation.Nullable; import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; -import org.apache.pinot.spi.config.ColumnPartitionConfig; -import org.apache.pinot.spi.config.RoutingConfig; -import org.apache.pinot.spi.config.SegmentPartitionConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.ColumnPartitionConfig; +import org.apache.pinot.spi.config.table.RoutingConfig; +import org.apache.pinot.spi.config.table.SegmentPartitionConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentselector/SegmentSelectorFactory.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentselector/SegmentSelectorFactory.java index 27cb34fea513..5b3ecdb93a65 100644 --- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentselector/SegmentSelectorFactory.java +++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentselector/SegmentSelectorFactory.java @@ -17,8 +17,8 @@ * under the License. */ package org.apache.pinot.broker.routing.segmentselector; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; public class SegmentSelectorFactory { 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 5845b92feac5..14baa6f2c564 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 @@ -32,8 +32,8 @@ import org.apache.helix.store.zk.ZkHelixPropertyStore; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.utils.CommonConstants; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.data.Schema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/broker/HelixBrokerStarterTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/broker/HelixBrokerStarterTest.java index eb88c3b81dae..941fbcb16842 100644 --- a/pinot-broker/src/test/java/org/apache/pinot/broker/broker/HelixBrokerStarterTest.java +++ b/pinot-broker/src/test/java/org/apache/pinot/broker/broker/HelixBrokerStarterTest.java @@ -38,8 +38,8 @@ import org.apache.pinot.controller.utils.SegmentMetadataMockUtils; import org.apache.pinot.core.transport.ServerInstance; import org.apache.pinot.pql.parsers.Pql2Compiler; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.data.FieldSpec; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; 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 d8b0d56a40b3..5955470c020f 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 @@ -34,9 +34,9 @@ import org.apache.pinot.common.utils.StringUtil; import org.apache.pinot.common.utils.ZkStarter; import org.apache.pinot.common.utils.config.TableConfigUtils; -import org.apache.pinot.spi.config.QuotaConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.QuotaConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.mockito.Mockito; diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/instanceselector/InstanceSelectorTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/instanceselector/InstanceSelectorTest.java index f159fdec705a..2b613ae2294e 100644 --- a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/instanceselector/InstanceSelectorTest.java +++ b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/instanceselector/InstanceSelectorTest.java @@ -29,9 +29,9 @@ import org.apache.helix.model.ExternalView; import org.apache.pinot.common.metrics.BrokerMetrics; import org.apache.pinot.common.request.BrokerRequest; -import org.apache.pinot.spi.config.RoutingConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.RoutingConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.testng.annotations.Test; import static org.apache.pinot.common.utils.CommonConstants.Helix.StateModel.RealtimeSegmentOnlineOfflineStateModel.ERROR; 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 939a0e5386d0..06657ddbc7cf 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 @@ -38,12 +38,12 @@ import org.apache.pinot.common.request.BrokerRequest; import org.apache.pinot.common.utils.ZkStarter; import org.apache.pinot.pql.parsers.Pql2Compiler; -import org.apache.pinot.spi.config.ColumnPartitionConfig; -import org.apache.pinot.spi.config.IndexingConfig; -import org.apache.pinot.spi.config.RoutingConfig; -import org.apache.pinot.spi.config.SegmentPartitionConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.ColumnPartitionConfig; +import org.apache.pinot.spi.config.table.IndexingConfig; +import org.apache.pinot.spi.config.table.RoutingConfig; +import org.apache.pinot.spi.config.table.SegmentPartitionConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.mockito.Mockito; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentselector/SegmentSelectorTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentselector/SegmentSelectorTest.java index 26ec30d046da..9da10c0fa705 100644 --- a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentselector/SegmentSelectorTest.java +++ b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentselector/SegmentSelectorTest.java @@ -26,8 +26,8 @@ import org.apache.pinot.common.request.BrokerRequest; import org.apache.pinot.common.utils.HLCSegmentName; import org.apache.pinot.common.utils.LLCSegmentName; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.testng.annotations.Test; import static org.apache.pinot.broker.routing.segmentselector.RealtimeSegmentSelector.FORCE_HLC; 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 33b63c41313c..280bc5f6065e 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 @@ -30,8 +30,8 @@ import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata; import org.apache.pinot.common.utils.ZkStarter; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.data.FieldSpec; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; diff --git a/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstanceAssignmentConfigUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstanceAssignmentConfigUtils.java index 7eb6ccf708d8..710f80514448 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstanceAssignmentConfigUtils.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstanceAssignmentConfigUtils.java @@ -22,14 +22,14 @@ import java.util.Map; import org.apache.pinot.common.utils.CommonConstants.Segment.AssignmentStrategy; import org.apache.pinot.common.utils.config.TagNameUtils; -import org.apache.pinot.spi.config.ReplicaGroupStrategyConfig; -import org.apache.pinot.spi.config.SegmentsValidationAndRetentionConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; -import org.apache.pinot.spi.config.assignment.InstanceAssignmentConfig; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; -import org.apache.pinot.spi.config.assignment.InstanceReplicaGroupPartitionConfig; -import org.apache.pinot.spi.config.assignment.InstanceTagPoolConfig; +import org.apache.pinot.spi.config.table.ReplicaGroupStrategyConfig; +import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.config.table.assignment.InstanceAssignmentConfig; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.assignment.InstanceReplicaGroupPartitionConfig; +import org.apache.pinot.spi.config.table.assignment.InstanceTagPoolConfig; public class InstanceAssignmentConfigUtils { 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 c652ffe47e15..f757f486b345 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 @@ -31,9 +31,9 @@ import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.utils.config.TagNameUtils; import org.apache.pinot.common.utils.helix.HelixHelper; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TenantConfig; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TenantConfig; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; import org.apache.pinot.spi.utils.builder.TableNameBuilder; 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 e09ebba53b1c..9256fc6aebbb 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 @@ -35,8 +35,8 @@ import org.apache.pinot.common.utils.SegmentName; import org.apache.pinot.common.utils.StringUtil; import org.apache.pinot.common.utils.config.TableConfigUtils; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.apache.zookeeper.data.Stat; 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 7e13222e7551..f30fbfeda5d1 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,7 +23,7 @@ import java.util.TreeMap; import org.apache.helix.model.InstanceConfig; import org.apache.pinot.common.utils.CommonConstants.Helix; -import org.apache.pinot.spi.config.api.Instance; +import org.apache.pinot.spi.config.instance.Instance; public class InstanceUtils { 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 dc78de1effdc..444dada20326 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,18 +26,18 @@ import java.util.List; import java.util.Map; import org.apache.helix.ZNRecord; -import org.apache.pinot.spi.config.FieldConfig; -import org.apache.pinot.spi.config.IndexingConfig; -import org.apache.pinot.spi.config.QueryConfig; -import org.apache.pinot.spi.config.QuotaConfig; -import org.apache.pinot.spi.config.RoutingConfig; -import org.apache.pinot.spi.config.SegmentsValidationAndRetentionConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableCustomConfig; -import org.apache.pinot.spi.config.TableTaskConfig; -import org.apache.pinot.spi.config.TenantConfig; -import org.apache.pinot.spi.config.assignment.InstanceAssignmentConfig; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.FieldConfig; +import org.apache.pinot.spi.config.table.IndexingConfig; +import org.apache.pinot.spi.config.table.QueryConfig; +import org.apache.pinot.spi.config.table.QuotaConfig; +import org.apache.pinot.spi.config.table.RoutingConfig; +import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableCustomConfig; +import org.apache.pinot.spi.config.table.TableTaskConfig; +import org.apache.pinot.spi.config.table.TenantConfig; +import org.apache.pinot.spi.config.table.assignment.InstanceAssignmentConfig; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; import org.apache.pinot.spi.utils.JsonUtils; diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/config/TagNameUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/config/TagNameUtils.java index 35a6edfd130d..231e7a2d05b9 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/utils/config/TagNameUtils.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/config/TagNameUtils.java @@ -19,10 +19,10 @@ package org.apache.pinot.common.utils.config; import javax.annotation.Nullable; -import org.apache.pinot.spi.config.TableType; -import org.apache.pinot.spi.config.TagOverrideConfig; -import org.apache.pinot.spi.config.TenantConfig; -import org.apache.pinot.spi.config.api.TenantRole; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.config.table.TagOverrideConfig; +import org.apache.pinot.spi.config.table.TenantConfig; +import org.apache.pinot.spi.config.tenant.TenantRole; /** diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/helix/TableCache.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/helix/TableCache.java index 7138e5fca0d2..474adbfc8077 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/utils/helix/TableCache.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/helix/TableCache.java @@ -29,7 +29,7 @@ import org.apache.helix.store.zk.ZkHelixPropertyStore; import org.apache.pinot.common.utils.SchemaUtils; import org.apache.pinot.common.utils.config.TableConfigUtils; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.FieldSpec; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.utils.builder.TableNameBuilder; diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/config/TableConfigSerDeTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/config/TableConfigSerDeTest.java index 64c2f5bcf571..8bdefd313f6a 100644 --- a/pinot-common/src/test/java/org/apache/pinot/common/utils/config/TableConfigSerDeTest.java +++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/config/TableConfigSerDeTest.java @@ -25,22 +25,22 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.pinot.spi.config.CompletionConfig; -import org.apache.pinot.spi.config.FieldConfig; -import org.apache.pinot.spi.config.QueryConfig; -import org.apache.pinot.spi.config.QuotaConfig; -import org.apache.pinot.spi.config.ReplicaGroupStrategyConfig; -import org.apache.pinot.spi.config.RoutingConfig; -import org.apache.pinot.spi.config.SegmentsValidationAndRetentionConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; -import org.apache.pinot.spi.config.TagOverrideConfig; -import org.apache.pinot.spi.config.TenantConfig; -import org.apache.pinot.spi.config.assignment.InstanceAssignmentConfig; -import org.apache.pinot.spi.config.assignment.InstanceConstraintConfig; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; -import org.apache.pinot.spi.config.assignment.InstanceReplicaGroupPartitionConfig; -import org.apache.pinot.spi.config.assignment.InstanceTagPoolConfig; +import org.apache.pinot.spi.config.table.CompletionConfig; +import org.apache.pinot.spi.config.table.FieldConfig; +import org.apache.pinot.spi.config.table.QueryConfig; +import org.apache.pinot.spi.config.table.QuotaConfig; +import org.apache.pinot.spi.config.table.ReplicaGroupStrategyConfig; +import org.apache.pinot.spi.config.table.RoutingConfig; +import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.config.table.TagOverrideConfig; +import org.apache.pinot.spi.config.table.TenantConfig; +import org.apache.pinot.spi.config.table.assignment.InstanceAssignmentConfig; +import org.apache.pinot.spi.config.table.assignment.InstanceConstraintConfig; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.assignment.InstanceReplicaGroupPartitionConfig; +import org.apache.pinot.spi.config.table.assignment.InstanceTagPoolConfig; import org.apache.pinot.spi.utils.JsonUtils; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.testng.annotations.Test; diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/config/TableConfigUtilsTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/config/TableConfigUtilsTest.java index 5ae446c0b3d4..7e10461f0732 100644 --- a/pinot-common/src/test/java/org/apache/pinot/common/utils/config/TableConfigUtilsTest.java +++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/config/TableConfigUtilsTest.java @@ -19,9 +19,9 @@ package org.apache.pinot.common.utils.config; import java.util.Collections; -import org.apache.pinot.spi.config.FieldConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.FieldConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.testng.annotations.Test; diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/config/TagNameUtilsTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/config/TagNameUtilsTest.java index 30ec9c538997..341d66ad46a1 100644 --- a/pinot-common/src/test/java/org/apache/pinot/common/utils/config/TagNameUtilsTest.java +++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/config/TagNameUtilsTest.java @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.pinot.spi.config.TagOverrideConfig; -import org.apache.pinot.spi.config.TenantConfig; +import org.apache.pinot.spi.config.table.TagOverrideConfig; +import org.apache.pinot.spi.config.table.TenantConfig; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/DefaultMetadataEventNotifier.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/DefaultMetadataEventNotifier.java index d65a3962961d..3cca5260dc93 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/DefaultMetadataEventNotifier.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/DefaultMetadataEventNotifier.java @@ -17,7 +17,7 @@ * under the License. */ package org.apache.pinot.controller.api.events; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.Schema; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/MetadataEventNotifier.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/MetadataEventNotifier.java index 1095043f76d7..1ef34e74803d 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/MetadataEventNotifier.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/MetadataEventNotifier.java @@ -17,7 +17,7 @@ * under the License. */ package org.apache.pinot.controller.api.events; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.Schema; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/Constants.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/Constants.java index 6c508cf588d7..13d5f88d2bc4 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/Constants.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/Constants.java @@ -20,7 +20,7 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response.Status; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceAssignmentRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceAssignmentRestletResource.java index 4f3a854e0407..caaa1f994049 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceAssignmentRestletResource.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceAssignmentRestletResource.java @@ -46,9 +46,9 @@ import org.apache.pinot.common.assignment.InstancePartitionsUtils; import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; import org.apache.pinot.controller.helix.core.assignment.instance.InstanceAssignmentDriver; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; import org.apache.pinot.spi.utils.JsonUtils; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.slf4j.Logger; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResource.java index 1ee5df6cc361..6f2e28f935e5 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResource.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResource.java @@ -40,7 +40,7 @@ import org.apache.pinot.common.utils.config.InstanceUtils; import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; import org.apache.pinot.controller.helix.core.PinotResourceManagerResponse; -import org.apache.pinot.spi.config.api.Instance; +import org.apache.pinot.spi.config.instance.Instance; import org.apache.pinot.spi.utils.JsonUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSchemaRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSchemaRestletResource.java index 74c0bdb62d72..362fb2e27908 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSchemaRestletResource.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSchemaRestletResource.java @@ -48,7 +48,7 @@ import org.apache.pinot.controller.api.events.MetadataEventNotifierFactory; import org.apache.pinot.controller.api.events.SchemaEventType; import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.utils.JsonUtils; import org.glassfish.jersey.media.multipart.FormDataBodyPart; 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 dd3430718ceb..cd622d2435aa 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 @@ -52,7 +52,7 @@ import org.apache.pinot.common.utils.URIUtils; import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; import org.apache.pinot.controller.helix.core.PinotResourceManagerResponse; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.JsonUtils; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.slf4j.Logger; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableIndexingConfigs.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableIndexingConfigs.java index 4a1319d0a692..6777cf161f86 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableIndexingConfigs.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableIndexingConfigs.java @@ -32,7 +32,7 @@ import javax.ws.rs.core.Response; import org.apache.pinot.common.utils.config.TableConfigUtils; import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.utils.JsonUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableInstances.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableInstances.java index a1424e948d5e..4a3003e14432 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableInstances.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableInstances.java @@ -34,7 +34,7 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.JsonUtils; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableMetadataConfigs.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableMetadataConfigs.java index f882d37ce118..4b944fd67544 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableMetadataConfigs.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableMetadataConfigs.java @@ -31,7 +31,7 @@ import javax.ws.rs.core.Response; import org.apache.pinot.common.utils.config.TableConfigUtils; import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.utils.JsonUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableRestletResource.java index 285ae7e2fc11..a1881e05a90f 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 @@ -54,9 +54,9 @@ import org.apache.pinot.controller.helix.core.rebalance.RebalanceConfigConstants; import org.apache.pinot.controller.helix.core.rebalance.RebalanceResult; import org.apache.pinot.core.util.ReplicationUtils; -import org.apache.pinot.spi.config.SegmentsValidationAndRetentionConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.JsonUtils; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableSegmentConfigs.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableSegmentConfigs.java index 4ec9565afedc..ff8831dc3763 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableSegmentConfigs.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableSegmentConfigs.java @@ -33,7 +33,7 @@ import org.apache.pinot.common.metrics.ControllerMetrics; import org.apache.pinot.common.utils.config.TableConfigUtils; import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.utils.JsonUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTenantRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTenantRestletResource.java index 7da9c6a03819..95081f9fac26 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTenantRestletResource.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTenantRestletResource.java @@ -48,9 +48,9 @@ import org.apache.pinot.common.metrics.ControllerMetrics; import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; import org.apache.pinot.controller.helix.core.PinotResourceManagerResponse; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.api.Tenant; -import org.apache.pinot.spi.config.api.TenantRole; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.tenant.Tenant; +import org.apache.pinot.spi.config.tenant.TenantRole; import org.apache.pinot.spi.utils.JsonUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableViews.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableViews.java index af8d4a3e05bf..e5f519fe9a6a 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableViews.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableViews.java @@ -36,7 +36,7 @@ import org.apache.helix.model.ExternalView; import org.apache.helix.model.IdealState; import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/SegmentValidator.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/SegmentValidator.java index 9228f55bff03..d4fc98e28901 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/SegmentValidator.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/SegmentValidator.java @@ -32,7 +32,7 @@ import org.apache.pinot.controller.util.TableSizeReader; import org.apache.pinot.controller.validation.StorageQuotaChecker; import org.apache.pinot.core.segment.index.metadata.SegmentMetadata; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.utils.TimeUtils; import org.joda.time.Interval; import org.slf4j.Logger; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/ControllerRequestURLBuilder.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/ControllerRequestURLBuilder.java index 47bb1812e60c..94b6e18fb9c8 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/ControllerRequestURLBuilder.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/ControllerRequestURLBuilder.java @@ -23,7 +23,7 @@ import org.apache.pinot.common.utils.StringUtil; import org.apache.pinot.common.utils.URIUtils; import org.apache.pinot.controller.helix.core.rebalance.RebalanceConfigConstants; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; public class ControllerRequestURLBuilder { diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/SegmentStatusChecker.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/SegmentStatusChecker.java index 6bbe41cad24f..9501b288925a 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/SegmentStatusChecker.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/SegmentStatusChecker.java @@ -30,7 +30,7 @@ import org.apache.pinot.controller.LeadControllerManager; import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; import org.apache.pinot.controller.helix.core.periodictask.ControllerPeriodicTask; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 ffe59a8c1296..ec968364c5f6 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 @@ -95,15 +95,15 @@ import org.apache.pinot.controller.helix.core.util.ZKMetadataUtils; import org.apache.pinot.controller.helix.starter.HelixConfig; import org.apache.pinot.core.segment.index.metadata.SegmentMetadata; -import org.apache.pinot.spi.config.IndexingConfig; -import org.apache.pinot.spi.config.SegmentsValidationAndRetentionConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableCustomConfig; -import org.apache.pinot.spi.config.TableType; -import org.apache.pinot.spi.config.TenantConfig; -import org.apache.pinot.spi.config.api.Instance; -import org.apache.pinot.spi.config.api.Tenant; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.IndexingConfig; +import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableCustomConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.config.table.TenantConfig; +import org.apache.pinot.spi.config.instance.Instance; +import org.apache.pinot.spi.config.tenant.Tenant; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.stream.StreamConfig; import org.apache.pinot.spi.utils.builder.TableNameBuilder; 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 a17c79c98e56..05b61ba88920 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 @@ -31,7 +31,7 @@ import org.apache.pinot.common.utils.config.TagNameUtils; import org.apache.pinot.common.utils.helix.HelixHelper; import org.apache.pinot.controller.helix.core.realtime.PinotLLCRealtimeSegmentManager; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.stream.PartitionCountFetcher; import org.apache.pinot.spi.stream.StreamConfig; import org.apache.pinot.spi.utils.retry.RetryPolicies; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceAssignmentDriver.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceAssignmentDriver.java index d18f214775c7..1440fae2048f 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceAssignmentDriver.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceAssignmentDriver.java @@ -24,10 +24,10 @@ import org.apache.helix.model.InstanceConfig; import org.apache.pinot.common.assignment.InstanceAssignmentConfigUtils; import org.apache.pinot.common.assignment.InstancePartitions; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.assignment.InstanceAssignmentConfig; -import org.apache.pinot.spi.config.assignment.InstanceConstraintConfig; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.assignment.InstanceAssignmentConfig; +import org.apache.pinot.spi.config.table.assignment.InstanceConstraintConfig; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceReplicaGroupPartitionSelector.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceReplicaGroupPartitionSelector.java index 95677241132d..0b20662dbcf0 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceReplicaGroupPartitionSelector.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceReplicaGroupPartitionSelector.java @@ -25,7 +25,7 @@ import java.util.TreeMap; import org.apache.helix.model.InstanceConfig; import org.apache.pinot.common.assignment.InstancePartitions; -import org.apache.pinot.spi.config.assignment.InstanceReplicaGroupPartitionConfig; +import org.apache.pinot.spi.config.table.assignment.InstanceReplicaGroupPartitionConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceTagPoolSelector.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceTagPoolSelector.java index 6d819c7080d3..5aefd1ad6986 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceTagPoolSelector.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceTagPoolSelector.java @@ -27,7 +27,7 @@ import java.util.TreeMap; import org.apache.helix.model.InstanceConfig; import org.apache.pinot.common.utils.config.InstanceUtils; -import org.apache.pinot.spi.config.assignment.InstanceTagPoolConfig; +import org.apache.pinot.spi.config.table.assignment.InstanceTagPoolConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/OfflineSegmentAssignment.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/OfflineSegmentAssignment.java index 4d019668c4de..166f2a75ca87 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/OfflineSegmentAssignment.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/OfflineSegmentAssignment.java @@ -35,9 +35,9 @@ import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata; import org.apache.pinot.common.utils.CommonConstants.Helix.StateModel.SegmentOnlineOfflineStateModel; import org.apache.pinot.controller.helix.core.rebalance.RebalanceConfigConstants; -import org.apache.pinot.spi.config.ReplicaGroupStrategyConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.ReplicaGroupStrategyConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/RealtimeSegmentAssignment.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/RealtimeSegmentAssignment.java index f7e99d26b524..177b6ee0fb50 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/RealtimeSegmentAssignment.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/RealtimeSegmentAssignment.java @@ -32,8 +32,8 @@ import org.apache.pinot.common.utils.CommonConstants.Helix.StateModel.RealtimeSegmentOnlineOfflineStateModel; import org.apache.pinot.common.utils.LLCSegmentName; import org.apache.pinot.controller.helix.core.rebalance.RebalanceConfigConstants; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/SegmentAssignment.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/SegmentAssignment.java index a9b1787e16ce..1cb189b46fb5 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/SegmentAssignment.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/SegmentAssignment.java @@ -23,8 +23,8 @@ import org.apache.commons.configuration.Configuration; import org.apache.helix.HelixManager; import org.apache.pinot.common.assignment.InstancePartitions; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; /** diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/SegmentAssignmentFactory.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/SegmentAssignmentFactory.java index 11452687f50c..a49f7b977730 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/SegmentAssignmentFactory.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/SegmentAssignmentFactory.java @@ -19,8 +19,8 @@ package org.apache.pinot.controller.helix.core.assignment.segment; import org.apache.helix.HelixManager; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; /** diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/ClusterInfoProvider.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/ClusterInfoProvider.java index a30cac5d3083..678d10d425ba 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/ClusterInfoProvider.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/ClusterInfoProvider.java @@ -29,7 +29,7 @@ import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; import org.apache.pinot.controller.helix.core.minion.generator.PinotTaskGenerator; import org.apache.pinot.core.minion.PinotTaskConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.Schema; 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 1e0e5db46550..866dd2be2d9b 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 @@ -32,8 +32,8 @@ import org.apache.pinot.controller.helix.core.minion.generator.TaskGeneratorRegistry; import org.apache.pinot.controller.helix.core.periodictask.ControllerPeriodicTask; import org.apache.pinot.core.minion.PinotTaskConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableTaskConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableTaskConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/ConvertToRawIndexTaskGenerator.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/ConvertToRawIndexTaskGenerator.java index ac1d9aff9006..c81e1e66afdc 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/ConvertToRawIndexTaskGenerator.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/ConvertToRawIndexTaskGenerator.java @@ -30,9 +30,9 @@ import org.apache.pinot.controller.helix.core.minion.ClusterInfoProvider; import org.apache.pinot.core.common.MinionConstants; import org.apache.pinot.core.minion.PinotTaskConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableTaskConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableTaskConfig; +import org.apache.pinot.spi.config.table.TableType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/PinotTaskGenerator.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/PinotTaskGenerator.java index c4b282c42b5a..823d6aa4a16a 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/PinotTaskGenerator.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/PinotTaskGenerator.java @@ -22,7 +22,7 @@ import javax.annotation.Nonnull; import org.apache.helix.task.JobConfig; import org.apache.pinot.core.minion.PinotTaskConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; /** 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 f349d69cd1a6..75045ae03c1d 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 @@ -67,10 +67,10 @@ import org.apache.pinot.controller.helix.core.realtime.segment.FlushThresholdUpdater; import org.apache.pinot.controller.util.SegmentCompletionUtils; import org.apache.pinot.core.segment.index.metadata.SegmentMetadataImpl; -import org.apache.pinot.spi.config.ColumnPartitionConfig; -import org.apache.pinot.spi.config.SegmentPartitionConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.ColumnPartitionConfig; +import org.apache.pinot.spi.config.table.SegmentPartitionConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; import org.apache.pinot.spi.filesystem.PinotFS; import org.apache.pinot.spi.filesystem.PinotFSFactory; import org.apache.pinot.spi.stream.OffsetCriteria; 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 89fcdbbb8ba0..6a22b63e45b2 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 @@ -53,8 +53,8 @@ import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; import org.apache.pinot.controller.helix.core.PinotTableIdealStateBuilder; import org.apache.pinot.core.query.utils.Pair; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.stream.StreamConfig; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.apache.pinot.spi.utils.retry.RetryPolicies; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/TableConfigCache.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/TableConfigCache.java index b8a195809767..48901ecbc40a 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/TableConfigCache.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/TableConfigCache.java @@ -28,7 +28,7 @@ import org.apache.helix.ZNRecord; import org.apache.helix.store.zk.ZkHelixPropertyStore; import org.apache.pinot.common.metadata.ZKMetadataProvider; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; /** diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/RebalanceResult.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/RebalanceResult.java index 6c4190acb14d..a2d6d630d02c 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/RebalanceResult.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/RebalanceResult.java @@ -24,7 +24,7 @@ import java.util.Map; import javax.annotation.Nullable; import org.apache.pinot.common.assignment.InstancePartitions; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; @JsonIgnoreProperties(ignoreUnknown = true) 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 7964f58558c7..c6c5d5787575 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.pinot.controller.helix.core.assignment.segment.SegmentAssignment; import org.apache.pinot.controller.helix.core.assignment.segment.SegmentAssignmentFactory; import org.apache.pinot.controller.helix.core.assignment.segment.SegmentAssignmentUtils; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; import org.apache.pinot.spi.stream.StreamConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/relocation/RealtimeSegmentRelocator.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/relocation/RealtimeSegmentRelocator.java index 03981ba5e6a2..31c5f340a60c 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/relocation/RealtimeSegmentRelocator.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/relocation/RealtimeSegmentRelocator.java @@ -31,7 +31,7 @@ import org.apache.pinot.controller.helix.core.rebalance.RebalanceConfigConstants; import org.apache.pinot.controller.helix.core.rebalance.RebalanceResult; import org.apache.pinot.controller.helix.core.rebalance.TableRebalancer; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.stream.StreamConfig; import org.apache.pinot.spi.utils.TimeUtils; import org.apache.pinot.spi.utils.builder.TableNameBuilder; 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 f566638f653f..a616fc66c1bc 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 @@ -37,8 +37,8 @@ import org.apache.pinot.controller.helix.core.periodictask.ControllerPeriodicTask; import org.apache.pinot.controller.helix.core.retention.strategy.RetentionStrategy; import org.apache.pinot.controller.helix.core.retention.strategy.TimeRetentionStrategy; -import org.apache.pinot.spi.config.SegmentsValidationAndRetentionConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 21fbb98472ef..a1e1f75ab830 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 @@ -40,8 +40,8 @@ import org.apache.helix.store.zk.ZkHelixPropertyStore; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.controller.helix.ControllerRequestURLBuilder; -import org.apache.pinot.spi.config.IndexingConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.IndexingConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.FieldSpec; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.data.TimeFieldSpec; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/util/SegmentIntervalUtils.java b/pinot-controller/src/main/java/org/apache/pinot/controller/util/SegmentIntervalUtils.java index 44b2a2f96b5d..e08246e3beab 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/util/SegmentIntervalUtils.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/util/SegmentIntervalUtils.java @@ -19,7 +19,7 @@ package org.apache.pinot.controller.util; import org.apache.commons.lang3.StringUtils; -import org.apache.pinot.spi.config.SegmentsValidationAndRetentionConfig; +import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig; import org.joda.time.Duration; 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 c451de4fa303..455066f0cd8e 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 @@ -32,8 +32,8 @@ import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata; import org.apache.pinot.common.utils.config.TableConfigUtils; -import org.apache.pinot.spi.config.SegmentsValidationAndRetentionConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.utils.TimeUtils; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.slf4j.Logger; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/util/TableSizeReader.java b/pinot-controller/src/main/java/org/apache/pinot/controller/util/TableSizeReader.java index 8ef5b550645b..2181252d32c8 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/util/TableSizeReader.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/util/TableSizeReader.java @@ -36,7 +36,7 @@ import org.apache.pinot.common.restlet.resources.SegmentSizeInfo; import org.apache.pinot.controller.api.resources.ServerTableSizeReader; import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/validation/BrokerResourceValidationManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/validation/BrokerResourceValidationManager.java index 649542dc4ef9..d4402ed72747 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/validation/BrokerResourceValidationManager.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/validation/BrokerResourceValidationManager.java @@ -26,7 +26,7 @@ import org.apache.pinot.controller.LeadControllerManager; import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; import org.apache.pinot.controller.helix.core.periodictask.ControllerPeriodicTask; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/validation/OfflineSegmentIntervalChecker.java b/pinot-controller/src/main/java/org/apache/pinot/controller/validation/OfflineSegmentIntervalChecker.java index 56e01aba59ff..dc986003a157 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/validation/OfflineSegmentIntervalChecker.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/validation/OfflineSegmentIntervalChecker.java @@ -30,9 +30,9 @@ import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; import org.apache.pinot.controller.helix.core.periodictask.ControllerPeriodicTask; import org.apache.pinot.controller.util.SegmentIntervalUtils; -import org.apache.pinot.spi.config.SegmentsValidationAndRetentionConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.TimeUtils; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.joda.time.Duration; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/validation/RealtimeSegmentValidationManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/validation/RealtimeSegmentValidationManager.java index fec1c743d1a3..732a60e09d1b 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/validation/RealtimeSegmentValidationManager.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/validation/RealtimeSegmentValidationManager.java @@ -32,8 +32,8 @@ import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; import org.apache.pinot.controller.helix.core.periodictask.ControllerPeriodicTask; import org.apache.pinot.controller.helix.core.realtime.PinotLLCRealtimeSegmentManager; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.stream.PartitionLevelStreamConfig; import org.apache.pinot.spi.stream.StreamConfig; import org.apache.pinot.spi.utils.builder.TableNameBuilder; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/validation/StorageQuotaChecker.java b/pinot-controller/src/main/java/org/apache/pinot/controller/validation/StorageQuotaChecker.java index d3e7baef0d1d..f7712ca5de28 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/validation/StorageQuotaChecker.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/validation/StorageQuotaChecker.java @@ -23,8 +23,8 @@ import org.apache.pinot.common.metrics.ControllerGauge; import org.apache.pinot.common.metrics.ControllerMetrics; import org.apache.pinot.controller.util.TableSizeReader; -import org.apache.pinot.spi.config.QuotaConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.QuotaConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.utils.DataSizeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotFileUploadTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotFileUploadTest.java index b3c07c7aa3ae..0ad74bf1aa9a 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotFileUploadTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotFileUploadTest.java @@ -24,8 +24,8 @@ import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.pinot.controller.helix.ControllerTest; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.testng.Assert; import org.testng.annotations.AfterClass; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotInstanceAssignmentRestletResourceTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotInstanceAssignmentRestletResourceTest.java index 9fe105df54bf..d4874e28337b 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotInstanceAssignmentRestletResourceTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotInstanceAssignmentRestletResourceTest.java @@ -29,14 +29,14 @@ import org.apache.pinot.controller.ControllerConf; import org.apache.pinot.controller.helix.ControllerTest; import org.apache.pinot.core.realtime.impl.fakestream.FakeStreamConfigUtils; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; -import org.apache.pinot.spi.config.api.Tenant; -import org.apache.pinot.spi.config.api.TenantRole; -import org.apache.pinot.spi.config.assignment.InstanceAssignmentConfig; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; -import org.apache.pinot.spi.config.assignment.InstanceReplicaGroupPartitionConfig; -import org.apache.pinot.spi.config.assignment.InstanceTagPoolConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.config.tenant.Tenant; +import org.apache.pinot.spi.config.tenant.TenantRole; +import org.apache.pinot.spi.config.table.assignment.InstanceAssignmentConfig; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.assignment.InstanceReplicaGroupPartitionConfig; +import org.apache.pinot.spi.config.table.assignment.InstanceTagPoolConfig; import org.apache.pinot.spi.data.FieldSpec.DataType; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.utils.JsonUtils; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotInstanceRestletResourceTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotInstanceRestletResourceTest.java index fed62919c87f..02a9ad782b67 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotInstanceRestletResourceTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotInstanceRestletResourceTest.java @@ -28,8 +28,8 @@ import javax.annotation.Nullable; import org.apache.pinot.common.utils.CommonConstants.Helix; import org.apache.pinot.controller.helix.ControllerTest; -import org.apache.pinot.spi.config.api.Instance; -import org.apache.pinot.spi.config.api.InstanceType; +import org.apache.pinot.spi.config.instance.Instance; +import org.apache.pinot.spi.config.instance.InstanceType; import org.apache.pinot.spi.utils.JsonUtils; import org.apache.pinot.util.TestUtils; import org.testng.annotations.AfterClass; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotSegmentRestletResourceTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotSegmentRestletResourceTest.java index d60b028c0b51..251130983a1c 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotSegmentRestletResourceTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotSegmentRestletResourceTest.java @@ -23,8 +23,8 @@ import org.apache.pinot.controller.helix.ControllerTest; import org.apache.pinot.controller.utils.SegmentMetadataMockUtils; import org.apache.pinot.core.segment.index.metadata.SegmentMetadata; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.JsonUtils; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.apache.pinot.spi.utils.builder.TableNameBuilder; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTableRestletResourceTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTableRestletResourceTest.java index 4bac330ed103..8ee6af6bd4d5 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTableRestletResourceTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTableRestletResourceTest.java @@ -27,9 +27,9 @@ import org.apache.pinot.controller.helix.ControllerTest; import org.apache.pinot.controller.helix.core.rebalance.RebalanceResult; import org.apache.pinot.core.realtime.impl.fakestream.FakeStreamConfigUtils; -import org.apache.pinot.spi.config.QuotaConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.QuotaConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.stream.StreamConfig; import org.apache.pinot.spi.utils.JsonUtils; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTenantRestletResourceTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTenantRestletResourceTest.java index fae611be09dc..3f5b3fcafac8 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTenantRestletResourceTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTenantRestletResourceTest.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.JsonNode; import org.apache.pinot.common.utils.config.TagNameUtils; import org.apache.pinot.controller.helix.ControllerTest; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.JsonUtils; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.testng.annotations.AfterClass; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/TableViewsTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/TableViewsTest.java index a0f72980fcf5..7b83897a66c0 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/TableViewsTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/TableViewsTest.java @@ -27,8 +27,8 @@ import org.apache.pinot.controller.helix.ControllerTest; import org.apache.pinot.controller.utils.SegmentMetadataMockUtils; import org.apache.pinot.core.realtime.impl.fakestream.FakeStreamConfigUtils; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.stream.StreamConfig; import org.apache.pinot.spi.utils.JsonUtils; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/upload/ZKOperatorTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/upload/ZKOperatorTest.java index 31985fe9af6a..2b52497650a8 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/upload/ZKOperatorTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/upload/ZKOperatorTest.java @@ -25,8 +25,8 @@ import org.apache.pinot.controller.ControllerConf; import org.apache.pinot.controller.helix.ControllerTest; import org.apache.pinot.core.segment.index.metadata.SegmentMetadata; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerInstanceToggleTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerInstanceToggleTest.java index af9039e44335..28dbb85d4ef6 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerInstanceToggleTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerInstanceToggleTest.java @@ -25,8 +25,8 @@ import org.apache.pinot.common.utils.config.TagNameUtils; import org.apache.pinot.common.utils.helix.HelixHelper; import org.apache.pinot.controller.utils.SegmentMetadataMockUtils; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.apache.pinot.util.TestUtils; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerSentinelTestV2.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerSentinelTestV2.java index 3057d484578f..e66ba75c6f9b 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerSentinelTestV2.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerSentinelTestV2.java @@ -22,8 +22,8 @@ import org.apache.pinot.common.utils.CommonConstants; import org.apache.pinot.common.utils.config.TagNameUtils; import org.apache.pinot.controller.utils.SegmentMetadataMockUtils; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.testng.Assert; import org.testng.annotations.AfterClass; 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 faa36dd704ba..e02ff42d6c4c 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 @@ -65,8 +65,8 @@ import org.apache.pinot.controller.ControllerConf; import org.apache.pinot.controller.ControllerStarter; import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; -import org.apache.pinot.spi.config.api.Tenant; -import org.apache.pinot.spi.config.api.TenantRole; +import org.apache.pinot.spi.config.tenant.Tenant; +import org.apache.pinot.spi.config.tenant.TenantRole; import org.apache.pinot.spi.data.DimensionFieldSpec; import org.apache.pinot.spi.data.FieldSpec; import org.apache.pinot.spi.data.MetricFieldSpec; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/PinotResourceManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/PinotResourceManagerTest.java index 53e32de0c084..0e61fca8736e 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/PinotResourceManagerTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/PinotResourceManagerTest.java @@ -25,8 +25,8 @@ import org.apache.helix.model.IdealState; import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata; import org.apache.pinot.controller.utils.SegmentMetadataMockUtils; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.testng.Assert; 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 9e2d1907b3a6..569799be6472 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 @@ -49,14 +49,14 @@ import org.apache.pinot.common.utils.helix.LeadControllerUtils; import org.apache.pinot.controller.ControllerConf; import org.apache.pinot.controller.helix.ControllerTest; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; -import org.apache.pinot.spi.config.TagOverrideConfig; -import org.apache.pinot.spi.config.TenantConfig; -import org.apache.pinot.spi.config.api.Instance; -import org.apache.pinot.spi.config.api.InstanceType; -import org.apache.pinot.spi.config.api.Tenant; -import org.apache.pinot.spi.config.api.TenantRole; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.config.table.TagOverrideConfig; +import org.apache.pinot.spi.config.table.TenantConfig; +import org.apache.pinot.spi.config.instance.Instance; +import org.apache.pinot.spi.config.instance.InstanceType; +import org.apache.pinot.spi.config.tenant.Tenant; +import org.apache.pinot.spi.config.tenant.TenantRole; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.apache.pinot.util.TestUtils; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceAssignmentTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceAssignmentTest.java index e3a458144a44..c21b2a3d73db 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceAssignmentTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceAssignmentTest.java @@ -28,15 +28,15 @@ import org.apache.pinot.common.utils.CommonConstants.Segment.AssignmentStrategy; import org.apache.pinot.common.utils.config.InstanceUtils; import org.apache.pinot.common.utils.config.TagNameUtils; -import org.apache.pinot.spi.config.ColumnPartitionConfig; -import org.apache.pinot.spi.config.ReplicaGroupStrategyConfig; -import org.apache.pinot.spi.config.SegmentPartitionConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; -import org.apache.pinot.spi.config.assignment.InstanceAssignmentConfig; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; -import org.apache.pinot.spi.config.assignment.InstanceReplicaGroupPartitionConfig; -import org.apache.pinot.spi.config.assignment.InstanceTagPoolConfig; +import org.apache.pinot.spi.config.table.ColumnPartitionConfig; +import org.apache.pinot.spi.config.table.ReplicaGroupStrategyConfig; +import org.apache.pinot.spi.config.table.SegmentPartitionConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.config.table.assignment.InstanceAssignmentConfig; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.assignment.InstanceReplicaGroupPartitionConfig; +import org.apache.pinot.spi.config.table.assignment.InstanceTagPoolConfig; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.testng.annotations.Test; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/segment/OfflineNonReplicaGroupSegmentAssignmentTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/segment/OfflineNonReplicaGroupSegmentAssignmentTest.java index 9d7b4e673687..d0377252c6cd 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/segment/OfflineNonReplicaGroupSegmentAssignmentTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/segment/OfflineNonReplicaGroupSegmentAssignmentTest.java @@ -29,9 +29,9 @@ import org.apache.pinot.common.assignment.InstancePartitions; import org.apache.pinot.common.utils.CommonConstants.Helix.StateModel.SegmentOnlineOfflineStateModel; import org.apache.pinot.controller.helix.core.rebalance.RebalanceConfigConstants; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; 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 73de0406f05a..31f3bb47c186 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 @@ -37,10 +37,10 @@ import org.apache.pinot.common.utils.CommonConstants.Helix.StateModel.SegmentOnlineOfflineStateModel; import org.apache.pinot.common.utils.CommonConstants.Segment.AssignmentStrategy; import org.apache.pinot.controller.helix.core.rebalance.RebalanceConfigConstants; -import org.apache.pinot.spi.config.ReplicaGroupStrategyConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.ReplicaGroupStrategyConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.testng.annotations.BeforeClass; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/segment/RealtimeNonReplicaGroupSegmentAssignmentTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/segment/RealtimeNonReplicaGroupSegmentAssignmentTest.java index a70caa6d028e..51a13ab9a44c 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/segment/RealtimeNonReplicaGroupSegmentAssignmentTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/segment/RealtimeNonReplicaGroupSegmentAssignmentTest.java @@ -27,9 +27,9 @@ import org.apache.pinot.common.utils.CommonConstants.Helix.StateModel.RealtimeSegmentOnlineOfflineStateModel; import org.apache.pinot.common.utils.LLCSegmentName; import org.apache.pinot.controller.helix.core.rebalance.RebalanceConfigConstants; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/segment/RealtimeReplicaGroupSegmentAssignmentTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/segment/RealtimeReplicaGroupSegmentAssignmentTest.java index 4bde4c4dc2dd..6eb51484b28f 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/segment/RealtimeReplicaGroupSegmentAssignmentTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/segment/RealtimeReplicaGroupSegmentAssignmentTest.java @@ -29,9 +29,9 @@ import org.apache.pinot.common.utils.CommonConstants.Segment.AssignmentStrategy; import org.apache.pinot.common.utils.LLCSegmentName; import org.apache.pinot.controller.helix.core.rebalance.RebalanceConfigConstants; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManagerTest.java index 2470fe8fbd4a..ff3792e76bfa 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 @@ -49,9 +49,9 @@ import org.apache.pinot.core.indexsegment.generator.SegmentVersion; import org.apache.pinot.core.realtime.impl.fakestream.FakeStreamConfigUtils; import org.apache.pinot.core.segment.index.metadata.SegmentMetadataImpl; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; import org.apache.pinot.spi.filesystem.PinotFSFactory; import org.apache.pinot.spi.stream.OffsetCriteria; import org.apache.pinot.spi.stream.PartitionLevelStreamConfig; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalancerClusterTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalancerClusterTest.java index 37ab0a551b5a..4253c9ef2077 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalancerClusterTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalancerClusterTest.java @@ -29,12 +29,12 @@ import org.apache.pinot.controller.helix.ControllerTest; import org.apache.pinot.controller.helix.core.assignment.segment.SegmentAssignmentUtils; import org.apache.pinot.controller.utils.SegmentMetadataMockUtils; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; -import org.apache.pinot.spi.config.assignment.InstanceAssignmentConfig; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; -import org.apache.pinot.spi.config.assignment.InstanceReplicaGroupPartitionConfig; -import org.apache.pinot.spi.config.assignment.InstanceTagPoolConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.config.table.assignment.InstanceAssignmentConfig; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.assignment.InstanceReplicaGroupPartitionConfig; +import org.apache.pinot.spi.config.table.assignment.InstanceTagPoolConfig; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.testng.annotations.AfterClass; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/retention/RetentionManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/retention/RetentionManagerTest.java index ba91bce750d3..a3331efe6c10 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/retention/RetentionManagerTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/retention/RetentionManagerTest.java @@ -38,8 +38,8 @@ import org.apache.pinot.controller.helix.core.SegmentDeletionManager; import org.apache.pinot.controller.helix.core.util.ZKMetadataUtils; import org.apache.pinot.core.segment.index.metadata.SegmentMetadata; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.joda.time.Duration; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/validation/StorageQuotaCheckerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/validation/StorageQuotaCheckerTest.java index f76bfb494c39..837734aa648d 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/validation/StorageQuotaCheckerTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/validation/StorageQuotaCheckerTest.java @@ -24,9 +24,9 @@ import org.apache.pinot.common.metrics.ControllerGauge; import org.apache.pinot.common.metrics.ControllerMetrics; import org.apache.pinot.controller.util.TableSizeReader; -import org.apache.pinot.spi.config.QuotaConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.QuotaConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/validation/ValidationManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/validation/ValidationManagerTest.java index fa74eab53eb1..d520356e45b0 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/validation/ValidationManagerTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/validation/ValidationManagerTest.java @@ -33,8 +33,8 @@ import org.apache.pinot.controller.helix.ControllerTest; import org.apache.pinot.controller.utils.SegmentMetadataMockUtils; import org.apache.pinot.core.segment.index.metadata.SegmentMetadata; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.apache.pinot.util.TestUtils; 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 ea7279c63a36..7a5008f1269d 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,7 +34,7 @@ import org.apache.pinot.core.data.manager.offline.ImmutableSegmentDataManager; import org.apache.pinot.core.indexsegment.immutable.ImmutableSegment; import org.apache.pinot.core.segment.index.loader.IndexLoadingConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/TableDataManager.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/TableDataManager.java index dc9e1930a96d..0ea39b1267bf 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/TableDataManager.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/TableDataManager.java @@ -28,7 +28,7 @@ import org.apache.pinot.core.data.manager.config.TableDataManagerConfig; import org.apache.pinot.core.indexsegment.immutable.ImmutableSegment; import org.apache.pinot.core.segment.index.loader.IndexLoadingConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; /** diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/config/TableDataManagerConfig.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/config/TableDataManagerConfig.java index dac01eab01b7..5fe390bcbdac 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/config/TableDataManagerConfig.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/config/TableDataManagerConfig.java @@ -22,8 +22,8 @@ import javax.annotation.Nonnull; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.PropertiesConfiguration; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableNameBuilder; 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 8ddd960f8f34..e087666731ee 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 @@ -27,7 +27,7 @@ import org.apache.pinot.core.data.manager.config.InstanceDataManagerConfig; import org.apache.pinot.core.data.manager.config.TableDataManagerConfig; import org.apache.pinot.core.data.manager.realtime.RealtimeTableDataManager; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; /** diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/HLRealtimeSegmentDataManager.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/HLRealtimeSegmentDataManager.java index 4cb7af2add78..98f127b88077 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/HLRealtimeSegmentDataManager.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/HLRealtimeSegmentDataManager.java @@ -43,8 +43,8 @@ import org.apache.pinot.core.realtime.converter.RealtimeSegmentConverter; import org.apache.pinot.core.realtime.impl.RealtimeSegmentConfig; import org.apache.pinot.core.segment.index.loader.IndexLoadingConfig; -import org.apache.pinot.spi.config.IndexingConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.IndexingConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.data.readers.GenericRow; import org.apache.pinot.spi.stream.StreamConfig; diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManager.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManager.java index e5c078b166fb..1cf8f5bba4ce 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManager.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManager.java @@ -57,11 +57,11 @@ import org.apache.pinot.core.segment.creator.impl.V1Constants; import org.apache.pinot.core.segment.index.loader.IndexLoadingConfig; import org.apache.pinot.server.realtime.ServerSegmentCompletionProtocolHandler; -import org.apache.pinot.spi.config.ColumnPartitionConfig; -import org.apache.pinot.spi.config.CompletionConfig; -import org.apache.pinot.spi.config.IndexingConfig; -import org.apache.pinot.spi.config.SegmentPartitionConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.ColumnPartitionConfig; +import org.apache.pinot.spi.config.table.CompletionConfig; +import org.apache.pinot.spi.config.table.IndexingConfig; +import org.apache.pinot.spi.config.table.SegmentPartitionConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.data.readers.GenericRow; import org.apache.pinot.spi.stream.MessageBatch; diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/RealtimeTableDataManager.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/RealtimeTableDataManager.java index 2457bdad8fa0..0143eede9547 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/RealtimeTableDataManager.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/RealtimeTableDataManager.java @@ -51,8 +51,8 @@ import org.apache.pinot.core.segment.index.loader.IndexLoadingConfig; import org.apache.pinot.core.segment.index.loader.LoaderUtils; import org.apache.pinot.core.segment.virtualcolumn.VirtualColumnProviderFactory; -import org.apache.pinot.spi.config.IndexingConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.IndexingConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.FieldSpec; import org.apache.pinot.spi.data.Schema; diff --git a/pinot-core/src/main/java/org/apache/pinot/core/indexsegment/generator/SegmentGeneratorConfig.java b/pinot-core/src/main/java/org/apache/pinot/core/indexsegment/generator/SegmentGeneratorConfig.java index 4f9fa01d1579..197712586ad7 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/indexsegment/generator/SegmentGeneratorConfig.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/indexsegment/generator/SegmentGeneratorConfig.java @@ -40,11 +40,11 @@ import org.apache.pinot.core.segment.name.SegmentNameGenerator; import org.apache.pinot.core.segment.name.SimpleSegmentNameGenerator; import org.apache.pinot.core.startree.v2.builder.StarTreeV2BuilderConfig; -import org.apache.pinot.spi.config.FieldConfig; -import org.apache.pinot.spi.config.IndexingConfig; -import org.apache.pinot.spi.config.SegmentPartitionConfig; -import org.apache.pinot.spi.config.StarTreeIndexConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.FieldConfig; +import org.apache.pinot.spi.config.table.IndexingConfig; +import org.apache.pinot.spi.config.table.SegmentPartitionConfig; +import org.apache.pinot.spi.config.table.StarTreeIndexConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.FieldSpec; import org.apache.pinot.spi.data.FieldSpec.FieldType; import org.apache.pinot.spi.data.Schema; diff --git a/pinot-core/src/main/java/org/apache/pinot/core/indexsegment/mutable/MutableSegmentImpl.java b/pinot-core/src/main/java/org/apache/pinot/core/indexsegment/mutable/MutableSegmentImpl.java index ba42e8bd4ace..9a8a68b9af21 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/indexsegment/mutable/MutableSegmentImpl.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/indexsegment/mutable/MutableSegmentImpl.java @@ -67,8 +67,8 @@ import org.apache.pinot.core.util.FixedIntArray; import org.apache.pinot.core.util.FixedIntArrayOffHeapIdMap; import org.apache.pinot.core.util.IdMap; -import org.apache.pinot.spi.config.ColumnPartitionConfig; -import org.apache.pinot.spi.config.SegmentPartitionConfig; +import org.apache.pinot.spi.config.table.ColumnPartitionConfig; +import org.apache.pinot.spi.config.table.SegmentPartitionConfig; import org.apache.pinot.spi.data.DimensionFieldSpec; import org.apache.pinot.spi.data.FieldSpec; import org.apache.pinot.spi.data.MetricFieldSpec; diff --git a/pinot-core/src/main/java/org/apache/pinot/core/minion/SegmentConverter.java b/pinot-core/src/main/java/org/apache/pinot/core/minion/SegmentConverter.java index 87253d23e774..8ef68ffea8db 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/minion/SegmentConverter.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/minion/SegmentConverter.java @@ -33,7 +33,7 @@ import org.apache.pinot.core.minion.segment.RecordTransformer; import org.apache.pinot.core.minion.segment.ReducerRecordReader; import org.apache.pinot.core.segment.creator.impl.SegmentIndexCreationDriverImpl; -import org.apache.pinot.spi.config.IndexingConfig; +import org.apache.pinot.spi.config.table.IndexingConfig; import org.apache.pinot.spi.data.readers.RecordReader; diff --git a/pinot-core/src/main/java/org/apache/pinot/core/minion/rollup/MergeRollupSegmentConverter.java b/pinot-core/src/main/java/org/apache/pinot/core/minion/rollup/MergeRollupSegmentConverter.java index 65262f183b92..3805c1e72c5d 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/minion/rollup/MergeRollupSegmentConverter.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/minion/rollup/MergeRollupSegmentConverter.java @@ -29,7 +29,7 @@ import org.apache.pinot.core.minion.segment.RecordAggregator; import org.apache.pinot.core.minion.segment.RecordTransformer; import org.apache.pinot.core.segment.index.metadata.SegmentMetadataImpl; -import org.apache.pinot.spi.config.IndexingConfig; +import org.apache.pinot.spi.config.table.IndexingConfig; import org.apache.pinot.spi.data.DimensionFieldSpec; import org.apache.pinot.spi.data.Schema; diff --git a/pinot-core/src/main/java/org/apache/pinot/core/realtime/converter/RealtimeSegmentConverter.java b/pinot-core/src/main/java/org/apache/pinot/core/realtime/converter/RealtimeSegmentConverter.java index a3151833f474..3a4f6dccc533 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/realtime/converter/RealtimeSegmentConverter.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/realtime/converter/RealtimeSegmentConverter.java @@ -33,8 +33,8 @@ import org.apache.pinot.core.io.compression.ChunkCompressorFactory; import org.apache.pinot.core.realtime.converter.stats.RealtimeSegmentSegmentCreationDataSource; import org.apache.pinot.core.segment.creator.impl.SegmentIndexCreationDriverImpl; -import org.apache.pinot.spi.config.ColumnPartitionConfig; -import org.apache.pinot.spi.config.SegmentPartitionConfig; +import org.apache.pinot.spi.config.table.ColumnPartitionConfig; +import org.apache.pinot.spi.config.table.SegmentPartitionConfig; import org.apache.pinot.spi.data.FieldSpec; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.data.TimeFieldSpec; diff --git a/pinot-core/src/main/java/org/apache/pinot/core/segment/creator/StatsCollectorConfig.java b/pinot-core/src/main/java/org/apache/pinot/core/segment/creator/StatsCollectorConfig.java index 0ebc45924bda..06e173303818 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/segment/creator/StatsCollectorConfig.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/segment/creator/StatsCollectorConfig.java @@ -23,7 +23,7 @@ import javax.annotation.Nullable; import org.apache.pinot.core.data.partition.PartitionFunction; import org.apache.pinot.core.data.partition.PartitionFunctionFactory; -import org.apache.pinot.spi.config.SegmentPartitionConfig; +import org.apache.pinot.spi.config.table.SegmentPartitionConfig; import org.apache.pinot.spi.data.FieldSpec; import org.apache.pinot.spi.data.Schema; diff --git a/pinot-core/src/main/java/org/apache/pinot/core/segment/index/loader/IndexLoadingConfig.java b/pinot-core/src/main/java/org/apache/pinot/core/segment/index/loader/IndexLoadingConfig.java index d491d764b9dc..8b85d7373749 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/segment/index/loader/IndexLoadingConfig.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/segment/index/loader/IndexLoadingConfig.java @@ -31,9 +31,9 @@ import org.apache.pinot.core.data.manager.config.InstanceDataManagerConfig; import org.apache.pinot.core.indexsegment.generator.SegmentVersion; import org.apache.pinot.core.segment.index.loader.columnminmaxvalue.ColumnMinMaxValueGeneratorMode; -import org.apache.pinot.spi.config.FieldConfig; -import org.apache.pinot.spi.config.IndexingConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.FieldConfig; +import org.apache.pinot.spi.config.table.IndexingConfig; +import org.apache.pinot.spi.config.table.TableConfig; /** diff --git a/pinot-core/src/main/java/org/apache/pinot/core/segment/index/readers/text/LuceneTextIndexReader.java b/pinot-core/src/main/java/org/apache/pinot/core/segment/index/readers/text/LuceneTextIndexReader.java index 302724232f41..c5157c52b8df 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/segment/index/readers/text/LuceneTextIndexReader.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/segment/index/readers/text/LuceneTextIndexReader.java @@ -38,7 +38,7 @@ import org.apache.pinot.core.segment.index.readers.InvertedIndexReader; import org.apache.pinot.core.segment.memory.PinotDataBuffer; import org.apache.pinot.core.segment.store.SegmentDirectoryPaths; -import org.apache.pinot.spi.config.FieldConfig; +import org.apache.pinot.spi.config.table.FieldConfig; import org.roaringbitmap.buffer.MutableRoaringBitmap; import org.slf4j.LoggerFactory; diff --git a/pinot-core/src/main/java/org/apache/pinot/core/startree/v2/builder/StarTreeV2BuilderConfig.java b/pinot-core/src/main/java/org/apache/pinot/core/startree/v2/builder/StarTreeV2BuilderConfig.java index eef298a112ef..ca3f3bbd02e1 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/startree/v2/builder/StarTreeV2BuilderConfig.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/startree/v2/builder/StarTreeV2BuilderConfig.java @@ -25,7 +25,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.pinot.core.startree.v2.AggregationFunctionColumnPair; -import org.apache.pinot.spi.config.StarTreeIndexConfig; +import org.apache.pinot.spi.config.table.StarTreeIndexConfig; /** diff --git a/pinot-core/src/main/java/org/apache/pinot/core/transport/QueryRouter.java b/pinot-core/src/main/java/org/apache/pinot/core/transport/QueryRouter.java index 9c6ddb965d52..60f4a4275ff3 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/transport/QueryRouter.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/transport/QueryRouter.java @@ -29,7 +29,7 @@ import org.apache.pinot.common.request.BrokerRequest; import org.apache.pinot.common.request.InstanceRequest; import org.apache.pinot.common.utils.DataTable; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-core/src/main/java/org/apache/pinot/core/transport/ServerInstance.java b/pinot-core/src/main/java/org/apache/pinot/core/transport/ServerInstance.java index 6c3174ec8c85..97fb7c0d4802 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/transport/ServerInstance.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/transport/ServerInstance.java @@ -21,7 +21,7 @@ import com.google.common.annotations.VisibleForTesting; import org.apache.helix.model.InstanceConfig; import org.apache.pinot.common.utils.CommonConstants.Helix; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; public class ServerInstance { diff --git a/pinot-core/src/main/java/org/apache/pinot/core/transport/ServerRoutingInstance.java b/pinot-core/src/main/java/org/apache/pinot/core/transport/ServerRoutingInstance.java index b7313575de8b..93775684b3ee 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/transport/ServerRoutingInstance.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/transport/ServerRoutingInstance.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import javax.annotation.concurrent.ThreadSafe; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; /** diff --git a/pinot-core/src/main/java/org/apache/pinot/core/util/ReplicationUtils.java b/pinot-core/src/main/java/org/apache/pinot/core/util/ReplicationUtils.java index 8f18f788252f..6d33bc614c46 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/util/ReplicationUtils.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/util/ReplicationUtils.java @@ -18,9 +18,9 @@ */ package org.apache.pinot.core.util; -import org.apache.pinot.spi.config.SegmentsValidationAndRetentionConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.stream.StreamConfig; diff --git a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManagerTest.java b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManagerTest.java index 4acbc22624d2..4e41c3f736f9 100644 --- a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManagerTest.java +++ b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManagerTest.java @@ -42,7 +42,7 @@ import org.apache.pinot.core.realtime.impl.fakestream.FakeStreamConsumerFactory; import org.apache.pinot.core.realtime.impl.fakestream.FakeStreamMessageDecoder; import org.apache.pinot.core.segment.index.loader.IndexLoadingConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.stream.PermanentConsumerException; import org.apache.pinot.spi.stream.StreamConfigProperties; diff --git a/pinot-core/src/test/java/org/apache/pinot/core/segment/index/creator/SegmentPartitionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/segment/index/creator/SegmentPartitionTest.java index cb19e8561872..b3ddbea6f391 100644 --- a/pinot-core/src/test/java/org/apache/pinot/core/segment/index/creator/SegmentPartitionTest.java +++ b/pinot-core/src/test/java/org/apache/pinot/core/segment/index/creator/SegmentPartitionTest.java @@ -39,8 +39,8 @@ import org.apache.pinot.core.segment.creator.impl.SegmentIndexCreationDriverImpl; import org.apache.pinot.core.segment.index.metadata.ColumnMetadata; import org.apache.pinot.core.segment.index.metadata.SegmentMetadataImpl; -import org.apache.pinot.spi.config.ColumnPartitionConfig; -import org.apache.pinot.spi.config.SegmentPartitionConfig; +import org.apache.pinot.spi.config.table.ColumnPartitionConfig; +import org.apache.pinot.spi.config.table.SegmentPartitionConfig; import org.apache.pinot.spi.data.DimensionFieldSpec; import org.apache.pinot.spi.data.FieldSpec; import org.apache.pinot.spi.data.Schema; diff --git a/pinot-core/src/test/java/org/apache/pinot/core/transport/QueryRoutingTest.java b/pinot-core/src/test/java/org/apache/pinot/core/transport/QueryRoutingTest.java index 051763f077c5..ccec5ecc988e 100644 --- a/pinot-core/src/test/java/org/apache/pinot/core/transport/QueryRoutingTest.java +++ b/pinot-core/src/test/java/org/apache/pinot/core/transport/QueryRoutingTest.java @@ -29,7 +29,7 @@ import org.apache.pinot.core.common.datatable.DataTableImplV2; import org.apache.pinot.core.query.scheduler.QueryScheduler; import org.apache.pinot.pql.parsers.Pql2Compiler; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/BaseQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/BaseQueriesTest.java index 5d1dc8fcde26..6b012d321b34 100644 --- a/pinot-core/src/test/java/org/apache/pinot/queries/BaseQueriesTest.java +++ b/pinot-core/src/test/java/org/apache/pinot/queries/BaseQueriesTest.java @@ -36,7 +36,7 @@ import org.apache.pinot.core.query.reduce.BrokerReduceService; import org.apache.pinot.core.transport.ServerRoutingInstance; import org.apache.pinot.pql.parsers.Pql2Compiler; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.sql.parsers.CalciteSqlCompiler; diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/DistinctQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/DistinctQueriesTest.java index 8c0e6802cd50..3a47fc02df45 100644 --- a/pinot-core/src/test/java/org/apache/pinot/queries/DistinctQueriesTest.java +++ b/pinot-core/src/test/java/org/apache/pinot/queries/DistinctQueriesTest.java @@ -53,7 +53,7 @@ import org.apache.pinot.core.query.reduce.BrokerReduceService; import org.apache.pinot.core.segment.creator.impl.SegmentIndexCreationDriverImpl; import org.apache.pinot.core.transport.ServerRoutingInstance; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.data.FieldSpec.DataType; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.data.readers.GenericRow; diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BaseClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BaseClusterIntegrationTest.java index 747aefab0102..3b1773949238 100644 --- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BaseClusterIntegrationTest.java +++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BaseClusterIntegrationTest.java @@ -35,9 +35,9 @@ import org.apache.pinot.common.utils.TarGzCompressionUtils; import org.apache.pinot.common.utils.ZkStarter; import org.apache.pinot.common.utils.config.TagNameUtils; -import org.apache.pinot.spi.config.ColumnPartitionConfig; -import org.apache.pinot.spi.config.SegmentPartitionConfig; -import org.apache.pinot.spi.config.TableTaskConfig; +import org.apache.pinot.spi.config.table.ColumnPartitionConfig; +import org.apache.pinot.spi.config.table.SegmentPartitionConfig; +import org.apache.pinot.spi.config.table.TableTaskConfig; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.stream.StreamDataServerStartable; import org.apache.pinot.tools.utils.KafkaStarterUtils; diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ClusterTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ClusterTest.java index 0e016f08a80c..2db50c61a09c 100644 --- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ClusterTest.java +++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ClusterTest.java @@ -62,13 +62,13 @@ import org.apache.pinot.plugin.stream.kafka.KafkaStreamConfigProperties; import org.apache.pinot.server.starter.helix.DefaultHelixStarterServerConfig; import org.apache.pinot.server.starter.helix.HelixServerStarter; -import org.apache.pinot.spi.config.FieldConfig; -import org.apache.pinot.spi.config.IndexingConfig; -import org.apache.pinot.spi.config.SegmentPartitionConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableTaskConfig; -import org.apache.pinot.spi.config.TableType; -import org.apache.pinot.spi.config.TenantConfig; +import org.apache.pinot.spi.config.table.FieldConfig; +import org.apache.pinot.spi.config.table.IndexingConfig; +import org.apache.pinot.spi.config.table.SegmentPartitionConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableTaskConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.config.table.TenantConfig; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.utils.SchemaFieldExtractorUtils; import org.apache.pinot.spi.data.readers.GenericRow; diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ControllerPeriodicTasksIntegrationTests.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ControllerPeriodicTasksIntegrationTests.java index 3c15337631a1..4bcc04ccd0cb 100644 --- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ControllerPeriodicTasksIntegrationTests.java +++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ControllerPeriodicTasksIntegrationTests.java @@ -44,10 +44,10 @@ import org.apache.pinot.controller.validation.OfflineSegmentIntervalChecker; import org.apache.pinot.controller.validation.RealtimeSegmentValidationManager; import org.apache.pinot.core.indexsegment.generator.SegmentVersion; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; -import org.apache.pinot.spi.config.TagOverrideConfig; -import org.apache.pinot.spi.config.TenantConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.config.table.TagOverrideConfig; +import org.apache.pinot.spi.config.table.TenantConfig; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.apache.pinot.spi.utils.builder.TableNameBuilder; diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ConvertToRawIndexMinionClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ConvertToRawIndexMinionClusterIntegrationTest.java index 5090a5f0744c..f2bac1e563d4 100644 --- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ConvertToRawIndexMinionClusterIntegrationTest.java +++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ConvertToRawIndexMinionClusterIntegrationTest.java @@ -35,7 +35,7 @@ import org.apache.pinot.core.common.MinionConstants.ConvertToRawIndexTask; import org.apache.pinot.core.segment.index.metadata.SegmentMetadata; import org.apache.pinot.core.segment.index.metadata.SegmentMetadataImpl; -import org.apache.pinot.spi.config.TableTaskConfig; +import org.apache.pinot.spi.config.table.TableTaskConfig; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.apache.pinot.util.TestUtils; import org.testng.Assert; diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/DefaultCommitterRealtimeIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/DefaultCommitterRealtimeIntegrationTest.java index c3e0ab8d0ca2..dfb85827c248 100644 --- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/DefaultCommitterRealtimeIntegrationTest.java +++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/DefaultCommitterRealtimeIntegrationTest.java @@ -36,7 +36,7 @@ import org.apache.pinot.core.segment.index.loader.IndexLoadingConfig; import org.apache.pinot.server.realtime.ControllerLeaderLocator; import org.apache.pinot.server.realtime.ServerSegmentCompletionProtocolHandler; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.data.readers.GenericRow; import org.apache.pinot.spi.data.readers.RecordReader; diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/HybridClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/HybridClusterIntegrationTest.java index c11e4353bb94..72fb013a4fa5 100644 --- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/HybridClusterIntegrationTest.java +++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/HybridClusterIntegrationTest.java @@ -30,7 +30,7 @@ import org.apache.commons.io.FileUtils; import org.apache.pinot.common.utils.CommonConstants; import org.apache.pinot.controller.ControllerConf; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.utils.JsonUtils; import org.apache.pinot.spi.utils.builder.TableNameBuilder; diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/LLCRealtimeClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/LLCRealtimeClusterIntegrationTest.java index 7e860200442f..5ba2b5a4bcc8 100644 --- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/LLCRealtimeClusterIntegrationTest.java +++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/LLCRealtimeClusterIntegrationTest.java @@ -30,8 +30,8 @@ import org.apache.helix.ZNRecord; import org.apache.pinot.common.utils.CommonConstants; import org.apache.pinot.controller.ControllerConf; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.apache.pinot.util.TestUtils; diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/LuceneRealtimeClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/LuceneRealtimeClusterIntegrationTest.java index af2b399087d8..ba07a9ff9ebe 100644 --- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/LuceneRealtimeClusterIntegrationTest.java +++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/LuceneRealtimeClusterIntegrationTest.java @@ -36,7 +36,7 @@ import org.apache.avro.generic.GenericDatumWriter; import org.apache.commons.io.FileUtils; import org.apache.pinot.plugin.inputformat.avro.AvroUtils; -import org.apache.pinot.spi.config.FieldConfig; +import org.apache.pinot.spi.config.table.FieldConfig; 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-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterIntegrationTest.java index 0103a19f3d2e..a98c8c3765f8 100644 --- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterIntegrationTest.java +++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterIntegrationTest.java @@ -39,9 +39,9 @@ import org.apache.pinot.common.utils.CommonConstants; import org.apache.pinot.common.utils.ServiceStatus; import org.apache.pinot.core.indexsegment.generator.SegmentVersion; -import org.apache.pinot.spi.config.QueryConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.QueryConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.JsonUtils; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.apache.pinot.spi.utils.builder.TableNameBuilder; diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SimpleMinionClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SimpleMinionClusterIntegrationTest.java index ff32a924c51c..fd4b4035541a 100644 --- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SimpleMinionClusterIntegrationTest.java +++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SimpleMinionClusterIntegrationTest.java @@ -40,9 +40,9 @@ import org.apache.pinot.minion.executor.BaseTaskExecutor; import org.apache.pinot.minion.executor.PinotTaskExecutor; import org.apache.pinot.minion.executor.PinotTaskExecutorFactory; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableTaskConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableTaskConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.apache.pinot.util.TestUtils; import org.testng.annotations.AfterClass; diff --git a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-common/src/main/java/org/apache/pinot/plugin/ingestion/batch/common/SegmentGenerationTaskRunner.java b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-common/src/main/java/org/apache/pinot/plugin/ingestion/batch/common/SegmentGenerationTaskRunner.java index fe50b7901b6d..91f10286197f 100644 --- a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-common/src/main/java/org/apache/pinot/plugin/ingestion/batch/common/SegmentGenerationTaskRunner.java +++ b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-common/src/main/java/org/apache/pinot/plugin/ingestion/batch/common/SegmentGenerationTaskRunner.java @@ -31,8 +31,8 @@ import org.apache.pinot.core.segment.name.NormalizedDateSegmentNameGenerator; import org.apache.pinot.core.segment.name.SegmentNameGenerator; import org.apache.pinot.core.segment.name.SimpleSegmentNameGenerator; -import org.apache.pinot.spi.config.SegmentsValidationAndRetentionConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.data.TimeFieldSpec; import org.apache.pinot.spi.data.readers.RecordReader; diff --git a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-common/src/main/java/org/apache/pinot/plugin/ingestion/batch/common/SegmentGenerationUtils.java b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-common/src/main/java/org/apache/pinot/plugin/ingestion/batch/common/SegmentGenerationUtils.java index 8210faf5e06f..eafdf3102865 100644 --- a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-common/src/main/java/org/apache/pinot/plugin/ingestion/batch/common/SegmentGenerationUtils.java +++ b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-common/src/main/java/org/apache/pinot/plugin/ingestion/batch/common/SegmentGenerationUtils.java @@ -28,7 +28,7 @@ import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; import org.apache.commons.io.IOUtils; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.filesystem.PinotFS; import org.apache.pinot.spi.filesystem.PinotFSFactory; diff --git a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-standalone/src/main/java/org/apache/pinot/plugin/ingestion/batch/standalone/SegmentGenerationJobRunner.java b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-standalone/src/main/java/org/apache/pinot/plugin/ingestion/batch/standalone/SegmentGenerationJobRunner.java index 9be8c4015b81..8dc29d8d3192 100644 --- a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-standalone/src/main/java/org/apache/pinot/plugin/ingestion/batch/standalone/SegmentGenerationJobRunner.java +++ b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-standalone/src/main/java/org/apache/pinot/plugin/ingestion/batch/standalone/SegmentGenerationJobRunner.java @@ -31,7 +31,7 @@ import org.apache.pinot.common.utils.TarGzCompressionUtils; import org.apache.pinot.plugin.ingestion.batch.common.SegmentGenerationTaskRunner; import org.apache.pinot.plugin.ingestion.batch.common.SegmentGenerationUtils; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.filesystem.PinotFS; import org.apache.pinot.spi.filesystem.PinotFSFactory; diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/HadoopSegmentCreationJob.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/HadoopSegmentCreationJob.java index 6ab4571baddf..b42c92ef6957 100644 --- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/HadoopSegmentCreationJob.java +++ b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/HadoopSegmentCreationJob.java @@ -42,8 +42,8 @@ import org.apache.pinot.ingestion.common.JobConfigConstants; import org.apache.pinot.ingestion.jobs.SegmentCreationJob; import org.apache.pinot.ingestion.utils.JobPreparationHelper; -import org.apache.pinot.spi.config.SegmentsValidationAndRetentionConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig; +import org.apache.pinot.spi.config.table.TableConfig; public class HadoopSegmentCreationJob extends SegmentCreationJob { diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/HadoopSegmentPreprocessingJob.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/HadoopSegmentPreprocessingJob.java index 12b3a11c0c31..1624abf88955 100644 --- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/HadoopSegmentPreprocessingJob.java +++ b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/HadoopSegmentPreprocessingJob.java @@ -57,12 +57,12 @@ import org.apache.pinot.ingestion.common.ControllerRestApi; import org.apache.pinot.ingestion.common.JobConfigConstants; import org.apache.pinot.ingestion.jobs.SegmentPreprocessingJob; -import org.apache.pinot.spi.config.ColumnPartitionConfig; -import org.apache.pinot.spi.config.IndexingConfig; -import org.apache.pinot.spi.config.SegmentPartitionConfig; -import org.apache.pinot.spi.config.SegmentsValidationAndRetentionConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableCustomConfig; +import org.apache.pinot.spi.config.table.ColumnPartitionConfig; +import org.apache.pinot.spi.config.table.IndexingConfig; +import org.apache.pinot.spi.config.table.SegmentPartitionConfig; +import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableCustomConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/SegmentCreationMapper.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/SegmentCreationMapper.java index 9e7f7878d43d..750543768b98 100644 --- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/SegmentCreationMapper.java +++ b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/SegmentCreationMapper.java @@ -44,8 +44,8 @@ import org.apache.pinot.ingestion.common.JobConfigConstants; import org.apache.pinot.plugin.inputformat.csv.CSVRecordReaderConfig; import org.apache.pinot.plugin.inputformat.thrift.ThriftRecordReaderConfig; -import org.apache.pinot.spi.config.SegmentsValidationAndRetentionConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.data.TimeFieldSpec; import org.apache.pinot.spi.data.readers.FileFormat; diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/ControllerRestApi.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/ControllerRestApi.java index 236374e2a656..e2a20eae2bb5 100644 --- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/ControllerRestApi.java +++ b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/ControllerRestApi.java @@ -22,7 +22,7 @@ import java.util.List; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.Schema; diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/DefaultControllerRestApi.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/DefaultControllerRestApi.java index 4ef276f8f021..288048286ad5 100644 --- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/DefaultControllerRestApi.java +++ b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/DefaultControllerRestApi.java @@ -30,7 +30,7 @@ import org.apache.pinot.common.utils.FileUploadDownloadClient; import org.apache.pinot.common.utils.SimpleHttpResponse; import org.apache.pinot.ingestion.utils.PushLocation; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.utils.JsonUtils; import org.slf4j.Logger; diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/BaseSegmentJob.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/BaseSegmentJob.java index b9faf124cfbb..5ece4c2bec5a 100644 --- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/BaseSegmentJob.java +++ b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/BaseSegmentJob.java @@ -36,7 +36,7 @@ import org.apache.pinot.ingestion.common.DefaultControllerRestApi; import org.apache.pinot.ingestion.common.JobConfigConstants; import org.apache.pinot.ingestion.utils.PushLocation; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.Schema; import org.joda.time.DateTime; import org.slf4j.Logger; diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentCreationFunction.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentCreationFunction.java index 667d0b0578b1..053352e79a6a 100644 --- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentCreationFunction.java +++ b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentCreationFunction.java @@ -41,8 +41,8 @@ import org.apache.pinot.ingestion.common.JobConfigConstants; import org.apache.pinot.plugin.inputformat.csv.CSVRecordReaderConfig; import org.apache.pinot.plugin.inputformat.thrift.ThriftRecordReaderConfig; -import org.apache.pinot.spi.config.SegmentsValidationAndRetentionConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.data.TimeFieldSpec; import org.apache.pinot.spi.data.readers.FileFormat; diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentCreationJob.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentCreationJob.java index 733a3ecd0bf2..fd0b004ee0db 100644 --- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentCreationJob.java +++ b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentCreationJob.java @@ -35,8 +35,8 @@ import org.apache.pinot.ingestion.jobs.SegmentCreationJob; import org.apache.pinot.ingestion.utils.JobPreparationHelper; import org.apache.pinot.spark.utils.PinotSparkJobPreparationHelper; -import org.apache.pinot.spi.config.SegmentsValidationAndRetentionConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.spark.SparkContext; import org.apache.spark.api.java.JavaRDD; import org.apache.spark.api.java.JavaSparkContext; 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 beb3c51749cb..087a11bef706 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 @@ -48,7 +48,7 @@ import org.apache.pinot.core.segment.index.loader.IndexLoadingConfig; import org.apache.pinot.core.segment.index.loader.LoaderUtils; import org.apache.pinot.core.segment.index.metadata.SegmentMetadata; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.Schema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/SegmentOnlineOfflineStateModelFactory.java b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/SegmentOnlineOfflineStateModelFactory.java index 60ae0a492645..a045722bf0fa 100644 --- a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/SegmentOnlineOfflineStateModelFactory.java +++ b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/SegmentOnlineOfflineStateModelFactory.java @@ -37,7 +37,7 @@ import org.apache.pinot.core.data.manager.SegmentDataManager; import org.apache.pinot.core.data.manager.TableDataManager; import org.apache.pinot.core.data.manager.realtime.LLRealtimeSegmentDataManager; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/api/Instance.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/instance/Instance.java similarity index 98% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/api/Instance.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/instance/Instance.java index 01139029befb..5cbb32c6e3f6 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/api/Instance.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/instance/Instance.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config.api; +package org.apache.pinot.spi.config.instance; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/api/InstanceType.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/instance/InstanceType.java similarity index 95% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/api/InstanceType.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/instance/InstanceType.java index 4ff029d36e75..416daa5ee1ac 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/api/InstanceType.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/instance/InstanceType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config.api; +package org.apache.pinot.spi.config.instance; public enum InstanceType { CONTROLLER, BROKER, SERVER, MINION diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/ColumnPartitionConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/ColumnPartitionConfig.java similarity index 95% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/ColumnPartitionConfig.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/ColumnPartitionConfig.java index 18d51a30ec93..567403f6903b 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/ColumnPartitionConfig.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/ColumnPartitionConfig.java @@ -16,11 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config; +package org.apache.pinot.spi.config.table; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; +import org.apache.pinot.spi.config.BaseJsonConfig; public class ColumnPartitionConfig extends BaseJsonConfig { diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/CompletionConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/CompletionConfig.java similarity index 94% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/CompletionConfig.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/CompletionConfig.java index 53f811d95863..f95b61c4d638 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/CompletionConfig.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/CompletionConfig.java @@ -16,12 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config; +package org.apache.pinot.spi.config.table; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.google.common.base.Preconditions; +import org.apache.pinot.spi.config.BaseJsonConfig; /** diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/FieldConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/FieldConfig.java similarity index 96% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/FieldConfig.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/FieldConfig.java index 3d384ef311f1..8e0d2e0c940f 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/FieldConfig.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/FieldConfig.java @@ -16,11 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config; +package org.apache.pinot.spi.config.table; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; +import org.apache.pinot.spi.config.BaseJsonConfig; + import java.util.Map; import javax.annotation.Nullable; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/IndexingConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/IndexingConfig.java similarity index 98% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/IndexingConfig.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/IndexingConfig.java index e5dd595b2cea..7e864fa4de07 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/IndexingConfig.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/IndexingConfig.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config; +package org.apache.pinot.spi.config.table; + +import org.apache.pinot.spi.config.BaseJsonConfig; import java.util.List; import java.util.Map; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/QueryConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/QueryConfig.java similarity index 95% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/QueryConfig.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/QueryConfig.java index 34fb5acf3316..a289ba100652 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/QueryConfig.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/QueryConfig.java @@ -16,11 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config; +package org.apache.pinot.spi.config.table; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; +import org.apache.pinot.spi.config.BaseJsonConfig; + import javax.annotation.Nullable; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/QuotaConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/QuotaConfig.java similarity index 96% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/QuotaConfig.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/QuotaConfig.java index 6bd9294d6b34..6be0509546c7 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/QuotaConfig.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/QuotaConfig.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config; +package org.apache.pinot.spi.config.table; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.google.common.base.Preconditions; import javax.annotation.Nullable; + +import org.apache.pinot.spi.config.BaseJsonConfig; import org.apache.pinot.spi.utils.DataSizeUtils; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/ReplicaGroupStrategyConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/ReplicaGroupStrategyConfig.java similarity index 96% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/ReplicaGroupStrategyConfig.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/ReplicaGroupStrategyConfig.java index 573d34c30691..b36184792a4b 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/ReplicaGroupStrategyConfig.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/ReplicaGroupStrategyConfig.java @@ -16,11 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config; +package org.apache.pinot.spi.config.table; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; +import org.apache.pinot.spi.config.BaseJsonConfig; + import javax.annotation.Nullable; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/RoutingConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/RoutingConfig.java similarity index 95% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/RoutingConfig.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/RoutingConfig.java index 11a2ab7438a4..ee5b564a3739 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/RoutingConfig.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/RoutingConfig.java @@ -16,10 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config; +package org.apache.pinot.spi.config.table; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.pinot.spi.config.BaseJsonConfig; + import java.util.List; import javax.annotation.Nullable; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/SegmentPartitionConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/SegmentPartitionConfig.java similarity index 96% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/SegmentPartitionConfig.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/SegmentPartitionConfig.java index bfed1fa4ac16..3f0516120efa 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/SegmentPartitionConfig.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/SegmentPartitionConfig.java @@ -16,11 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config; +package org.apache.pinot.spi.config.table; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; +import org.apache.pinot.spi.config.BaseJsonConfig; + import java.util.Map; import javax.annotation.Nullable; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/SegmentsValidationAndRetentionConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/SegmentsValidationAndRetentionConfig.java similarity index 97% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/SegmentsValidationAndRetentionConfig.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/SegmentsValidationAndRetentionConfig.java index a848d689824d..7113dc0f73f6 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/SegmentsValidationAndRetentionConfig.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/SegmentsValidationAndRetentionConfig.java @@ -16,10 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config; +package org.apache.pinot.spi.config.table; import com.fasterxml.jackson.annotation.JsonIgnore; import java.util.concurrent.TimeUnit; + +import org.apache.pinot.spi.config.BaseJsonConfig; import org.apache.pinot.spi.utils.TimeUtils; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/StarTreeIndexConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/StarTreeIndexConfig.java similarity index 96% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/StarTreeIndexConfig.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/StarTreeIndexConfig.java index a6ae33bd4a33..520e4e6ff02d 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/StarTreeIndexConfig.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/StarTreeIndexConfig.java @@ -16,11 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config; +package org.apache.pinot.spi.config.table; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; +import org.apache.pinot.spi.config.BaseJsonConfig; + import java.util.List; import javax.annotation.Nullable; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/TableConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TableConfig.java similarity index 97% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/TableConfig.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TableConfig.java index 45cebc8a895a..a029b7debe6e 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/TableConfig.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TableConfig.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config; +package org.apache.pinot.spi.config.table; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -25,8 +25,10 @@ import java.util.List; import java.util.Map; import javax.annotation.Nullable; -import org.apache.pinot.spi.config.assignment.InstanceAssignmentConfig; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; + +import org.apache.pinot.spi.config.BaseJsonConfig; +import org.apache.pinot.spi.config.table.assignment.InstanceAssignmentConfig; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; import org.apache.pinot.spi.utils.builder.TableNameBuilder; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/TableCustomConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TableCustomConfig.java similarity index 93% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/TableCustomConfig.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TableCustomConfig.java index 8fa968b3fa13..9bf266f2e2bf 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/TableCustomConfig.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TableCustomConfig.java @@ -16,10 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config; +package org.apache.pinot.spi.config.table; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.pinot.spi.config.BaseJsonConfig; + import java.util.Map; import javax.annotation.Nullable; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/TableTaskConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TableTaskConfig.java similarity index 94% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/TableTaskConfig.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TableTaskConfig.java index eda00b91d0e2..53dd1611fd0e 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/TableTaskConfig.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TableTaskConfig.java @@ -16,11 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config; +package org.apache.pinot.spi.config.table; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; +import org.apache.pinot.spi.config.BaseJsonConfig; + import java.util.Map; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/TableType.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TableType.java similarity index 95% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/TableType.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TableType.java index 06a74c41461d..85eaef9d1daf 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/TableType.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TableType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config; +package org.apache.pinot.spi.config.table; public enum TableType { OFFLINE, REALTIME diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/TagOverrideConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TagOverrideConfig.java similarity index 96% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/TagOverrideConfig.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TagOverrideConfig.java index d1dffdea3bd7..f2818f3c8a44 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/TagOverrideConfig.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TagOverrideConfig.java @@ -16,10 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config; +package org.apache.pinot.spi.config.table; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import org.apache.pinot.spi.config.BaseJsonConfig; + import javax.annotation.Nullable; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/TenantConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TenantConfig.java similarity index 95% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/TenantConfig.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TenantConfig.java index 287a459fbe53..e21f860a3ff2 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/TenantConfig.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TenantConfig.java @@ -16,11 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config; +package org.apache.pinot.spi.config.table; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import org.apache.pinot.spi.config.BaseJsonConfig; + import javax.annotation.Nullable; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/assignment/InstanceAssignmentConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/InstanceAssignmentConfig.java similarity index 98% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/assignment/InstanceAssignmentConfig.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/InstanceAssignmentConfig.java index 1adb40b5e03c..822dc25899a7 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/assignment/InstanceAssignmentConfig.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/InstanceAssignmentConfig.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config.assignment; +package org.apache.pinot.spi.config.table.assignment; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/assignment/InstanceConstraintConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/InstanceConstraintConfig.java similarity index 96% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/assignment/InstanceConstraintConfig.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/InstanceConstraintConfig.java index 74bbe0512d08..2a00c612b16c 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/assignment/InstanceConstraintConfig.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/InstanceConstraintConfig.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config.assignment; +package org.apache.pinot.spi.config.table.assignment; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/assignment/InstancePartitionsType.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/InstancePartitionsType.java similarity index 96% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/assignment/InstancePartitionsType.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/InstancePartitionsType.java index 1150536e5769..a22ae8cf3eab 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/assignment/InstancePartitionsType.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/InstancePartitionsType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config.assignment; +package org.apache.pinot.spi.config.table.assignment; /** * The type of the instance partitions. diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/assignment/InstanceReplicaGroupPartitionConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/InstanceReplicaGroupPartitionConfig.java similarity index 98% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/assignment/InstanceReplicaGroupPartitionConfig.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/InstanceReplicaGroupPartitionConfig.java index 2c2374bd2b30..607e07ac46b9 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/assignment/InstanceReplicaGroupPartitionConfig.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/InstanceReplicaGroupPartitionConfig.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config.assignment; +package org.apache.pinot.spi.config.table.assignment; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/assignment/InstanceTagPoolConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/InstanceTagPoolConfig.java similarity index 97% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/assignment/InstanceTagPoolConfig.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/InstanceTagPoolConfig.java index f1661e5f42a8..1286b286235e 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/assignment/InstanceTagPoolConfig.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/InstanceTagPoolConfig.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config.assignment; +package org.apache.pinot.spi.config.table.assignment; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/api/Tenant.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/tenant/Tenant.java similarity index 98% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/api/Tenant.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/tenant/Tenant.java index 6f11d1721ccf..285e1b1a6e7e 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/api/Tenant.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/tenant/Tenant.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config.api; +package org.apache.pinot.spi.config.tenant; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/api/TenantRole.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/tenant/TenantRole.java similarity index 95% rename from pinot-spi/src/main/java/org/apache/pinot/spi/config/api/TenantRole.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/config/tenant/TenantRole.java index a65369a1148d..3298248ae8b8 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/api/TenantRole.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/tenant/TenantRole.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.spi.config.api; +package org.apache.pinot.spi.config.tenant; public enum TenantRole { SERVER, BROKER diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/TableConfigBuilder.java b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/TableConfigBuilder.java index 7b5a475634b9..b01ea1175b80 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/TableConfigBuilder.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/TableConfigBuilder.java @@ -22,23 +22,23 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.apache.pinot.spi.config.CompletionConfig; -import org.apache.pinot.spi.config.FieldConfig; -import org.apache.pinot.spi.config.IndexingConfig; -import org.apache.pinot.spi.config.QueryConfig; -import org.apache.pinot.spi.config.QuotaConfig; -import org.apache.pinot.spi.config.ReplicaGroupStrategyConfig; -import org.apache.pinot.spi.config.RoutingConfig; -import org.apache.pinot.spi.config.SegmentPartitionConfig; -import org.apache.pinot.spi.config.SegmentsValidationAndRetentionConfig; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableCustomConfig; -import org.apache.pinot.spi.config.TableTaskConfig; -import org.apache.pinot.spi.config.TableType; -import org.apache.pinot.spi.config.TagOverrideConfig; -import org.apache.pinot.spi.config.TenantConfig; -import org.apache.pinot.spi.config.assignment.InstanceAssignmentConfig; -import org.apache.pinot.spi.config.assignment.InstancePartitionsType; +import org.apache.pinot.spi.config.table.CompletionConfig; +import org.apache.pinot.spi.config.table.FieldConfig; +import org.apache.pinot.spi.config.table.IndexingConfig; +import org.apache.pinot.spi.config.table.QueryConfig; +import org.apache.pinot.spi.config.table.QuotaConfig; +import org.apache.pinot.spi.config.table.ReplicaGroupStrategyConfig; +import org.apache.pinot.spi.config.table.RoutingConfig; +import org.apache.pinot.spi.config.table.SegmentPartitionConfig; +import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableCustomConfig; +import org.apache.pinot.spi.config.table.TableTaskConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.config.table.TagOverrideConfig; +import org.apache.pinot.spi.config.table.TenantConfig; +import org.apache.pinot.spi.config.table.assignment.InstanceAssignmentConfig; +import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType; public class TableConfigBuilder { diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/TableNameBuilder.java b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/TableNameBuilder.java index c5d4f02bf452..86c64da8ab11 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/TableNameBuilder.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/TableNameBuilder.java @@ -19,7 +19,7 @@ package org.apache.pinot.spi.utils.builder; import javax.annotation.Nullable; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; public class TableNameBuilder { diff --git a/pinot-spi/src/test/java/org/apache/pinot/spi/config/IndexingConfigTest.java b/pinot-spi/src/test/java/org/apache/pinot/spi/config/IndexingConfigTest.java index 29ae941d7226..fd2ee550e31a 100644 --- a/pinot-spi/src/test/java/org/apache/pinot/spi/config/IndexingConfigTest.java +++ b/pinot-spi/src/test/java/org/apache/pinot/spi/config/IndexingConfigTest.java @@ -23,6 +23,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + +import org.apache.pinot.spi.config.table.ColumnPartitionConfig; +import org.apache.pinot.spi.config.table.IndexingConfig; +import org.apache.pinot.spi.config.table.SegmentPartitionConfig; import org.apache.pinot.spi.utils.JsonUtils; import org.testng.annotations.Test; diff --git a/pinot-spi/src/test/java/org/apache/pinot/spi/config/QuotaConfigTest.java b/pinot-spi/src/test/java/org/apache/pinot/spi/config/QuotaConfigTest.java index 2246eabb2a36..e83ff72373cf 100644 --- a/pinot-spi/src/test/java/org/apache/pinot/spi/config/QuotaConfigTest.java +++ b/pinot-spi/src/test/java/org/apache/pinot/spi/config/QuotaConfigTest.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.databind.JsonNode; import java.io.IOException; + +import org.apache.pinot.spi.config.table.QuotaConfig; import org.apache.pinot.spi.utils.JsonUtils; import org.testng.annotations.Test; diff --git a/pinot-spi/src/test/java/org/apache/pinot/spi/config/api/TenantTest.java b/pinot-spi/src/test/java/org/apache/pinot/spi/config/api/TenantTest.java index dc68bbcc2a8e..23545126a9c1 100644 --- a/pinot-spi/src/test/java/org/apache/pinot/spi/config/api/TenantTest.java +++ b/pinot-spi/src/test/java/org/apache/pinot/spi/config/api/TenantTest.java @@ -19,6 +19,9 @@ package org.apache.pinot.spi.config.api; import java.io.IOException; + +import org.apache.pinot.spi.config.tenant.Tenant; +import org.apache.pinot.spi.config.tenant.TenantRole; import org.apache.pinot.spi.utils.JsonUtils; import org.testng.annotations.Test; diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/PinotNumReplicaChanger.java b/pinot-tools/src/main/java/org/apache/pinot/tools/PinotNumReplicaChanger.java index 25aa5e343a97..47a15650bceb 100644 --- a/pinot-tools/src/main/java/org/apache/pinot/tools/PinotNumReplicaChanger.java +++ b/pinot-tools/src/main/java/org/apache/pinot/tools/PinotNumReplicaChanger.java @@ -25,7 +25,7 @@ import org.apache.helix.model.IdealState; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.utils.helix.HelixHelper; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.apache.pinot.spi.utils.retry.RetryPolicies; import org.slf4j.Logger; diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/PinotTableRebalancer.java b/pinot-tools/src/main/java/org/apache/pinot/tools/PinotTableRebalancer.java index 42f93371d0f4..5910a6273442 100644 --- a/pinot-tools/src/main/java/org/apache/pinot/tools/PinotTableRebalancer.java +++ b/pinot-tools/src/main/java/org/apache/pinot/tools/PinotTableRebalancer.java @@ -25,7 +25,7 @@ import org.apache.pinot.controller.helix.core.rebalance.RebalanceConfigConstants; import org.apache.pinot.controller.helix.core.rebalance.RebalanceResult; import org.apache.pinot.controller.helix.core.rebalance.TableRebalancer; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; /** diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/QuickstartTableRequest.java b/pinot-tools/src/main/java/org/apache/pinot/tools/QuickstartTableRequest.java index 134139c65af3..55b27cbee770 100644 --- a/pinot-tools/src/main/java/org/apache/pinot/tools/QuickstartTableRequest.java +++ b/pinot-tools/src/main/java/org/apache/pinot/tools/QuickstartTableRequest.java @@ -19,7 +19,7 @@ package org.apache.pinot.tools; import java.io.File; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.data.readers.FileFormat; 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 cb7e4ca51550..fe7b090df917 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 @@ -29,7 +29,7 @@ import org.apache.helix.model.IdealState; import org.apache.helix.store.zk.ZkHelixPropertyStore; import org.apache.pinot.common.utils.config.TableConfigUtils; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.kohsuke.args4j.Option; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddTenantCommand.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddTenantCommand.java index 4021073cb912..d4a67d698b85 100644 --- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddTenantCommand.java +++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddTenantCommand.java @@ -20,8 +20,8 @@ import org.apache.pinot.common.utils.NetUtil; import org.apache.pinot.controller.helix.ControllerRequestURLBuilder; -import org.apache.pinot.spi.config.api.Tenant; -import org.apache.pinot.spi.config.api.TenantRole; +import org.apache.pinot.spi.config.tenant.Tenant; +import org.apache.pinot.spi.config.tenant.TenantRole; import org.apache.pinot.tools.Command; import org.kohsuke.args4j.Option; import org.slf4j.Logger; 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 ae7b23d1db42..e930b2a0c014 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 @@ -44,7 +44,7 @@ import org.apache.helix.store.zk.ZkHelixPropertyStore; import org.apache.pinot.common.utils.config.TableConfigUtils; import org.apache.pinot.common.utils.helix.HelixHelper; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.utils.JsonUtils; import org.apache.pinot.spi.utils.builder.TableNameBuilder; import org.apache.pinot.spi.utils.retry.RetryPolicies; 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 d900fbc01513..754fdc7287dc 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 @@ -31,7 +31,7 @@ import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata; import org.apache.pinot.controller.util.SegmentIntervalUtils; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.utils.TimeUtils; 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/QuickstartRunner.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/QuickstartRunner.java index 36ead37340b6..32b49f37d198 100644 --- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/QuickstartRunner.java +++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/QuickstartRunner.java @@ -29,8 +29,8 @@ import java.util.List; import java.util.Random; import org.apache.commons.io.FileUtils; -import org.apache.pinot.spi.config.TableType; -import org.apache.pinot.spi.config.api.TenantRole; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.config.tenant.TenantRole; import org.apache.pinot.spi.ingestion.batch.IngestionJobLauncher; import org.apache.pinot.spi.ingestion.batch.spec.SegmentGenerationJobSpec; import org.apache.pinot.spi.utils.JsonUtils; diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/RealtimeProvisioningHelperCommand.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/RealtimeProvisioningHelperCommand.java index 77904d201d4c..1976443cd1bf 100644 --- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/RealtimeProvisioningHelperCommand.java +++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/RealtimeProvisioningHelperCommand.java @@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.utils.DataSizeUtils; import org.apache.pinot.spi.utils.JsonUtils; import org.apache.pinot.spi.utils.TimeUtils; 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 51bf1c75cfb4..de4533cd9d4d 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 @@ -29,7 +29,7 @@ import org.apache.helix.store.zk.ZkHelixPropertyStore; import org.apache.pinot.common.utils.SchemaUtils; import org.apache.pinot.common.utils.config.TableConfigUtils; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.tools.AbstractBaseCommand; import org.apache.pinot.tools.Command; diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/config/validator/TableConfigValidator.java b/pinot-tools/src/main/java/org/apache/pinot/tools/config/validator/TableConfigValidator.java index 5889eb0b0afd..6b049ad071b4 100644 --- a/pinot-tools/src/main/java/org/apache/pinot/tools/config/validator/TableConfigValidator.java +++ b/pinot-tools/src/main/java/org/apache/pinot/tools/config/validator/TableConfigValidator.java @@ -17,7 +17,7 @@ * under the License. */ package org.apache.pinot.tools.config.validator; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; public class TableConfigValidator { diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/perf/PerfBenchmarkDriver.java b/pinot-tools/src/main/java/org/apache/pinot/tools/perf/PerfBenchmarkDriver.java index 5a28a285fcde..50e2a9058685 100644 --- a/pinot-tools/src/main/java/org/apache/pinot/tools/perf/PerfBenchmarkDriver.java +++ b/pinot-tools/src/main/java/org/apache/pinot/tools/perf/PerfBenchmarkDriver.java @@ -50,10 +50,10 @@ import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; import org.apache.pinot.core.segment.index.metadata.SegmentMetadata; import org.apache.pinot.server.starter.helix.HelixServerStarter; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; -import org.apache.pinot.spi.config.api.Tenant; -import org.apache.pinot.spi.config.api.TenantRole; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.config.tenant.Tenant; +import org.apache.pinot.spi.config.tenant.TenantRole; import org.apache.pinot.spi.plugin.PluginManager; import org.apache.pinot.spi.utils.JsonUtils; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/query/comparison/ClusterStarter.java b/pinot-tools/src/main/java/org/apache/pinot/tools/query/comparison/ClusterStarter.java index d00d2deb15f2..11448ebdca4f 100644 --- a/pinot-tools/src/main/java/org/apache/pinot/tools/query/comparison/ClusterStarter.java +++ b/pinot-tools/src/main/java/org/apache/pinot/tools/query/comparison/ClusterStarter.java @@ -30,8 +30,8 @@ import org.apache.pinot.common.utils.NetUtil; import org.apache.pinot.common.utils.URIUtils; import org.apache.pinot.controller.helix.ControllerRequestURLBuilder; -import org.apache.pinot.spi.config.TableConfig; -import org.apache.pinot.spi.config.TableType; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; import org.apache.pinot.spi.utils.builder.TableConfigBuilder; import org.apache.pinot.tools.admin.command.AddTableCommand; import org.apache.pinot.tools.admin.command.CreateSegmentCommand; diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/realtime/provisioning/MemoryEstimator.java b/pinot-tools/src/main/java/org/apache/pinot/tools/realtime/provisioning/MemoryEstimator.java index d1e69e5a772b..cbf6b6197aac 100644 --- a/pinot-tools/src/main/java/org/apache/pinot/tools/realtime/provisioning/MemoryEstimator.java +++ b/pinot-tools/src/main/java/org/apache/pinot/tools/realtime/provisioning/MemoryEstimator.java @@ -33,7 +33,7 @@ import org.apache.pinot.core.realtime.impl.RealtimeSegmentConfig; import org.apache.pinot.core.realtime.impl.RealtimeSegmentStatsHistory; import org.apache.pinot.core.segment.index.metadata.SegmentMetadataImpl; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.FieldSpec; import org.apache.pinot.spi.data.readers.GenericRow; import org.apache.pinot.spi.utils.DataSizeUtils; diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/segment/converter/SegmentMergeCommand.java b/pinot-tools/src/main/java/org/apache/pinot/tools/segment/converter/SegmentMergeCommand.java index eee0f8af1b3c..cbe92de03ce3 100644 --- a/pinot-tools/src/main/java/org/apache/pinot/tools/segment/converter/SegmentMergeCommand.java +++ b/pinot-tools/src/main/java/org/apache/pinot/tools/segment/converter/SegmentMergeCommand.java @@ -35,8 +35,8 @@ import org.apache.pinot.core.segment.index.metadata.SegmentMetadata; import org.apache.pinot.core.segment.index.metadata.SegmentMetadataImpl; import org.apache.pinot.core.segment.name.NormalizedDateSegmentNameGenerator; -import org.apache.pinot.spi.config.SegmentsValidationAndRetentionConfig; -import org.apache.pinot.spi.config.TableConfig; +import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig; +import org.apache.pinot.spi.config.table.TableConfig; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.utils.JsonUtils; import org.apache.pinot.spi.utils.builder.TableNameBuilder;