You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by ji...@apache.org on 2020/01/27 19:24:40 UTC

[druid] branch master updated (c6c8b80 -> b9186f8)

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

jihoonson pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git.


    from c6c8b80  fix build by updating kafka client to 2.2.2 for CVE-2019-12399 (#9259)
     add b9186f8  Reconcile terminology and method naming to 'used/unused segments'; Rename MetadataSegmentManager to MetadataSegmentsManager (#7306)

No new revisions were added by this update.

Summary of changes:
 .idea/inspectionProfiles/Druid.xml                 |  17 +-
 .../NewestSegmentFirstPolicyBenchmark.java         |   6 +-
 .../util/metrics/AllocationMetricCollectors.java   |   1 -
 .../druid/metadata/MetadataStorageConnector.java   |   7 +-
 .../metadata/MetadataStorageConnectorConfig.java   |   1 +
 .../org/apache/druid/segment/SegmentUtils.java     |  16 +-
 .../druid/timeline/VersionedIntervalTimeline.java  | 139 +++++-----
 .../timeline/partition/OvershadowableManager.java  |  34 ++-
 .../timeline/VersionedIntervalTimelineTest.java    |   2 +-
 docs/configuration/index.md                        |  19 +-
 docs/dependencies/metadata-storage.md              |  21 +-
 docs/design/architecture.md                        |   4 +-
 docs/design/coordinator.md                         |  30 +-
 docs/operations/api-reference.md                   |   3 +-
 docs/operations/metrics.md                         |  15 +-
 docs/operations/rule-configuration.md              |  32 ++-
 .../MaterializedViewSupervisor.java                |  93 +++----
 .../MaterializedViewSupervisorSpec.java            |  14 +-
 .../MaterializedViewSupervisorSpecTest.java        |   4 +-
 .../MaterializedViewSupervisorTest.java            |  14 +-
 .../materializedview/DataSourceOptimizer.java      |  14 +-
 .../DerivativeDataSourceManager.java               |   3 +-
 .../BasicSecurityAuthenticationException.java      |   1 +
 .../druid/indexing/kafka/KafkaIndexTaskTest.java   |  57 ++--
 .../kafka/supervisor/KafkaSupervisorTest.java      |  76 ++---
 .../indexing/kinesis/KinesisIndexTaskTest.java     |  55 ++--
 .../kinesis/supervisor/KinesisSupervisorTest.java  | 141 +++++-----
 .../druid/storage/s3/S3DataSegmentMoverTest.java   |  13 +-
 .../apache/druid/indexer/HadoopIngestionSpec.java  |   6 +-
 .../MetadataStoreBasedUsedSegmentsRetriever.java   |   6 +-
 .../druid/indexer/path/UsedSegmentsRetriever.java  |  14 +-
 ...onSpecUpdateDatasourcePathSpecSegmentsTest.java |  33 ++-
 .../ActionBasedUsedSegmentChecker.java             |  30 +-
 .../actions/RetrieveUnusedSegmentsAction.java      |   2 +-
 .../common/actions/RetrieveUsedSegmentsAction.java |   4 +-
 .../common/actions/SegmentAllocateAction.java      |  30 +-
 .../common/actions/SegmentInsertAction.java        |   4 +-
 .../actions/SegmentMetadataUpdateAction.java       |   4 +-
 .../indexing/common/actions/SegmentNukeAction.java |   4 +-
 .../common/task/AbstractFixedIntervalTask.java     |  20 ++
 .../task/AppenderatorDriverRealtimeIndexTask.java  |   6 +-
 .../druid/indexing/common/task/ArchiveTask.java    |  12 +-
 .../indexing/common/task/CompactionIOConfig.java   |   3 +-
 .../druid/indexing/common/task/CompactionTask.java |  15 +-
 .../indexing/common/task/HadoopIndexTask.java      |   2 +-
 .../druid/indexing/common/task/IndexTask.java      |  13 +-
 .../indexing/common/task/InputSourceProcessor.java |  14 +-
 .../{KillTask.java => KillUnusedSegmentsTask.java} |  11 +-
 .../druid/indexing/common/task/MoveTask.java       |  12 +-
 .../druid/indexing/common/task/RestoreTask.java    |  12 +-
 .../indexing/common/task/SegmentLockHelper.java    |  13 +-
 .../apache/druid/indexing/common/task/Task.java    |   5 +-
 .../apache/druid/indexing/common/task/Tasks.java   |  31 ++-
 .../parallel/ParallelIndexSupervisorTask.java      |   3 +-
 .../batch/parallel/PartialSegmentGenerateTask.java |   4 +-
 .../task/batch/parallel/SinglePhaseSubTask.java    |   6 +-
 .../common/task/batch/parallel/TaskMonitor.java    |  21 +-
 .../OverlordActionBasedUsedSegmentsRetriever.java  |   2 +-
 .../druid/indexing/input/DruidInputSource.java     |   8 +-
 .../overlord/IndexerMetadataStorageAdapter.java    |   2 +-
 .../indexing/overlord/http/OverlordResource.java   |  11 +-
 .../SeekableStreamIndexTaskRunner.java             |  50 ++--
 .../supervisor/SeekableStreamSupervisor.java       |  39 +--
 .../actions/RetrieveSegmentsActionsTest.java       |   4 +-
 .../common/actions/SegmentInsertActionTest.java    |  12 +-
 .../SegmentTransactionalInsertActionTest.java      |  14 +-
 .../indexing/common/actions/TaskActionTestKit.java |  18 +-
 ...ava => ClientCompactionTaskQuerySerdeTest.java} |  10 +-
 .../common/task/CompactionTaskParallelRunTest.java |  16 +-
 .../common/task/CompactionTaskRunTest.java         |   9 +-
 .../indexing/common/task/CompactionTaskTest.java   |   5 +-
 .../indexing/common/task/IngestionTestBase.java    |  16 +-
 ...skTest.java => KillUnusedSegmentsTaskTest.java} |  27 +-
 .../druid/indexing/common/task/TaskSerdeTest.java  |  10 +-
 .../druid/indexing/common/task/TasksTest.java      |  20 +-
 .../AbstractParallelIndexSupervisorTaskTest.java   |   2 +-
 .../ParallelIndexSupervisorTaskKillTest.java       |   4 +-
 .../parallel/SinglePhaseParallelIndexingTest.java  |  13 +-
 .../firehose/IngestSegmentFirehoseFactoryTest.java |   9 +-
 .../IngestSegmentFirehoseFactoryTimelineTest.java  |   7 +-
 .../IndexerMetadataStorageAdapterTest.java         |  10 +-
 .../druid/indexing/overlord/TaskLifecycleTest.java |  11 +-
 .../SeekableStreamIndexTaskTestBase.java           |   2 +-
 .../SeekableStreamSupervisorStateTest.java         |   3 +-
 .../TestIndexerMetadataStorageCoordinator.java     |  28 +-
 .../clients/CoordinatorResourceTestClient.java     |   8 +-
 .../druid/tests/indexer/ITCompactionTaskTest.java  |   2 +-
 .../apache/druid/client/DataSourcesSnapshot.java   |   5 +-
 .../client/coordinator/CoordinatorClient.java      |   6 +-
 .../client/indexing/ClientCompactionIOConfig.java  |   2 +-
 ...ctQuery.java => ClientCompactionTaskQuery.java} |  12 +-
 ... => ClientCompactionTaskQueryTuningConfig.java} |  24 +-
 ...java => ClientKillUnusedSegmentsTaskQuery.java} |  10 +-
 .../{ClientQuery.java => ClientTaskQuery.java}     |  10 +-
 .../client/indexing/HttpIndexingServiceClient.java |  26 +-
 .../client/indexing/IndexingServiceClient.java     |   6 +-
 .../druid/client/indexing/TaskPayloadResponse.java |   6 +-
 .../apache/druid/guice/MetadataConfigModule.java   |   4 +-
 .../druid/guice/SQLMetadataStorageDruidModule.java |  20 +-
 ...er.java => CoordinatorIndexingServiceDuty.java} |   2 +-
 .../IndexerMetadataStorageCoordinator.java         | 165 ++++++-----
 .../IndexerSQLMetadataStorageCoordinator.java      | 280 ++++++++++---------
 .../druid/metadata/SQLMetadataConnector.java       |   5 +-
 .../druid/metadata/SQLMetadataRuleManager.java     |   2 +-
 .../metadata/SQLMetadataSupervisorManager.java     |   4 +-
 ...ntManager.java => SegmentsMetadataManager.java} |  10 +-
 ...fig.java => SegmentsMetadataManagerConfig.java} |   2 +-
 ...r.java => SegmentsMetadataManagerProvider.java} |   4 +-
 ...anager.java => SqlSegmentsMetadataManager.java} |  70 ++---
 ...ava => SqlSegmentsMetadataManagerProvider.java} |  12 +-
 ...eption.java => UnknownSegmentIdsException.java} |   6 +-
 .../realtime/appenderator/Appenderator.java        |   2 +-
 .../appenderator/AppenderatorDriverMetadata.java   |   4 +-
 .../realtime/appenderator/AppenderatorImpl.java    |   6 +-
 .../realtime/appenderator/AppenderatorPlumber.java |   4 +-
 .../appenderator/BaseAppenderatorDriver.java       |  62 +++--
 .../appenderator/BatchAppenderatorDriver.java      |  22 +-
 ...etadata.java => SegmentsAndCommitMetadata.java} |  12 +-
 .../appenderator/StreamAppenderatorDriver.java     |  40 +--
 .../realtime/firehose/SqlFirehoseFactory.java      |   1 -
 .../coordination/SegmentLoadDropHandler.java       |   1 -
 .../druid/server/coordination/ZkCoordinator.java   |   1 -
 .../druid/server/coordinator/BalancerStrategy.java |   5 +-
 .../coordinator/CoordinatorDynamicConfig.java      |  13 +-
 .../coordinator/DataSourceCompactionConfig.java    |  58 +---
 .../druid/server/coordinator/DruidCluster.java     |   5 +-
 .../druid/server/coordinator/DruidCoordinator.java | 306 +++++++++++----------
 .../coordinator/DruidCoordinatorRuntimeParams.java |   3 +
 ...Segments.java => KillStalePendingSegments.java} |   8 +-
 .../UserCompactionTaskQueryTuningConfig.java       |  65 +++++
 .../BalanceSegments.java}                          |  17 +-
 .../CompactSegments.java}                          |  90 +++---
 .../CompactionSegmentIterator.java                 |   6 +-
 .../CompactionSegmentSearchPolicy.java             |   4 +-
 .../CoordinatorDuty.java}                          |  14 +-
 .../EmitClusterStatsAndMetrics.java}               |  48 ++--
 .../KillUnusedSegments.java}                       |  25 +-
 .../LogUsedSegments.java}                          |  12 +-
 .../MarkAsUnusedOvershadowedSegments.java}         |   6 +-
 .../NewestSegmentFirstIterator.java                |   6 +-
 .../{helper => duty}/NewestSegmentFirstPolicy.java |   2 +-
 .../RunRules.java}                                 |  14 +-
 .../SegmentCompactionUtil.java}                    |   8 +-
 .../UnloadUnusedSegments.java}                     |  11 +-
 .../druid/server/coordinator/rules/Rule.java       |   9 +-
 .../http/CoordinatorCompactionConfigsResource.java |   2 +-
 .../druid/server/http/CoordinatorResource.java     |   7 +-
 .../druid/server/http/DataSourcesResource.java     |  46 ++--
 .../apache/druid/server/http/MetadataResource.java |  35 ++-
 .../apache/druid/server/http/ServersResource.java  |   4 +-
 ...java => ClientKillUnusedSegmentsQueryTest.java} |   7 +-
 .../client/indexing/NoopIndexingServiceClient.java |   6 +-
 .../ClientCompactQueryTuningConfigTest.java        |   4 +-
 .../IndexerSQLMetadataStorageCoordinatorTest.java  |  96 +++----
 ...va => SqlSegmentsMetadataManagerEmptyTest.java} |  38 +--
 ...st.java => SqlSegmentsMetadataManagerTest.java} | 244 ++++++++--------
 .../realtime/appenderator/AppenderatorTest.java    |   8 +-
 .../appenderator/BatchAppenderatorDriverTest.java  |  12 +-
 .../StreamAppenderatorDriverFailTest.java          |  12 +-
 .../appenderator/StreamAppenderatorDriverTest.java |  48 ++--
 ...rProfiler.java => BalanceSegmentsProfiler.java} |  10 +-
 ...rBalancerTest.java => BalanceSegmentsTest.java} |  24 +-
 ...ancerTester.java => BalanceSegmentsTester.java} |   6 +-
 .../coordinator/CuratorDruidCoordinatorTest.java   |  14 +-
 .../DataSourceCompactionConfigTest.java            |  25 +-
 .../server/coordinator/DruidCoordinatorTest.java   |  34 +--
 ...inatorRuleRunnerTest.java => RunRulesTest.java} |  18 +-
 .../UserCompactionTaskQueryTuningConfigTest.java   |  75 +++++
 .../CompactSegmentsTest.java}                      |  53 ++--
 .../KillUnusedSegmentsTest.java}                   |  18 +-
 .../MarkAsUnusedOvershadowedSegmentsTest.java}     |  15 +-
 .../NewestSegmentFirstIteratorTest.java            |   2 +-
 .../NewestSegmentFirstPolicyTest.java              |   6 +-
 .../rules/BroadcastDistributionRuleTest.java       |   6 +-
 .../druid/server/http/DataSourcesResourceTest.java | 162 +++++------
 .../java/org/apache/druid/cli/CliCoordinator.java  |  30 +-
 .../apache/druid/cli/CliInternalHadoopIndexer.java |  12 +-
 .../sql/calcite/schema/MetadataSegmentView.java    |  10 +-
 .../druid/sql/calcite/schema/SystemSchema.java     |  18 +-
 .../__snapshots__/datasource-view.spec.tsx.snap    |   2 +-
 .../src/views/datasource-view/datasource-view.tsx  | 188 +++++++------
 181 files changed, 2361 insertions(+), 2063 deletions(-)
 rename indexing-service/src/main/java/org/apache/druid/indexing/common/task/{KillTask.java => KillUnusedSegmentsTask.java} (91%)
 rename indexing-service/src/test/java/org/apache/druid/indexing/common/task/{ClientCompactQuerySerdeTest.java => ClientCompactionTaskQuerySerdeTest.java} (95%)
 rename indexing-service/src/test/java/org/apache/druid/indexing/common/task/{KillTaskTest.java => KillUnusedSegmentsTaskTest.java} (78%)
 rename server/src/main/java/org/apache/druid/client/indexing/{ClientCompactQuery.java => ClientCompactionTaskQuery.java} (88%)
 rename server/src/main/java/org/apache/druid/client/indexing/{ClientCompactQueryTuningConfig.java => ClientCompactionTaskQueryTuningConfig.java} (92%)
 rename server/src/main/java/org/apache/druid/client/indexing/{ClientKillQuery.java => ClientKillUnusedSegmentsTaskQuery.java} (83%)
 rename server/src/main/java/org/apache/druid/client/indexing/{ClientQuery.java => ClientTaskQuery.java} (87%)
 rename server/src/main/java/org/apache/druid/guice/annotations/{CoordinatorIndexingServiceHelper.java => CoordinatorIndexingServiceDuty.java} (95%)
 rename server/src/main/java/org/apache/druid/metadata/{MetadataSegmentManager.java => SegmentsMetadataManager.java} (95%)
 rename server/src/main/java/org/apache/druid/metadata/{MetadataSegmentManagerConfig.java => SegmentsMetadataManagerConfig.java} (96%)
 rename server/src/main/java/org/apache/druid/metadata/{MetadataSegmentManagerProvider.java => SegmentsMetadataManagerProvider.java} (87%)
 rename server/src/main/java/org/apache/druid/metadata/{SQLMetadataSegmentManager.java => SqlSegmentsMetadataManager.java} (95%)
 rename server/src/main/java/org/apache/druid/metadata/{SQLMetadataSegmentManagerProvider.java => SqlSegmentsMetadataManagerProvider.java} (85%)
 rename server/src/main/java/org/apache/druid/metadata/{UnknownSegmentIdException.java => UnknownSegmentIdsException.java} (84%)
 rename server/src/main/java/org/apache/druid/segment/realtime/appenderator/{SegmentsAndMetadata.java => SegmentsAndCommitMetadata.java} (85%)
 rename server/src/main/java/org/apache/druid/server/coordinator/{DruidCoordinatorCleanupPendingSegments.java => KillStalePendingSegments.java} (90%)
 create mode 100644 server/src/main/java/org/apache/druid/server/coordinator/UserCompactionTaskQueryTuningConfig.java
 rename server/src/main/java/org/apache/druid/server/coordinator/{helper/DruidCoordinatorBalancer.java => duty/BalanceSegments.java} (96%)
 rename server/src/main/java/org/apache/druid/server/coordinator/{helper/DruidCoordinatorSegmentCompactor.java => duty/CompactSegments.java} (70%)
 rename server/src/main/java/org/apache/druid/server/coordinator/{helper => duty}/CompactionSegmentIterator.java (89%)
 rename server/src/main/java/org/apache/druid/server/coordinator/{helper => duty}/CompactionSegmentSearchPolicy.java (91%)
 rename server/src/main/java/org/apache/druid/server/coordinator/{helper/DruidCoordinatorHelper.java => duty/CoordinatorDuty.java} (72%)
 rename server/src/main/java/org/apache/druid/server/coordinator/{helper/DruidCoordinatorLogger.java => duty/EmitClusterStatsAndMetrics.java} (89%)
 rename server/src/main/java/org/apache/druid/server/coordinator/{helper/DruidCoordinatorSegmentKiller.java => duty/KillUnusedSegments.java} (85%)
 rename server/src/main/java/org/apache/druid/server/coordinator/{helper/DruidCoordinatorSegmentInfoLoader.java => duty/LogUsedSegments.java} (80%)
 rename server/src/main/java/org/apache/druid/server/coordinator/{helper/DruidCoordinatorCleanupOvershadowed.java => duty/MarkAsUnusedOvershadowedSegments.java} (94%)
 rename server/src/main/java/org/apache/druid/server/coordinator/{helper => duty}/NewestSegmentFirstIterator.java (99%)
 rename server/src/main/java/org/apache/druid/server/coordinator/{helper => duty}/NewestSegmentFirstPolicy.java (97%)
 rename server/src/main/java/org/apache/druid/server/coordinator/{helper/DruidCoordinatorRuleRunner.java => duty/RunRules.java} (88%)
 rename server/src/main/java/org/apache/druid/server/coordinator/{helper/SegmentCompactorUtil.java => duty/SegmentCompactionUtil.java} (87%)
 rename server/src/main/java/org/apache/druid/server/coordinator/{helper/DruidCoordinatorCleanupUnneeded.java => duty/UnloadUnusedSegments.java} (83%)
 rename server/src/test/java/org/apache/druid/client/indexing/{ClientKillQueryTest.java => ClientKillUnusedSegmentsQueryTest.java} (89%)
 rename server/src/test/java/org/apache/druid/metadata/{SQLMetadataSegmentManagerEmptyTest.java => SqlSegmentsMetadataManagerEmptyTest.java} (68%)
 rename server/src/test/java/org/apache/druid/metadata/{SQLMetadataSegmentManagerTest.java => SqlSegmentsMetadataManagerTest.java} (68%)
 rename server/src/test/java/org/apache/druid/server/coordinator/{DruidCoordinatorBalancerProfiler.java => BalanceSegmentsProfiler.java} (95%)
 rename server/src/test/java/org/apache/druid/server/coordinator/{DruidCoordinatorBalancerTest.java => BalanceSegmentsTest.java} (96%)
 rename server/src/test/java/org/apache/druid/server/coordinator/{DruidCoordinatorBalancerTester.java => BalanceSegmentsTester.java} (91%)
 rename server/src/test/java/org/apache/druid/server/coordinator/{DruidCoordinatorRuleRunnerTest.java => RunRulesTest.java} (98%)
 create mode 100644 server/src/test/java/org/apache/druid/server/coordinator/UserCompactionTaskQueryTuningConfigTest.java
 rename server/src/test/java/org/apache/druid/server/coordinator/{helper/DruidCoordinatorSegmentCompactorTest.java => duty/CompactSegmentsTest.java} (89%)
 rename server/src/test/java/org/apache/druid/server/coordinator/{helper/DruidCoordinatorSegmentKillerTest.java => duty/KillUnusedSegmentsTest.java} (86%)
 rename server/src/test/java/org/apache/druid/server/coordinator/{helper/DruidCoordinatorCleanupOvershadowedTest.java => duty/MarkAsUnusedOvershadowedSegmentsTest.java} (90%)
 rename server/src/test/java/org/apache/druid/server/coordinator/{helper => duty}/NewestSegmentFirstIteratorTest.java (98%)
 rename server/src/test/java/org/apache/druid/server/coordinator/{helper => duty}/NewestSegmentFirstPolicyTest.java (98%)


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