This is an automated email from the ASF dual-hosted git repository. kishoreg pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git.
from 441a285 Don't override tenantConfig in singleTenantCluster mode, if user explicitly set tenantConfig (#5656) add a7ad587 Pinot Configuration Refactoring - Phase 1 (#5608) No new revisions were added by this update. Summary of changes: .../pinot/broker/broker/AccessControlFactory.java | 8 +- .../broker/AllowAllAccessControlFactory.java | 4 +- .../broker/broker/helix/HelixBrokerStarter.java | 51 +-- .../requesthandler/BaseBrokerRequestHandler.java | 33 +- .../SingleConnectionBrokerRequestHandler.java | 6 +- .../broker/broker/HelixBrokerStarterTest.java | 12 +- .../LiteralOnlyBrokerRequestTest.java | 14 +- .../apache/pinot/common/metrics/MetricsHelper.java | 13 +- .../common/utils/ClientSSLContextGenerator.java | 14 +- .../common/utils/fetcher/BaseSegmentFetcher.java | 13 +- .../common/utils/fetcher/HttpSegmentFetcher.java | 5 +- .../common/utils/fetcher/HttpsSegmentFetcher.java | 17 +- .../pinot/common/utils/fetcher/SegmentFetcher.java | 5 +- .../utils/fetcher/SegmentFetcherFactory.java | 14 +- .../pinot/common/metrics/MetricsHelperTest.java | 18 +- .../utils/fetcher/SegmentFetcherFactoryTest.java | 29 +- .../apache/pinot/controller/ControllerConf.java | 333 +++++++--------- .../apache/pinot/controller/ControllerStarter.java | 16 +- .../DefaultMetadataEventNotifierFactory.java | 4 +- .../api/events/MetadataEventNotifierFactory.java | 13 +- .../pinot/controller/api/AccessControlTest.java | 10 +- .../api/ControllerFilePathProviderTest.java | 21 +- ...PinotInstanceAssignmentRestletResourceTest.java | 8 +- .../api/PinotTableRestletResourceTest.java | 13 +- ...otSegmentUploadDownloadRestletResourceTest.java | 17 +- .../pinot/controller/helix/ControllerTest.java | 42 ++- .../controller/helix/PinotControllerModeTest.java | 56 +-- .../helix/core/PinotHelixResourceManagerTest.java | 7 +- .../PinotLLCRealtimeSegmentManagerTest.java | 22 +- .../core/util/SegmentDeletionManagerTest.java | 25 +- pinot-core/pom.xml | 4 + .../core/data/manager/InstanceDataManager.java | 6 +- .../manager/config/InstanceDataManagerConfig.java | 4 +- .../core/plan/maker/InstancePlanMakerImplV2.java | 4 +- .../core/query/config/QueryExecutorConfig.java | 11 +- .../core/query/config/QueryPlannerConfig.java | 8 +- .../core/query/config/SegmentPrunerConfig.java | 14 +- .../pinot/core/query/executor/QueryExecutor.java | 6 +- .../query/executor/ServerQueryExecutorV1Impl.java | 9 +- .../query/pruner/ColumnValueSegmentPruner.java | 5 +- .../core/query/pruner/DataSchemaSegmentPruner.java | 4 +- .../pinot/core/query/pruner/SegmentPruner.java | 4 +- .../core/query/pruner/SegmentPrunerProvider.java | 5 +- .../core/query/pruner/ValidSegmentPruner.java | 4 +- .../query/scheduler/MultiLevelPriorityQueue.java | 19 +- .../core/query/scheduler/PriorityScheduler.java | 17 +- .../pinot/core/query/scheduler/QueryScheduler.java | 19 +- .../query/scheduler/QuerySchedulerFactory.java | 12 +- .../query/scheduler/SchedulerGroupFactory.java | 4 +- .../query/scheduler/fcfs/BoundedFCFSScheduler.java | 14 +- .../query/scheduler/fcfs/FCFSQueryScheduler.java | 11 +- .../resources/PolicyBasedResourceManager.java | 7 +- .../scheduler/resources/ResourceLimitPolicy.java | 8 +- .../query/scheduler/resources/ResourceManager.java | 18 +- .../resources/UnboundedResourceManager.java | 4 +- .../tokenbucket/TokenPriorityScheduler.java | 14 +- .../converter/SegmentV1V2ToV3FormatConverter.java | 3 +- .../ColumnMinMaxValueGenerator.java | 40 +- .../defaultcolumn/BaseDefaultColumnHandler.java | 14 +- .../index/metadata/SegmentMetadataImpl.java | 34 +- .../segment/store/SingleFileIndexDirectory.java | 13 +- .../pinot/core/startree/v2/StarTreeV2Metadata.java | 16 +- .../startree/v2/builder/MultipleTreesBuilder.java | 27 +- .../startree/v2/store/StarTreeIndexMapUtils.java | 35 +- .../ServerSegmentCompletionProtocolHandler.java | 22 +- .../realtime/PinotFSSegmentUploaderTest.java | 18 +- .../scheduler/MultiLevelPriorityQueueTest.java | 50 ++- .../query/scheduler/PrioritySchedulerTest.java | 68 ++-- .../query/scheduler/TestSchedulerGroupFactory.java | 7 +- .../scheduler/resources/ResourceManagerTest.java | 24 +- .../resources/UnboundedResourceManagerTest.java | 24 +- .../SegmentGenerationWithNullValueVectorTest.java | 27 +- .../pinot/query/executor/QueryExecutorTest.java | 11 +- .../pinot/spi/crypt/PinotCrypterFactoryTest.java | 20 +- .../pinot/integration/tests/ClusterTest.java | 53 +-- .../ControllerPeriodicTasksIntegrationTest.java | 73 +--- .../tests/HybridClusterIntegrationTest.java | 17 +- ...ridClusterIntegrationTestCommandLineRunner.java | 21 +- .../tests/LLCRealtimeClusterIntegrationTest.java | 23 +- .../tests/ServerStarterIntegrationTest.java | 67 ++-- .../ControllerLeaderLocatorIntegrationTest.java | 6 +- .../org/apache/pinot/minion/MinionStarter.java | 33 +- .../hadoop/HadoopSegmentGenerationJobRunner.java | 16 +- .../hadoop/HadoopSegmentTarPushJobRunner.java | 9 +- .../hadoop/HadoopSegmentUriPushJobRunner.java | 12 +- .../spark/SparkSegmentGenerationJobRunner.java | 22 +- .../batch/spark/SparkSegmentTarPushJobRunner.java | 15 +- .../batch/spark/SparkSegmentUriPushJobRunner.java | 13 +- .../standalone/SegmentGenerationJobRunner.java | 11 +- .../batch/standalone/SegmentTarPushJobRunner.java | 12 +- .../batch/standalone/SegmentUriPushJobRunner.java | 11 +- .../pinot/plugin/filesystem/ADLSGen2PinotFS.java | 50 +-- .../pinot/plugin/filesystem/AzurePinotFS.java | 28 +- .../apache/pinot/plugin/filesystem/GcsPinotFS.java | 49 +-- .../pinot/plugin/filesystem/HadoopPinotFS.java | 35 +- .../pinot/plugin/filesystem/HadoopPinotFSTest.java | 40 +- .../apache/pinot/plugin/filesystem/S3PinotFS.java | 69 ++-- .../pinot/server/conf/NettyServerConfig.java | 19 +- .../org/apache/pinot/server/conf/ServerConf.java | 43 ++- .../helix/DefaultHelixStarterServerConfig.java | 22 +- .../starter/helix/HelixInstanceDataManager.java | 9 +- .../helix/HelixInstanceDataManagerConfig.java | 53 +-- .../server/starter/helix/HelixServerStarter.java | 127 +++++-- .../starter/helix/SegmentFetcherAndLoader.java | 15 +- .../apache/pinot/spi/crypt/NoOpPinotCrypter.java | 5 +- .../org/apache/pinot/spi/crypt/PinotCrypter.java | 5 +- .../pinot/spi/crypt/PinotCrypterFactory.java | 26 +- .../pinot/spi/env/CommonsConfigurationUtils.java | 99 +++++ .../ConfigFilePropertyReader.java} | 20 +- .../spi/env/ConfigFilePropertyReaderFactory.java | 15 +- .../java/org/apache/pinot/spi/env/Environment.java | 9 +- .../apache/pinot/spi/env/PinotConfiguration.java | 418 +++++++++++++++++++++ .../apache/pinot/spi/env/PropertyConverter.java | 40 +- .../apache/pinot/spi/env/SystemEnvironment.java | 11 +- .../apache/pinot/spi/filesystem/LocalPinotFS.java | 5 +- .../org/apache/pinot/spi/filesystem/PinotFS.java | 5 +- .../pinot/spi/filesystem/PinotFSFactory.java | 28 +- .../pinot/spi/services/ServiceStartable.java | 4 +- .../pinot/spi/env/PinotConfigurationTest.java | 84 +++++ .../pinot/spi/filesystem/PinotFSFactoryTest.java | 18 +- .../resources/pinot-configuration-1.properties | 3 + .../resources/pinot-configuration-2.properties | 5 + .../resources/pinot-configuration-3.properties | 2 + .../admin/command/AbstractBaseAdminCommand.java | 5 +- .../tools/admin/command/StartBrokerCommand.java | 5 +- .../admin/command/StartControllerCommand.java | 13 +- .../tools/admin/command/StartServerCommand.java | 5 +- .../admin/command/StartServiceManagerCommand.java | 31 +- .../tools/filesystem/PinotFSBenchmarkDriver.java | 11 +- .../pinot/tools/perf/PerfBenchmarkDriver.java | 46 ++- .../pinot/tools/service/PinotServiceManager.java | 23 +- .../service/api/resources/PinotInstanceStatus.java | 16 +- .../PinotServiceManagerInstanceResource.java | 134 +++---- .../apache/pinot/tools/utils/PinotConfigUtils.java | 185 +++++---- pom.xml | 7 +- 135 files changed, 2279 insertions(+), 1508 deletions(-) create mode 100644 pinot-spi/src/main/java/org/apache/pinot/spi/env/CommonsConfigurationUtils.java copy pinot-spi/src/main/java/org/apache/pinot/spi/{utils/retry/NoDelayRetryPolicy.java => env/ConfigFilePropertyReader.java} (67%) copy pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/PinotFSSegmentFetcher.java => pinot-spi/src/main/java/org/apache/pinot/spi/env/ConfigFilePropertyReaderFactory.java (66%) copy pinot-common/src/main/java/org/apache/pinot/common/metadata/ZKMetadata.java => pinot-spi/src/main/java/org/apache/pinot/spi/env/Environment.java (85%) create mode 100644 pinot-spi/src/main/java/org/apache/pinot/spi/env/PinotConfiguration.java copy pinot-common/src/main/java/org/apache/pinot/pql/parsers/pql2/ast/TopAstNode.java => pinot-spi/src/main/java/org/apache/pinot/spi/env/PropertyConverter.java (55%) copy pinot-minion/src/main/java/org/apache/pinot/minion/executor/PurgeTaskExecutorFactory.java => pinot-spi/src/main/java/org/apache/pinot/spi/env/SystemEnvironment.java (80%) create mode 100644 pinot-spi/src/test/java/org/apache/pinot/spi/env/PinotConfigurationTest.java create mode 100644 pinot-spi/src/test/resources/pinot-configuration-1.properties create mode 100644 pinot-spi/src/test/resources/pinot-configuration-2.properties create mode 100644 pinot-spi/src/test/resources/pinot-configuration-3.properties --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org