You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by ab...@apache.org on 2023/03/02 12:37:31 UTC
[druid] branch master updated (1aae37f7d6 -> 7103cb4b9d)
This is an automated email from the ASF dual-hosted git repository.
abhishek pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
from 1aae37f7d6 Fix expectedSingleiContainerOutput.yaml spelling (#13870)
add 7103cb4b9d Removes FiniteFirehoseFactory and its implementations (#12852)
No new revisions were added by this update.
Summary of changes:
.github/workflows/reusable-revised-its.yml | 2 +-
docs/configuration/index.md | 5 +-
docs/development/extensions-core/google.md | 2 -
docs/development/extensions-core/mysql.md | 34 +-
docs/development/extensions-core/postgresql.md | 34 +-
docs/ingestion/native-batch.md | 4 +-
.../firehose/aliyun/OssFirehoseDruidModule.java | 46 --
.../firehose/aliyun/StaticOssFirehoseFactory.java | 243 --------
.../org.apache.druid.initialization.DruidModule | 1 -
extensions-contrib/cloudfiles-extensions/pom.xml | 4 -
.../druid/firehose/cloudfiles/CloudFilesBlob.java | 101 ----
.../cloudfiles/CloudFilesFirehoseDruidModule.java | 48 --
.../StaticCloudFilesFirehoseFactory.java | 162 ------
.../org.apache.druid.initialization.DruidModule | 1 -
.../StaticCloudFilesFirehoseFactoryTest.java | 105 ----
.../org/apache/druid/firehose/azure/AzureBlob.java | 93 ---
.../azure/StaticAzureBlobStoreFirehoseFactory.java | 167 ------
.../storage/azure/AzureStorageDruidModule.java | 2 -
.../StaticAzureBlobStoreFirehoseFactoryTest.java | 104 ----
.../apache/druid/firehose/google/GoogleBlob.java | 81 ---
.../StaticGoogleBlobStoreFirehoseFactory.java | 155 -----
.../storage/google/GoogleStorageDruidModule.java | 2 -
.../StaticGoogleBlobStoreFirehoseFactoryTest.java | 63 --
.../druid/firehose/hdfs/HdfsFirehoseFactory.java | 127 ----
.../druid/storage/hdfs/HdfsStorageDruidModule.java | 2 -
.../firehose/hdfs/HdfsFirehoseFactoryTest.java | 218 -------
.../druid/indexing/kafka/KafkaSamplerSpecTest.java | 90 ++-
.../indexing/kinesis/KinesisSamplerSpecTest.java | 117 +++-
.../druid/firehose/s3/S3FirehoseDruidModule.java | 48 --
.../druid/firehose/s3/StaticS3FirehoseFactory.java | 236 --------
.../org.apache.druid.initialization.DruidModule | 1 -
.../firehose/s3/StaticS3FirehoseFactoryTest.java | 115 ----
.../druid/guice/IndexingServiceFirehoseModule.java | 4 +-
.../indexing/common/ReingestionTimelineUtils.java | 140 -----
.../common/task/AbstractBatchIndexTask.java | 58 +-
.../task/AppenderatorDriverRealtimeIndexTask.java | 1 +
.../druid/indexing/common/task/IndexTask.java | 21 +-
.../indexing/common/task/RealtimeIndexTask.java | 1 +
.../InputSourceSplitParallelIndexTaskRunner.java | 14 +-
.../batch/parallel/ParallelIndexIngestionSpec.java | 5 +-
.../parallel/ParallelIndexSupervisorTask.java | 10 +-
.../parallel/PartialDimensionCardinalityTask.java | 4 +-
.../parallel/PartialDimensionDistributionTask.java | 4 +-
.../batch/parallel/PartialSegmentGenerateTask.java | 4 +-
.../SinglePhaseParallelIndexTaskRunner.java | 15 +-
.../task/batch/parallel/SinglePhaseSubTask.java | 7 +-
.../firehose/IngestSegmentFirehoseFactory.java | 330 -----------
.../overlord/sampler/IndexTaskSamplerSpec.java | 35 +-
.../seekablestream/SeekableStreamSamplerSpec.java | 142 +++--
.../{TestRealtimeTask.java => TestIndexTask.java} | 54 +-
.../common/task/CompactionTaskRunTest.java | 93 ---
.../common/task/IndexIngestionSpecTest.java | 55 --
.../druid/indexing/common/task/IndexTaskTest.java | 207 +++----
.../indexing/common/task/IngestionTestBase.java | 57 ++
.../druid/indexing/common/task/TaskSerdeTest.java | 21 +-
.../AbstractMultiPhaseParallelIndexingTest.java | 20 +-
.../AbstractParallelIndexSupervisorTaskTest.java | 6 +-
.../batch/parallel/HashPartitionTaskKillTest.java | 18 +-
.../ParallelIndexSupervisorTaskSerdeTest.java | 5 -
.../parallel/ParallelIndexSupervisorTaskTest.java | 81 +++
.../parallel/SinglePhaseParallelIndexingTest.java | 29 +-
.../firehose/IngestSegmentFirehoseFactoryTest.java | 615 --------------------
.../IngestSegmentFirehoseFactoryTimelineTest.java | 453 ---------------
.../indexing/overlord/RemoteTaskRunnerTest.java | 62 +-
.../overlord/sampler/InputSourceSamplerTest.java | 492 +---------------
.../SeekableStreamSamplerSpecTest.java | 195 ++++---
.../indexing/worker/TaskAnnouncementTest.java | 10 +-
.../indexing/worker/WorkerTaskMonitorTest.java | 4 +-
.../ITCombiningFirehoseFactoryIndexTest.java | 101 ----
.../ITCombiningInputSourceParallelIndexTest.java | 2 +-
.../druid/testsEx/indexer/ITTransformTest.java | 54 --
.../wikipedia_combining_firehose_index_task.json | 95 ---
...edia_combining_input_source_index_queries.json} | 0
.../wikipedia_index_task_with_dimension_spec.json | 59 +-
...wikipedia_index_task_with_granularity_spec.json | 28 +-
.../wikipedia_index_task_with_transform.json | 103 ----
...kipedia_index_with_merge_column_limit_task.json | 48 +-
.../indexer/wikipedia_merge_index_task.json | 26 +-
.../indexer/wikipedia_merge_reindex_task.json | 30 +-
.../indexer/wikipedia_parallel_index_task.json | 48 +-
...kipedia_parallel_ingest_segment_index_task.json | 30 +-
.../indexer/wikipedia_parallel_reindex_task.json | 48 +-
.../resources/indexer/wikipedia_reindex_task.json | 26 +-
.../wikipedia_reindex_task_with_transforms.json | 108 ----
.../wikipedia_with_timestamp_index_task.json | 61 +-
.../resources/indexer/wikiticker_index_task.json | 33 +-
...edia_combining_input_source_index_queries.json} | 0
.../ITCombiningFirehoseFactoryIndexTest.java | 100 ----
.../ITCombiningInputSourceParallelIndexTest.java | 2 +-
.../druid/tests/indexer/ITTransformTest.java | 51 --
.../wikipedia_combining_firehose_index_task.json | 95 ---
...edia_combining_input_source_index_queries.json} | 0
.../wikipedia_index_task_with_dimension_spec.json | 59 +-
...wikipedia_index_task_with_granularity_spec.json | 28 +-
.../wikipedia_index_task_with_transform.json | 103 ----
...kipedia_index_with_merge_column_limit_task.json | 48 +-
.../indexer/wikipedia_merge_index_task.json | 26 +-
.../indexer/wikipedia_merge_reindex_task.json | 30 +-
.../indexer/wikipedia_parallel_index_task.json | 48 +-
...kipedia_parallel_ingest_segment_index_task.json | 30 +-
.../indexer/wikipedia_parallel_reindex_task.json | 48 +-
.../resources/indexer/wikipedia_reindex_task.json | 26 +-
.../wikipedia_reindex_task_with_transforms.json | 108 ----
.../wikipedia_with_timestamp_index_task.json | 61 +-
.../resources/indexer/wikiticker_index_task.json | 33 +-
.../druid/data/input/FiniteFirehoseFactory.java | 72 ---
.../java/org/apache/druid/data/input/Firehose.java | 1 +
.../apache/druid/data/input/FirehoseFactory.java | 19 +-
.../input/FirehoseFactoryToInputSourceAdaptor.java | 99 ----
.../org/apache/druid/data/input/SplitHintSpec.java | 2 -
.../impl/AbstractTextFilesFirehoseFactory.java | 144 -----
.../data/input/impl/FileIteratingFirehose.java | 118 ----
.../impl/FirehoseToInputSourceReaderAdaptor.java | 124 ----
.../druid/data/input/impl/RetryingInputStream.java | 3 +-
.../data/input/impl/prefetch/CacheManager.java | 97 ----
.../data/input/impl/prefetch/FetchConfig.java | 96 ---
.../data/input/impl/prefetch/FetchedFile.java | 68 ---
.../druid/data/input/impl/prefetch/Fetcher.java | 292 ----------
.../data/input/impl/prefetch/FileFetcher.java | 111 ----
.../input/impl/prefetch/ObjectOpenFunction.java | 7 -
.../druid/data/input/impl/prefetch/OpenObject.java | 71 ---
.../PrefetchableTextFilesFirehoseFactory.java | 318 ----------
.../druid/segment/transform/TransformSpec.java | 15 -
.../transform/TransformingInputRowParser.java | 5 -
.../TransformingStringInputRowParser.java | 5 -
.../FirehoseFactoryToInputSourceAdaptorTest.java | 158 -----
.../data/input/impl/FileIteratingFirehoseTest.java | 171 ------
.../druid/data/input/impl/NoopFirehoseFactory.java | 54 --
.../PrefetchableTextFilesFirehoseFactoryTest.java | 643 ---------------------
.../org/apache/druid/guice/FirehoseModule.java | 12 +-
.../realtime/firehose/ClippedFirehoseFactory.java | 1 +
.../firehose/CombiningFirehoseFactory.java | 160 -----
.../firehose/EventReceiverFirehoseFactory.java | 1 +
.../realtime/firehose/HttpFirehoseFactory.java | 165 ------
.../segment/realtime/firehose/InlineFirehose.java | 91 ---
.../realtime/firehose/InlineFirehoseFactory.java | 105 ----
.../realtime/firehose/LocalFirehoseFactory.java | 120 ----
.../firehose/PrefetchSqlFirehoseFactory.java | 280 ---------
.../segment/realtime/firehose/SqlFetcher.java | 101 ----
.../segment/realtime/firehose/SqlFirehose.java | 95 ---
.../realtime/firehose/SqlFirehoseFactory.java | 115 ----
.../firehose/TimedShutoffFirehoseFactory.java | 1 +
.../firehose/CombiningFirehoseFactoryTest.java | 174 ------
.../realtime/firehose/HttpFirehoseFactoryTest.java | 145 -----
.../firehose/InlineFirehoseFactoryTest.java | 129 -----
.../realtime/firehose/InlineFirehoseTest.java | 218 -------
.../firehose/LocalFirehoseFactoryTest.java | 105 ----
.../realtime/firehose/SqlFirehoseFactoryTest.java | 182 ------
.../segment/realtime/firehose/SqlFirehoseTest.java | 269 ---------
.../druid/cli/validate/DruidJsonValidatorTest.java | 52 +-
150 files changed, 1312 insertions(+), 11383 deletions(-)
delete mode 100644 extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/firehose/aliyun/OssFirehoseDruidModule.java
delete mode 100644 extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/firehose/aliyun/StaticOssFirehoseFactory.java
delete mode 100644 extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/firehose/cloudfiles/CloudFilesBlob.java
delete mode 100644 extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/firehose/cloudfiles/CloudFilesFirehoseDruidModule.java
delete mode 100644 extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/firehose/cloudfiles/StaticCloudFilesFirehoseFactory.java
delete mode 100644 extensions-contrib/cloudfiles-extensions/src/test/java/org/apache/druid/firehose/cloudfiles/StaticCloudFilesFirehoseFactoryTest.java
delete mode 100644 extensions-core/azure-extensions/src/main/java/org/apache/druid/firehose/azure/AzureBlob.java
delete mode 100644 extensions-core/azure-extensions/src/main/java/org/apache/druid/firehose/azure/StaticAzureBlobStoreFirehoseFactory.java
delete mode 100644 extensions-core/azure-extensions/src/test/java/org/apache/druid/firehose/azure/StaticAzureBlobStoreFirehoseFactoryTest.java
delete mode 100644 extensions-core/google-extensions/src/main/java/org/apache/druid/firehose/google/GoogleBlob.java
delete mode 100644 extensions-core/google-extensions/src/main/java/org/apache/druid/firehose/google/StaticGoogleBlobStoreFirehoseFactory.java
delete mode 100644 extensions-core/google-extensions/src/test/java/org/apache/druid/firehose/google/StaticGoogleBlobStoreFirehoseFactoryTest.java
delete mode 100644 extensions-core/hdfs-storage/src/main/java/org/apache/druid/firehose/hdfs/HdfsFirehoseFactory.java
delete mode 100644 extensions-core/hdfs-storage/src/test/java/org/apache/druid/firehose/hdfs/HdfsFirehoseFactoryTest.java
delete mode 100644 extensions-core/s3-extensions/src/main/java/org/apache/druid/firehose/s3/S3FirehoseDruidModule.java
delete mode 100644 extensions-core/s3-extensions/src/main/java/org/apache/druid/firehose/s3/StaticS3FirehoseFactory.java
delete mode 100644 extensions-core/s3-extensions/src/test/java/org/apache/druid/firehose/s3/StaticS3FirehoseFactoryTest.java
delete mode 100644 indexing-service/src/main/java/org/apache/druid/indexing/common/ReingestionTimelineUtils.java
delete mode 100644 indexing-service/src/main/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactory.java
rename indexing-service/src/test/java/org/apache/druid/indexing/common/{TestRealtimeTask.java => TestIndexTask.java} (61%)
delete mode 100644 indexing-service/src/test/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactoryTest.java
delete mode 100644 indexing-service/src/test/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactoryTimelineTest.java
copy extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisSamplerSpecTest.java => indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSamplerSpecTest.java (66%)
delete mode 100644 integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/indexer/ITCombiningFirehoseFactoryIndexTest.java
delete mode 100644 integration-tests-ex/cases/src/test/resources/indexer/wikipedia_combining_firehose_index_task.json
rename integration-tests-ex/cases/src/test/resources/indexer/{wikipedia_combining_firehose_index_queries.json => wikipedia_combining_input_source_index_queries.json} (100%)
delete mode 100644 integration-tests-ex/cases/src/test/resources/indexer/wikipedia_index_task_with_transform.json
delete mode 100644 integration-tests-ex/cases/src/test/resources/indexer/wikipedia_reindex_task_with_transforms.json
rename integration-tests-ex/cases/src/test/resources/multi-stage-query/{wikipedia_combining_firehose_index_queries.json => wikipedia_combining_input_source_index_queries.json} (100%)
delete mode 100644 integration-tests/src/test/java/org/apache/druid/tests/indexer/ITCombiningFirehoseFactoryIndexTest.java
delete mode 100644 integration-tests/src/test/resources/indexer/wikipedia_combining_firehose_index_task.json
rename integration-tests/src/test/resources/indexer/{wikipedia_combining_firehose_index_queries.json => wikipedia_combining_input_source_index_queries.json} (100%)
delete mode 100644 integration-tests/src/test/resources/indexer/wikipedia_index_task_with_transform.json
delete mode 100644 integration-tests/src/test/resources/indexer/wikipedia_reindex_task_with_transforms.json
delete mode 100644 processing/src/main/java/org/apache/druid/data/input/FiniteFirehoseFactory.java
delete mode 100644 processing/src/main/java/org/apache/druid/data/input/FirehoseFactoryToInputSourceAdaptor.java
delete mode 100644 processing/src/main/java/org/apache/druid/data/input/impl/AbstractTextFilesFirehoseFactory.java
delete mode 100644 processing/src/main/java/org/apache/druid/data/input/impl/FileIteratingFirehose.java
delete mode 100644 processing/src/main/java/org/apache/druid/data/input/impl/FirehoseToInputSourceReaderAdaptor.java
delete mode 100644 processing/src/main/java/org/apache/druid/data/input/impl/prefetch/CacheManager.java
delete mode 100644 processing/src/main/java/org/apache/druid/data/input/impl/prefetch/FetchConfig.java
delete mode 100644 processing/src/main/java/org/apache/druid/data/input/impl/prefetch/FetchedFile.java
delete mode 100644 processing/src/main/java/org/apache/druid/data/input/impl/prefetch/Fetcher.java
delete mode 100644 processing/src/main/java/org/apache/druid/data/input/impl/prefetch/FileFetcher.java
delete mode 100644 processing/src/main/java/org/apache/druid/data/input/impl/prefetch/OpenObject.java
delete mode 100644 processing/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactory.java
delete mode 100644 processing/src/test/java/org/apache/druid/data/input/FirehoseFactoryToInputSourceAdaptorTest.java
delete mode 100644 processing/src/test/java/org/apache/druid/data/input/impl/FileIteratingFirehoseTest.java
delete mode 100644 processing/src/test/java/org/apache/druid/data/input/impl/NoopFirehoseFactory.java
delete mode 100644 processing/src/test/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java
delete mode 100644 server/src/main/java/org/apache/druid/segment/realtime/firehose/CombiningFirehoseFactory.java
delete mode 100644 server/src/main/java/org/apache/druid/segment/realtime/firehose/HttpFirehoseFactory.java
delete mode 100644 server/src/main/java/org/apache/druid/segment/realtime/firehose/InlineFirehose.java
delete mode 100644 server/src/main/java/org/apache/druid/segment/realtime/firehose/InlineFirehoseFactory.java
delete mode 100644 server/src/main/java/org/apache/druid/segment/realtime/firehose/LocalFirehoseFactory.java
delete mode 100644 server/src/main/java/org/apache/druid/segment/realtime/firehose/PrefetchSqlFirehoseFactory.java
delete mode 100644 server/src/main/java/org/apache/druid/segment/realtime/firehose/SqlFetcher.java
delete mode 100644 server/src/main/java/org/apache/druid/segment/realtime/firehose/SqlFirehose.java
delete mode 100644 server/src/main/java/org/apache/druid/segment/realtime/firehose/SqlFirehoseFactory.java
delete mode 100644 server/src/test/java/org/apache/druid/segment/realtime/firehose/CombiningFirehoseFactoryTest.java
delete mode 100644 server/src/test/java/org/apache/druid/segment/realtime/firehose/HttpFirehoseFactoryTest.java
delete mode 100644 server/src/test/java/org/apache/druid/segment/realtime/firehose/InlineFirehoseFactoryTest.java
delete mode 100644 server/src/test/java/org/apache/druid/segment/realtime/firehose/InlineFirehoseTest.java
delete mode 100644 server/src/test/java/org/apache/druid/segment/realtime/firehose/LocalFirehoseFactoryTest.java
delete mode 100644 server/src/test/java/org/apache/druid/segment/realtime/firehose/SqlFirehoseFactoryTest.java
delete mode 100644 server/src/test/java/org/apache/druid/segment/realtime/firehose/SqlFirehoseTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org