This is an automated email from the ASF dual-hosted git repository. kishoreg pushed a commit to branch restructure-plugins in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit a875dccc4a1f1e475ba55be15189139cb8869635 Author: kishoreg <[email protected]> AuthorDate: Sat Dec 21 15:21:10 2019 -0800 Restructuring Pinot Plugin Modules --- pinot-distribution/pom.xml | 5 +++-- pinot-integration-tests/pom.xml | 2 +- pinot-perf/pom.xml | 2 +- .../pinot-batch-ingestion-base}/pom.xml | 7 +++---- .../java/org/apache/pinot/ingestion/common/Constants.java | 0 .../apache/pinot/ingestion/common/PinotClusterSpec.java | 0 .../org/apache/pinot/ingestion/common/PinotFSSpec.java | 0 .../org/apache/pinot/ingestion/common/PushJobSpec.java | 0 .../apache/pinot/ingestion/common/RecordReaderSpec.java | 0 .../pinot/ingestion/common/SegmentGenerationJobSpec.java | 0 .../ingestion/common/SegmentGenerationTaskRunner.java | 0 .../pinot/ingestion/common/SegmentGenerationTaskSpec.java | 0 .../pinot/ingestion/common/SegmentNameGeneratorSpec.java | 0 .../java/org/apache/pinot/ingestion/common/TableSpec.java | 0 .../ingestion/standalone/SegmentGenerationJobRunner.java | 0 .../ingestion/standalone/SegmentTarPushJobRunner.java | 0 .../ingestion/standalone/SegmentUriPushJobRunner.java | 0 .../standalone/StandaloneIngestionJobLauncher.java | 0 .../main/resources/segmentCreationAndTarPushJobSpec.yaml | 0 .../main/resources/segmentCreationAndUriPushJobSpec.yaml | 0 .../src/main/resources/segmentCreationJobSpec.yaml | 0 .../src/main/resources/segmentTarPushJobSpec.yaml | 0 .../src/main/resources/segmentUriPushJobSpec.yaml | 0 .../pinot-batch-ingestion}/pom.xml | 11 ++++------- .../v0_deprecated}/pinot-hadoop/README.md | 0 .../v0_deprecated}/pinot-hadoop/pom.xml | 4 ++-- .../org/apache/pinot/hadoop/PinotHadoopJobLauncher.java | 0 .../apache/pinot/hadoop/io/CombineAvroKeyInputFormat.java | 0 .../main/java/org/apache/pinot/hadoop/io/FileHandler.java | 0 .../org/apache/pinot/hadoop/io/JsonPinotOutputFormat.java | 0 .../org/apache/pinot/hadoop/io/PinotOutputFormat.java | 0 .../main/java/org/apache/pinot/hadoop/io/PinotRecord.java | 0 .../apache/pinot/hadoop/io/PinotRecordSerialization.java | 0 .../org/apache/pinot/hadoop/io/PinotRecordWriter.java | 0 .../apache/pinot/hadoop/job/HadoopSegmentCreationJob.java | 0 .../pinot/hadoop/job/HadoopSegmentPreprocessingJob.java | 0 .../apache/pinot/hadoop/job/InternalConfigConstants.java | 0 .../pinot/hadoop/job/mappers/SegmentCreationMapper.java | 0 .../hadoop/job/mappers/SegmentPreprocessingMapper.java | 0 .../pinot/hadoop/job/partitioners/GenericPartitioner.java | 0 .../hadoop/job/partitioners/PartitionFunctionFactory.java | 0 .../hadoop/job/reducers/SegmentPreprocessingReducer.java | 0 .../hadoop/utils/PinotHadoopJobPreparationHelper.java | 0 .../pinot/hadoop/io/DeleteExtraPushedSegmentsTest.java | 0 .../org/apache/pinot/hadoop/io/PinotOutputFormatTest.java | 0 .../pinot/hadoop/job/mappers/SegmentCreationTest.java | 0 .../v0_deprecated}/pinot-ingestion-common/pom.xml | 5 ++--- .../apache/pinot/ingestion/common/ControllerRestApi.java | 0 .../pinot/ingestion/common/DefaultControllerRestApi.java | 0 .../apache/pinot/ingestion/common/JobConfigConstants.java | 0 .../pinot/ingestion/common/PinotIngestionJobType.java | 0 .../org/apache/pinot/ingestion/jobs/BaseSegmentJob.java | 0 .../apache/pinot/ingestion/jobs/SegmentCreationJob.java | 0 .../pinot/ingestion/jobs/SegmentPreprocessingJob.java | 0 .../apache/pinot/ingestion/jobs/SegmentTarPushJob.java | 0 .../apache/pinot/ingestion/jobs/SegmentUriPushJob.java | 0 .../pinot/ingestion/utils/JobPreparationHelper.java | 0 .../org/apache/pinot/ingestion/utils/PushLocation.java | 0 .../v0_deprecated}/pinot-spark/README.md | 0 .../v0_deprecated}/pinot-spark/pom.xml | 4 ++-- .../org/apache/pinot/spark/PinotSparkJobLauncher.java | 0 .../pinot/spark/jobs/SparkSegmentCreationFunction.java | 0 .../apache/pinot/spark/jobs/SparkSegmentCreationJob.java | 0 .../apache/pinot/spark/jobs/SparkSegmentTarPushJob.java | 0 .../apache/pinot/spark/jobs/SparkSegmentUriPushJob.java | 0 .../pinot/spark/utils/PinotSparkJobPreparationHelper.java | 0 .../pinot-batch-ingestion/v0_deprecated}/pom.xml | 7 +++---- .../pinot-file-system/pinot-adls}/pom.xml | 9 +++++---- .../java/org/apache/pinot/filesystem/AzurePinotFS.java | 0 .../azure/datalake/store/MockADLFileInputStream.java | 0 .../apache/pinot/filesystem/test/AzurePinotFSTest.java | 0 .../pinot-file-system/pinot-gcs}/pom.xml | 14 +++++++------- .../main/java/org/apache/pinot/filesystem/GcsPinotFS.java | 0 .../pinot-file-system/pinot-hdfs}/pom.xml | 6 +++--- .../java/org/apache/pinot/filesystem/HadoopPinotFS.java | 0 .../pinot-file-system}/pom.xml | 14 +++++++------- .../pinot-input-format}/pinot-avro/pom.xml | 4 ++-- .../apache/pinot/avro/data/readers/AvroRecordReader.java | 0 .../apache/pinot/avro/data/readers/AvroSchemaUtil.java | 0 .../org/apache/pinot/avro/data/readers/AvroUtils.java | 0 .../pinot/avro/data/readers/AvroRecordReaderTest.java | 0 .../pinot-input-format}/pinot-csv/pom.xml | 4 ++-- .../apache/pinot/csv/data/readers/CSVRecordReader.java | 0 .../pinot/csv/data/readers/CSVRecordReaderConfig.java | 0 .../pinot/csv/data/readers/CSVRecordReaderTest.java | 0 .../pinot-input-format}/pinot-json/pom.xml | 4 ++-- .../apache/pinot/json/data/readers/JSONRecordReader.java | 0 .../pinot/json/data/readers/JSONRecordReaderTest.java | 0 .../pinot-input-format}/pinot-orc/pom.xml | 4 ++-- .../apache/pinot/orc/data/readers/ORCRecordReader.java | 0 .../pinot/orc/data/readers/ORCRecordReaderTest.java | 0 .../pinot-input-format}/pinot-parquet/pom.xml | 4 ++-- .../pinot/parquet/data/readers/ParquetRecordReader.java | 0 .../apache/pinot/parquet/data/readers/ParquetUtils.java | 0 .../parquet/data/readers/ParquetRecordReaderTest.java | 0 .../pinot-input-format}/pinot-thrift/pom.xml | 4 ++-- .../pinot/thrift/data/readers/ThriftRecordReader.java | 0 .../thrift/data/readers/ThriftRecordReaderConfig.java | 0 .../pinot/thrift/data/readers/ThriftRecordReaderTest.java | 0 .../pinot/thrift/data/readers/ThriftSampleData.java | 0 .../pinot-input-format}/pom.xml | 8 ++++---- .../pinot-stream-ingestion}/README.md | 0 .../pinot-stream-ingestion/pinot-kafka-0.9}/README.md | 0 .../pinot-stream-ingestion/pinot-kafka-0.9}/pom.xml | 11 +++++------ .../core/realtime/impl/kafka/ConsumerAndIterator.java | 0 .../core/realtime/impl/kafka/KafkaBrokerWrapper.java | 0 .../core/realtime/impl/kafka/KafkaConnectionHandler.java | 0 .../core/realtime/impl/kafka/KafkaConsumerFactory.java | 0 .../core/realtime/impl/kafka/KafkaConsumerManager.java | 0 .../realtime/impl/kafka/KafkaHighLevelStreamConfig.java | 0 .../realtime/impl/kafka/KafkaLowLevelStreamConfig.java | 0 .../realtime/impl/kafka/KafkaPartitionLevelConsumer.java | 0 .../realtime/impl/kafka/KafkaSimpleConsumerFactory.java | 0 .../impl/kafka/KafkaSimpleConsumerFactoryImpl.java | 0 .../realtime/impl/kafka/KafkaStreamLevelConsumer.java | 0 .../realtime/impl/kafka/KafkaStreamMetadataProvider.java | 0 .../core/realtime/impl/kafka/SimpleConsumerFactory.java | 0 .../realtime/impl/kafka/SimpleConsumerMessageBatch.java | 0 .../realtime/impl/kafka/server/KafkaDataProducer.java | 0 .../impl/kafka/server/KafkaDataServerStartable.java | 0 .../org.apache.pinot.spi.stream.StreamConsumerFactory | 0 .../impl/kafka/KafkaLowLevelStreamConfigTest.java | 0 .../impl/kafka/KafkaPartitionLevelConsumerTest.java | 0 .../pinot-stream-ingestion/pinot-kafka-2.0}/README.md | 0 .../pinot-stream-ingestion/pinot-kafka-2.0}/pom.xml | 11 +++++------ .../core/realtime/impl/kafka2/KafkaConsumerFactory.java | 0 .../core/realtime/impl/kafka2/KafkaMessageBatch.java | 0 .../impl/kafka2/KafkaPartitionLevelConnectionHandler.java | 0 .../realtime/impl/kafka2/KafkaPartitionLevelConsumer.java | 0 .../impl/kafka2/KafkaPartitionLevelStreamConfig.java | 0 .../realtime/impl/kafka2/KafkaStreamLevelConsumer.java | 0 .../impl/kafka2/KafkaStreamLevelConsumerManager.java | 0 .../impl/kafka2/KafkaStreamLevelStreamConfig.java | 0 .../realtime/impl/kafka2/KafkaStreamMetadataProvider.java | 0 .../realtime/impl/kafka2/server/KafkaDataProducer.java | 0 .../impl/kafka2/server/KafkaDataServerStartable.java | 0 .../org.apache.pinot.spi.stream.StreamConsumerFactory | 0 .../impl/kafka2/KafkaPartitionLevelConsumerTest.java | 0 .../impl/kafka2/KafkaPartitionLevelStreamConfigTest.java | 0 .../realtime/impl/kafka2/utils/EmbeddedZooKeeper.java | 0 .../core/realtime/impl/kafka2/utils/MiniKafkaCluster.java | 0 .../pinot-stream-ingestion/pinot-kafka-base}/README.md | 0 .../pinot-stream-ingestion/pinot-kafka-base}/pom.xml | 9 ++++----- .../core/realtime/impl/kafka/KafkaAvroMessageDecoder.java | 0 .../core/realtime/impl/kafka/KafkaJSONMessageDecoder.java | 0 .../pinot/core/realtime/impl/kafka/KafkaStarterUtils.java | 0 .../realtime/impl/kafka/KafkaStreamConfigProperties.java | 0 .../pinot/core/realtime/impl/kafka/MessageAndOffset.java | 0 .../realtime/stream/AvroRecordToPinotRowGenerator.java | 0 .../core/realtime/stream/SimpleAvroMessageDecoder.java | 0 .../realtime/impl/kafka/KafkaJSONMessageDecoderTest.java | 0 .../stream/AvroRecordToPinotRowGeneratorTest.java | 0 .../src/test/resources/data/test_sample_data.json | 0 .../data/test_sample_data_schema_no_time_field.json | 0 .../test_sample_data_schema_with_outgoing_time_spec.json | 0 ...est_sample_data_schema_without_outgoing_time_spec.json | 0 .../pinot-stream-ingestion}/pom.xml | 15 +++++++-------- {pinot-record-readers => pinot-plugins}/pom.xml | 15 ++++++--------- pinot-tools/pom.xml | 4 ++-- pom.xml | 9 ++------- 160 files changed, 90 insertions(+), 106 deletions(-) diff --git a/pinot-distribution/pom.xml b/pinot-distribution/pom.xml index e3cd623..970ec69 100644 --- a/pinot-distribution/pom.xml +++ b/pinot-distribution/pom.xml @@ -60,13 +60,13 @@ <groupId>org.apache.pinot</groupId> <artifactId>pinot-controller</artifactId> </dependency> - <dependency> + <!--<dependency> <groupId>org.apache.pinot</groupId> <artifactId>pinot-hadoop</artifactId> </dependency> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-hadoop-filesystem</artifactId> + <artifactId>pinot-hdfs</artifactId> </dependency> <dependency> <groupId>org.apache.pinot</groupId> @@ -84,6 +84,7 @@ <groupId>org.apache.pinot</groupId> <artifactId>pinot-orc</artifactId> </dependency> + --> <dependency> <groupId>org.apache.pinot</groupId> <artifactId>pinot-tools</artifactId> diff --git a/pinot-integration-tests/pom.xml b/pinot-integration-tests/pom.xml index 48c0e69..29663a4 100644 --- a/pinot-integration-tests/pom.xml +++ b/pinot-integration-tests/pom.xml @@ -203,7 +203,7 @@ </dependency> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-connector-kafka-${kafka.version}</artifactId> + <artifactId>pinot-kafka-${kafka.version}</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> diff --git a/pinot-perf/pom.xml b/pinot-perf/pom.xml index 9b37480..810a0fe 100644 --- a/pinot-perf/pom.xml +++ b/pinot-perf/pom.xml @@ -52,7 +52,7 @@ </dependency> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-connector-kafka-${kafka.version}</artifactId> + <artifactId>pinot-kafka-${kafka.version}</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> diff --git a/pinot-batch-ingestion/pinot-standalone/pom.xml b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/pom.xml similarity index 97% rename from pinot-batch-ingestion/pinot-standalone/pom.xml rename to pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/pom.xml index 05405cd..427867c 100644 --- a/pinot-batch-ingestion/pinot-standalone/pom.xml +++ b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/pom.xml @@ -29,11 +29,11 @@ <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>pinot-standalone</artifactId> - <name>Pinot Ingestion Standalone</name> + <artifactId>pinot-batch-ingestion-base</artifactId> + <name>Pinot Batch Ingestion Base</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/../..</pinot.root> + <pinot.root>${basedir}/../../..</pinot.root> </properties> <profiles> <profile> @@ -176,4 +176,3 @@ </plugins> </build> </project> - diff --git a/pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/common/Constants.java b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/common/Constants.java similarity index 100% rename from pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/common/Constants.java rename to pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/common/Constants.java diff --git a/pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/common/PinotClusterSpec.java b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/common/PinotClusterSpec.java similarity index 100% rename from pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/common/PinotClusterSpec.java rename to pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/common/PinotClusterSpec.java diff --git a/pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/common/PinotFSSpec.java b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/common/PinotFSSpec.java similarity index 100% rename from pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/common/PinotFSSpec.java rename to pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/common/PinotFSSpec.java diff --git a/pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/common/PushJobSpec.java b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/common/PushJobSpec.java similarity index 100% rename from pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/common/PushJobSpec.java rename to pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/common/PushJobSpec.java diff --git a/pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/common/RecordReaderSpec.java b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/common/RecordReaderSpec.java similarity index 100% rename from pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/common/RecordReaderSpec.java rename to pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/common/RecordReaderSpec.java diff --git a/pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/common/SegmentGenerationJobSpec.java b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/common/SegmentGenerationJobSpec.java similarity index 100% rename from pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/common/SegmentGenerationJobSpec.java rename to pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/common/SegmentGenerationJobSpec.java diff --git a/pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/common/SegmentGenerationTaskRunner.java b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/common/SegmentGenerationTaskRunner.java similarity index 100% rename from pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/common/SegmentGenerationTaskRunner.java rename to pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/common/SegmentGenerationTaskRunner.java diff --git a/pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/common/SegmentGenerationTaskSpec.java b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/common/SegmentGenerationTaskSpec.java similarity index 100% rename from pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/common/SegmentGenerationTaskSpec.java rename to pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/common/SegmentGenerationTaskSpec.java diff --git a/pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/common/SegmentNameGeneratorSpec.java b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/common/SegmentNameGeneratorSpec.java similarity index 100% rename from pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/common/SegmentNameGeneratorSpec.java rename to pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/common/SegmentNameGeneratorSpec.java diff --git a/pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/common/TableSpec.java b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/common/TableSpec.java similarity index 100% rename from pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/common/TableSpec.java rename to pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/common/TableSpec.java diff --git a/pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/standalone/SegmentGenerationJobRunner.java b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/standalone/SegmentGenerationJobRunner.java similarity index 100% rename from pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/standalone/SegmentGenerationJobRunner.java rename to pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/standalone/SegmentGenerationJobRunner.java diff --git a/pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/standalone/SegmentTarPushJobRunner.java b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/standalone/SegmentTarPushJobRunner.java similarity index 100% rename from pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/standalone/SegmentTarPushJobRunner.java rename to pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/standalone/SegmentTarPushJobRunner.java diff --git a/pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/standalone/SegmentUriPushJobRunner.java b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/standalone/SegmentUriPushJobRunner.java similarity index 100% rename from pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/standalone/SegmentUriPushJobRunner.java rename to pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/standalone/SegmentUriPushJobRunner.java diff --git a/pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/standalone/StandaloneIngestionJobLauncher.java b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/standalone/StandaloneIngestionJobLauncher.java similarity index 100% rename from pinot-batch-ingestion/pinot-standalone/src/main/java/org/apache/pinot/ingestion/standalone/StandaloneIngestionJobLauncher.java rename to pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/java/org/apache/pinot/ingestion/standalone/StandaloneIngestionJobLauncher.java diff --git a/pinot-batch-ingestion/pinot-standalone/src/main/resources/segmentCreationAndTarPushJobSpec.yaml b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/resources/segmentCreationAndTarPushJobSpec.yaml similarity index 100% rename from pinot-batch-ingestion/pinot-standalone/src/main/resources/segmentCreationAndTarPushJobSpec.yaml rename to pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/resources/segmentCreationAndTarPushJobSpec.yaml diff --git a/pinot-batch-ingestion/pinot-standalone/src/main/resources/segmentCreationAndUriPushJobSpec.yaml b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/resources/segmentCreationAndUriPushJobSpec.yaml similarity index 100% rename from pinot-batch-ingestion/pinot-standalone/src/main/resources/segmentCreationAndUriPushJobSpec.yaml rename to pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/resources/segmentCreationAndUriPushJobSpec.yaml diff --git a/pinot-batch-ingestion/pinot-standalone/src/main/resources/segmentCreationJobSpec.yaml b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/resources/segmentCreationJobSpec.yaml similarity index 100% rename from pinot-batch-ingestion/pinot-standalone/src/main/resources/segmentCreationJobSpec.yaml rename to pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/resources/segmentCreationJobSpec.yaml diff --git a/pinot-batch-ingestion/pinot-standalone/src/main/resources/segmentTarPushJobSpec.yaml b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/resources/segmentTarPushJobSpec.yaml similarity index 100% rename from pinot-batch-ingestion/pinot-standalone/src/main/resources/segmentTarPushJobSpec.yaml rename to pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/resources/segmentTarPushJobSpec.yaml diff --git a/pinot-batch-ingestion/pinot-standalone/src/main/resources/segmentUriPushJobSpec.yaml b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/resources/segmentUriPushJobSpec.yaml similarity index 100% rename from pinot-batch-ingestion/pinot-standalone/src/main/resources/segmentUriPushJobSpec.yaml rename to pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-base/src/main/resources/segmentUriPushJobSpec.yaml diff --git a/pinot-batch-ingestion/pom.xml b/pinot-plugins/pinot-batch-ingestion/pom.xml similarity index 88% copy from pinot-batch-ingestion/pom.xml copy to pinot-plugins/pinot-batch-ingestion/pom.xml index bb9bbce..4a94aca 100644 --- a/pinot-batch-ingestion/pom.xml +++ b/pinot-plugins/pinot-batch-ingestion/pom.xml @@ -24,24 +24,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>pinot</artifactId> + <artifactId>pinot-plugins</artifactId> <groupId>org.apache.pinot</groupId> <version>0.3.0-SNAPSHOT</version> </parent> - <artifactId>pinot-batch-ingestion</artifactId> <packaging>pom</packaging> <name>Pinot Batch Ingestion</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/..</pinot.root> + <pinot.root>${basedir}/../..</pinot.root> </properties> <modules> - <module>pinot-ingestion-common</module> - <module>pinot-hadoop</module> - <module>pinot-spark</module> - <module>pinot-standalone</module> + <module>pinot-batch-ingestion-base</module> + <module>v0_deprecated</module> </modules> <dependencies> diff --git a/pinot-batch-ingestion/pinot-hadoop/README.md b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/README.md similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/README.md rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/README.md diff --git a/pinot-batch-ingestion/pinot-hadoop/pom.xml b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/pom.xml similarity index 98% rename from pinot-batch-ingestion/pinot-hadoop/pom.xml rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/pom.xml index 6f2e6b0..b2a14f8 100644 --- a/pinot-batch-ingestion/pinot-hadoop/pom.xml +++ b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/pom.xml @@ -23,7 +23,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>pinot-batch-ingestion</artifactId> + <artifactId>v0_deprecated</artifactId> <groupId>org.apache.pinot</groupId> <version>0.3.0-SNAPSHOT</version> </parent> @@ -31,7 +31,7 @@ <name>Pinot Hadoop</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/../..</pinot.root> + <pinot.root>${basedir}/../../../..</pinot.root> </properties> <profiles> <profile> diff --git a/pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/PinotHadoopJobLauncher.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/PinotHadoopJobLauncher.java similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/PinotHadoopJobLauncher.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/PinotHadoopJobLauncher.java diff --git a/pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/CombineAvroKeyInputFormat.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/CombineAvroKeyInputFormat.java similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/CombineAvroKeyInputFormat.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/CombineAvroKeyInputFormat.java diff --git a/pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/FileHandler.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/FileHandler.java similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/FileHandler.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/FileHandler.java diff --git a/pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/JsonPinotOutputFormat.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/JsonPinotOutputFormat.java similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/JsonPinotOutputFormat.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/JsonPinotOutputFormat.java diff --git a/pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotOutputFormat.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotOutputFormat.java similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotOutputFormat.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotOutputFormat.java diff --git a/pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotRecord.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotRecord.java similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotRecord.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotRecord.java diff --git a/pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotRecordSerialization.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotRecordSerialization.java similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotRecordSerialization.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotRecordSerialization.java diff --git a/pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotRecordWriter.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotRecordWriter.java similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotRecordWriter.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotRecordWriter.java diff --git a/pinot-batch-ingestion/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 similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/HadoopSegmentCreationJob.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/HadoopSegmentCreationJob.java diff --git a/pinot-batch-ingestion/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 similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/HadoopSegmentPreprocessingJob.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/HadoopSegmentPreprocessingJob.java diff --git a/pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/InternalConfigConstants.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/InternalConfigConstants.java similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/InternalConfigConstants.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/InternalConfigConstants.java diff --git a/pinot-batch-ingestion/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 similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/SegmentCreationMapper.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/SegmentCreationMapper.java diff --git a/pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/SegmentPreprocessingMapper.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/SegmentPreprocessingMapper.java similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/SegmentPreprocessingMapper.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/SegmentPreprocessingMapper.java diff --git a/pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/partitioners/GenericPartitioner.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/partitioners/GenericPartitioner.java similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/partitioners/GenericPartitioner.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/partitioners/GenericPartitioner.java diff --git a/pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/partitioners/PartitionFunctionFactory.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/partitioners/PartitionFunctionFactory.java similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/partitioners/PartitionFunctionFactory.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/partitioners/PartitionFunctionFactory.java diff --git a/pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/reducers/SegmentPreprocessingReducer.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/reducers/SegmentPreprocessingReducer.java similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/reducers/SegmentPreprocessingReducer.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/reducers/SegmentPreprocessingReducer.java diff --git a/pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/PinotHadoopJobPreparationHelper.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/PinotHadoopJobPreparationHelper.java similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/PinotHadoopJobPreparationHelper.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/PinotHadoopJobPreparationHelper.java diff --git a/pinot-batch-ingestion/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/io/DeleteExtraPushedSegmentsTest.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/io/DeleteExtraPushedSegmentsTest.java similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/io/DeleteExtraPushedSegmentsTest.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/io/DeleteExtraPushedSegmentsTest.java diff --git a/pinot-batch-ingestion/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/io/PinotOutputFormatTest.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/io/PinotOutputFormatTest.java similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/io/PinotOutputFormatTest.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/io/PinotOutputFormatTest.java diff --git a/pinot-batch-ingestion/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/job/mappers/SegmentCreationTest.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/job/mappers/SegmentCreationTest.java similarity index 100% rename from pinot-batch-ingestion/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/job/mappers/SegmentCreationTest.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/job/mappers/SegmentCreationTest.java diff --git a/pinot-batch-ingestion/pinot-ingestion-common/pom.xml b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/pom.xml similarity index 96% rename from pinot-batch-ingestion/pinot-ingestion-common/pom.xml rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/pom.xml index 9e09180..b0f496b 100644 --- a/pinot-batch-ingestion/pinot-ingestion-common/pom.xml +++ b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>pinot-batch-ingestion</artifactId> + <artifactId>v0_deprecated</artifactId> <groupId>org.apache.pinot</groupId> <version>0.3.0-SNAPSHOT</version> <relativePath>..</relativePath> @@ -33,7 +33,7 @@ <name>Pinot Ingestion Common</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/../..</pinot.root> + <pinot.root>${basedir}/../../../..</pinot.root> </properties> <dependencies> @@ -94,4 +94,3 @@ </plugins> </build> </project> - diff --git a/pinot-batch-ingestion/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 similarity index 100% rename from pinot-batch-ingestion/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/ControllerRestApi.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/ControllerRestApi.java diff --git a/pinot-batch-ingestion/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 similarity index 100% rename from pinot-batch-ingestion/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/DefaultControllerRestApi.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/DefaultControllerRestApi.java diff --git a/pinot-batch-ingestion/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/JobConfigConstants.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/JobConfigConstants.java similarity index 100% rename from pinot-batch-ingestion/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/JobConfigConstants.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/JobConfigConstants.java diff --git a/pinot-batch-ingestion/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/PinotIngestionJobType.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/PinotIngestionJobType.java similarity index 100% rename from pinot-batch-ingestion/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/PinotIngestionJobType.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/PinotIngestionJobType.java diff --git a/pinot-batch-ingestion/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 similarity index 100% rename from pinot-batch-ingestion/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/BaseSegmentJob.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/BaseSegmentJob.java diff --git a/pinot-batch-ingestion/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentCreationJob.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentCreationJob.java similarity index 100% rename from pinot-batch-ingestion/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentCreationJob.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentCreationJob.java diff --git a/pinot-batch-ingestion/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentPreprocessingJob.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentPreprocessingJob.java similarity index 100% rename from pinot-batch-ingestion/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentPreprocessingJob.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentPreprocessingJob.java diff --git a/pinot-batch-ingestion/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentTarPushJob.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentTarPushJob.java similarity index 100% rename from pinot-batch-ingestion/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentTarPushJob.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentTarPushJob.java diff --git a/pinot-batch-ingestion/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentUriPushJob.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentUriPushJob.java similarity index 100% rename from pinot-batch-ingestion/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentUriPushJob.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentUriPushJob.java diff --git a/pinot-batch-ingestion/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/utils/JobPreparationHelper.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/utils/JobPreparationHelper.java similarity index 100% rename from pinot-batch-ingestion/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/utils/JobPreparationHelper.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/utils/JobPreparationHelper.java diff --git a/pinot-batch-ingestion/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/utils/PushLocation.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/utils/PushLocation.java similarity index 100% rename from pinot-batch-ingestion/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/utils/PushLocation.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/utils/PushLocation.java diff --git a/pinot-batch-ingestion/pinot-spark/README.md b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/README.md similarity index 100% rename from pinot-batch-ingestion/pinot-spark/README.md rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/README.md diff --git a/pinot-batch-ingestion/pinot-spark/pom.xml b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/pom.xml similarity index 98% rename from pinot-batch-ingestion/pinot-spark/pom.xml rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/pom.xml index 37e3703..00b7bac 100644 --- a/pinot-batch-ingestion/pinot-spark/pom.xml +++ b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/pom.xml @@ -23,7 +23,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>pinot-batch-ingestion</artifactId> + <artifactId>v0_deprecated</artifactId> <groupId>org.apache.pinot</groupId> <version>0.3.0-SNAPSHOT</version> </parent> @@ -31,7 +31,7 @@ <name>Pinot Spark</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/../..</pinot.root> + <pinot.root>${basedir}/../../../..</pinot.root> <spark.version>2.2.0</spark.version> <scala.binary.version>2.11</scala.binary.version> <scala.version>2.11.11</scala.version> diff --git a/pinot-batch-ingestion/pinot-spark/src/main/java/org/apache/pinot/spark/PinotSparkJobLauncher.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/PinotSparkJobLauncher.java similarity index 100% rename from pinot-batch-ingestion/pinot-spark/src/main/java/org/apache/pinot/spark/PinotSparkJobLauncher.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/PinotSparkJobLauncher.java diff --git a/pinot-batch-ingestion/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 similarity index 100% rename from pinot-batch-ingestion/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentCreationFunction.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentCreationFunction.java diff --git a/pinot-batch-ingestion/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 similarity index 100% rename from pinot-batch-ingestion/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentCreationJob.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentCreationJob.java diff --git a/pinot-batch-ingestion/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentTarPushJob.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentTarPushJob.java similarity index 100% rename from pinot-batch-ingestion/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentTarPushJob.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentTarPushJob.java diff --git a/pinot-batch-ingestion/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentUriPushJob.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentUriPushJob.java similarity index 100% rename from pinot-batch-ingestion/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentUriPushJob.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentUriPushJob.java diff --git a/pinot-batch-ingestion/pinot-spark/src/main/java/org/apache/pinot/spark/utils/PinotSparkJobPreparationHelper.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/utils/PinotSparkJobPreparationHelper.java similarity index 100% rename from pinot-batch-ingestion/pinot-spark/src/main/java/org/apache/pinot/spark/utils/PinotSparkJobPreparationHelper.java rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/utils/PinotSparkJobPreparationHelper.java diff --git a/pinot-batch-ingestion/pom.xml b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pom.xml similarity index 91% rename from pinot-batch-ingestion/pom.xml rename to pinot-plugins/pinot-batch-ingestion/v0_deprecated/pom.xml index bb9bbce..7a04c8b 100644 --- a/pinot-batch-ingestion/pom.xml +++ b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pom.xml @@ -24,24 +24,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>pinot</artifactId> + <artifactId>pinot-batch-ingestion</artifactId> <groupId>org.apache.pinot</groupId> <version>0.3.0-SNAPSHOT</version> </parent> - <artifactId>pinot-batch-ingestion</artifactId> + <artifactId>v0_deprecated</artifactId> <packaging>pom</packaging> <name>Pinot Batch Ingestion</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/..</pinot.root> + <pinot.root>${basedir}/../../..</pinot.root> </properties> <modules> <module>pinot-ingestion-common</module> <module>pinot-hadoop</module> <module>pinot-spark</module> - <module>pinot-standalone</module> </modules> <dependencies> diff --git a/pinot-azure-filesystem/pom.xml b/pinot-plugins/pinot-file-system/pinot-adls/pom.xml similarity index 89% rename from pinot-azure-filesystem/pom.xml rename to pinot-plugins/pinot-file-system/pinot-adls/pom.xml index a128ec8..123f0e0 100644 --- a/pinot-azure-filesystem/pom.xml +++ b/pinot-plugins/pinot-file-system/pinot-adls/pom.xml @@ -23,15 +23,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>pinot</artifactId> + <artifactId>pinot-file-system</artifactId> <groupId>org.apache.pinot</groupId> <version>0.3.0-SNAPSHOT</version> </parent> - <artifactId>pinot-azure-filesystem</artifactId> - <name>Pinot Azure Filesystem</name> + <artifactId>pinot-adls</artifactId> + <groupId>org.apache.pinot.plugins</groupId> + <name>Pinot Azure Data Lake Storage</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/..</pinot.root> + <pinot.root>${basedir}/../../..</pinot.root> </properties> <dependencies> <dependency> diff --git a/pinot-azure-filesystem/src/main/java/org/apache/pinot/filesystem/AzurePinotFS.java b/pinot-plugins/pinot-file-system/pinot-adls/src/main/java/org/apache/pinot/filesystem/AzurePinotFS.java similarity index 100% rename from pinot-azure-filesystem/src/main/java/org/apache/pinot/filesystem/AzurePinotFS.java rename to pinot-plugins/pinot-file-system/pinot-adls/src/main/java/org/apache/pinot/filesystem/AzurePinotFS.java diff --git a/pinot-azure-filesystem/src/test/java/com/microsoft/azure/datalake/store/MockADLFileInputStream.java b/pinot-plugins/pinot-file-system/pinot-adls/src/test/java/com/microsoft/azure/datalake/store/MockADLFileInputStream.java similarity index 100% rename from pinot-azure-filesystem/src/test/java/com/microsoft/azure/datalake/store/MockADLFileInputStream.java rename to pinot-plugins/pinot-file-system/pinot-adls/src/test/java/com/microsoft/azure/datalake/store/MockADLFileInputStream.java diff --git a/pinot-azure-filesystem/src/test/java/org/apache/pinot/filesystem/test/AzurePinotFSTest.java b/pinot-plugins/pinot-file-system/pinot-adls/src/test/java/org/apache/pinot/filesystem/test/AzurePinotFSTest.java similarity index 100% rename from pinot-azure-filesystem/src/test/java/org/apache/pinot/filesystem/test/AzurePinotFSTest.java rename to pinot-plugins/pinot-file-system/pinot-adls/src/test/java/org/apache/pinot/filesystem/test/AzurePinotFSTest.java diff --git a/pinot-gcs-filesystem/pom.xml b/pinot-plugins/pinot-file-system/pinot-gcs/pom.xml similarity index 89% rename from pinot-gcs-filesystem/pom.xml rename to pinot-plugins/pinot-file-system/pinot-gcs/pom.xml index e96aef3..f581d27 100644 --- a/pinot-gcs-filesystem/pom.xml +++ b/pinot-plugins/pinot-file-system/pinot-gcs/pom.xml @@ -24,16 +24,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>pinot</artifactId> - <groupId>org.apache.pinot</groupId> - <version>0.3.0-SNAPSHOT</version> + <artifactId>pinot-file-system</artifactId> + <groupId>org.apache.pinot</groupId> + <version>0.3.0-SNAPSHOT</version> </parent> - <artifactId>pinot-gcs-filesystem</artifactId> - <name>Pinot GCS Filesystem</name> + <artifactId>pinot-gcs</artifactId> + <name>Pinot Google Cloud Storage</name> <url>https://pinot.apache.org</url> <properties> - <pinot.root>${basedir}/..</pinot.root> + <pinot.root>${basedir}/../../..</pinot.root> </properties> <dependencies> <dependency> @@ -73,4 +73,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/pinot-gcs-filesystem/src/main/java/org/apache/pinot/filesystem/GcsPinotFS.java b/pinot-plugins/pinot-file-system/pinot-gcs/src/main/java/org/apache/pinot/filesystem/GcsPinotFS.java similarity index 100% rename from pinot-gcs-filesystem/src/main/java/org/apache/pinot/filesystem/GcsPinotFS.java rename to pinot-plugins/pinot-file-system/pinot-gcs/src/main/java/org/apache/pinot/filesystem/GcsPinotFS.java diff --git a/pinot-hadoop-filesystem/pom.xml b/pinot-plugins/pinot-file-system/pinot-hdfs/pom.xml similarity index 95% rename from pinot-hadoop-filesystem/pom.xml rename to pinot-plugins/pinot-file-system/pinot-hdfs/pom.xml index e0bb241..c07f343 100644 --- a/pinot-hadoop-filesystem/pom.xml +++ b/pinot-plugins/pinot-file-system/pinot-hdfs/pom.xml @@ -23,15 +23,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>pinot</artifactId> + <artifactId>pinot-file-system</artifactId> <groupId>org.apache.pinot</groupId> <version>0.3.0-SNAPSHOT</version> </parent> - <artifactId>pinot-hadoop-filesystem</artifactId> + <artifactId>pinot-hdfs</artifactId> <name>Pinot Hadoop Filesystem</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/..</pinot.root> + <pinot.root>${basedir}/../../..</pinot.root> </properties> <build> <plugins> diff --git a/pinot-hadoop-filesystem/src/main/java/org/apache/pinot/filesystem/HadoopPinotFS.java b/pinot-plugins/pinot-file-system/pinot-hdfs/src/main/java/org/apache/pinot/filesystem/HadoopPinotFS.java similarity index 100% rename from pinot-hadoop-filesystem/src/main/java/org/apache/pinot/filesystem/HadoopPinotFS.java rename to pinot-plugins/pinot-file-system/pinot-hdfs/src/main/java/org/apache/pinot/filesystem/HadoopPinotFS.java diff --git a/pinot-connectors/pom.xml b/pinot-plugins/pinot-file-system/pom.xml similarity index 88% copy from pinot-connectors/pom.xml copy to pinot-plugins/pinot-file-system/pom.xml index bb65ecc..6833af5 100644 --- a/pinot-connectors/pom.xml +++ b/pinot-plugins/pinot-file-system/pom.xml @@ -24,23 +24,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>pinot</artifactId> + <artifactId>pinot-plugins</artifactId> <groupId>org.apache.pinot</groupId> <version>0.3.0-SNAPSHOT</version> </parent> - <artifactId>pinot-connectors</artifactId> + <artifactId>pinot-file-system</artifactId> <packaging>pom</packaging> - <name>Pinot Connectors</name> + <name>Pluggable Pinot file system </name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/..</pinot.root> + <pinot.root>${basedir}/../..</pinot.root> </properties> <modules> - <module>pinot-connector-kafka-base</module> - <module>pinot-connector-kafka-0.9</module> - <module>pinot-connector-kafka-2.0</module> + <module>pinot-adls</module> + <module>pinot-hdfs</module> + <module>pinot-gcs</module> </modules> <dependencies> diff --git a/pinot-record-readers/pinot-avro/pom.xml b/pinot-plugins/pinot-input-format/pinot-avro/pom.xml similarity index 96% rename from pinot-record-readers/pinot-avro/pom.xml rename to pinot-plugins/pinot-input-format/pinot-avro/pom.xml index 6ae1da5..192de75 100644 --- a/pinot-record-readers/pinot-avro/pom.xml +++ b/pinot-plugins/pinot-input-format/pinot-avro/pom.xml @@ -22,7 +22,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>pinot-record-readers</artifactId> + <artifactId>pinot-input-format</artifactId> <groupId>org.apache.pinot</groupId> <version>0.3.0-SNAPSHOT</version> </parent> @@ -32,7 +32,7 @@ <name>Pinot Avro</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/../..</pinot.root> + <pinot.root>${basedir}/../../..</pinot.root> </properties> <build> <plugins> diff --git a/pinot-record-readers/pinot-avro/src/main/java/org/apache/pinot/avro/data/readers/AvroRecordReader.java b/pinot-plugins/pinot-input-format/pinot-avro/src/main/java/org/apache/pinot/avro/data/readers/AvroRecordReader.java similarity index 100% rename from pinot-record-readers/pinot-avro/src/main/java/org/apache/pinot/avro/data/readers/AvroRecordReader.java rename to pinot-plugins/pinot-input-format/pinot-avro/src/main/java/org/apache/pinot/avro/data/readers/AvroRecordReader.java diff --git a/pinot-record-readers/pinot-avro/src/main/java/org/apache/pinot/avro/data/readers/AvroSchemaUtil.java b/pinot-plugins/pinot-input-format/pinot-avro/src/main/java/org/apache/pinot/avro/data/readers/AvroSchemaUtil.java similarity index 100% rename from pinot-record-readers/pinot-avro/src/main/java/org/apache/pinot/avro/data/readers/AvroSchemaUtil.java rename to pinot-plugins/pinot-input-format/pinot-avro/src/main/java/org/apache/pinot/avro/data/readers/AvroSchemaUtil.java diff --git a/pinot-record-readers/pinot-avro/src/main/java/org/apache/pinot/avro/data/readers/AvroUtils.java b/pinot-plugins/pinot-input-format/pinot-avro/src/main/java/org/apache/pinot/avro/data/readers/AvroUtils.java similarity index 100% rename from pinot-record-readers/pinot-avro/src/main/java/org/apache/pinot/avro/data/readers/AvroUtils.java rename to pinot-plugins/pinot-input-format/pinot-avro/src/main/java/org/apache/pinot/avro/data/readers/AvroUtils.java diff --git a/pinot-record-readers/pinot-avro/src/test/java/org/apache/pinot/avro/data/readers/AvroRecordReaderTest.java b/pinot-plugins/pinot-input-format/pinot-avro/src/test/java/org/apache/pinot/avro/data/readers/AvroRecordReaderTest.java similarity index 100% rename from pinot-record-readers/pinot-avro/src/test/java/org/apache/pinot/avro/data/readers/AvroRecordReaderTest.java rename to pinot-plugins/pinot-input-format/pinot-avro/src/test/java/org/apache/pinot/avro/data/readers/AvroRecordReaderTest.java diff --git a/pinot-record-readers/pinot-csv/pom.xml b/pinot-plugins/pinot-input-format/pinot-csv/pom.xml similarity index 96% rename from pinot-record-readers/pinot-csv/pom.xml rename to pinot-plugins/pinot-input-format/pinot-csv/pom.xml index 648babf..ed82302 100644 --- a/pinot-record-readers/pinot-csv/pom.xml +++ b/pinot-plugins/pinot-input-format/pinot-csv/pom.xml @@ -22,7 +22,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>pinot-record-readers</artifactId> + <artifactId>pinot-input-format</artifactId> <groupId>org.apache.pinot</groupId> <version>0.3.0-SNAPSHOT</version> </parent> @@ -32,7 +32,7 @@ <name>Pinot Csv</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/../..</pinot.root> + <pinot.root>${basedir}/../../..</pinot.root> </properties> <build> <plugins> diff --git a/pinot-record-readers/pinot-csv/src/main/java/org/apache/pinot/csv/data/readers/CSVRecordReader.java b/pinot-plugins/pinot-input-format/pinot-csv/src/main/java/org/apache/pinot/csv/data/readers/CSVRecordReader.java similarity index 100% rename from pinot-record-readers/pinot-csv/src/main/java/org/apache/pinot/csv/data/readers/CSVRecordReader.java rename to pinot-plugins/pinot-input-format/pinot-csv/src/main/java/org/apache/pinot/csv/data/readers/CSVRecordReader.java diff --git a/pinot-record-readers/pinot-csv/src/main/java/org/apache/pinot/csv/data/readers/CSVRecordReaderConfig.java b/pinot-plugins/pinot-input-format/pinot-csv/src/main/java/org/apache/pinot/csv/data/readers/CSVRecordReaderConfig.java similarity index 100% rename from pinot-record-readers/pinot-csv/src/main/java/org/apache/pinot/csv/data/readers/CSVRecordReaderConfig.java rename to pinot-plugins/pinot-input-format/pinot-csv/src/main/java/org/apache/pinot/csv/data/readers/CSVRecordReaderConfig.java diff --git a/pinot-record-readers/pinot-csv/src/test/java/org/apache/pinot/csv/data/readers/CSVRecordReaderTest.java b/pinot-plugins/pinot-input-format/pinot-csv/src/test/java/org/apache/pinot/csv/data/readers/CSVRecordReaderTest.java similarity index 100% rename from pinot-record-readers/pinot-csv/src/test/java/org/apache/pinot/csv/data/readers/CSVRecordReaderTest.java rename to pinot-plugins/pinot-input-format/pinot-csv/src/test/java/org/apache/pinot/csv/data/readers/CSVRecordReaderTest.java diff --git a/pinot-record-readers/pinot-json/pom.xml b/pinot-plugins/pinot-input-format/pinot-json/pom.xml similarity index 96% rename from pinot-record-readers/pinot-json/pom.xml rename to pinot-plugins/pinot-input-format/pinot-json/pom.xml index 2e822fa..42c2f98 100644 --- a/pinot-record-readers/pinot-json/pom.xml +++ b/pinot-plugins/pinot-input-format/pinot-json/pom.xml @@ -22,7 +22,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>pinot-record-readers</artifactId> + <artifactId>pinot-input-format</artifactId> <groupId>org.apache.pinot</groupId> <version>0.3.0-SNAPSHOT</version> </parent> @@ -32,7 +32,7 @@ <name>Pinot JSON</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/../..</pinot.root> + <pinot.root>${basedir}/../../..</pinot.root> </properties> <build> <plugins> diff --git a/pinot-record-readers/pinot-json/src/main/java/org/apache/pinot/json/data/readers/JSONRecordReader.java b/pinot-plugins/pinot-input-format/pinot-json/src/main/java/org/apache/pinot/json/data/readers/JSONRecordReader.java similarity index 100% rename from pinot-record-readers/pinot-json/src/main/java/org/apache/pinot/json/data/readers/JSONRecordReader.java rename to pinot-plugins/pinot-input-format/pinot-json/src/main/java/org/apache/pinot/json/data/readers/JSONRecordReader.java diff --git a/pinot-record-readers/pinot-json/src/test/java/org/apache/pinot/json/data/readers/JSONRecordReaderTest.java b/pinot-plugins/pinot-input-format/pinot-json/src/test/java/org/apache/pinot/json/data/readers/JSONRecordReaderTest.java similarity index 100% rename from pinot-record-readers/pinot-json/src/test/java/org/apache/pinot/json/data/readers/JSONRecordReaderTest.java rename to pinot-plugins/pinot-input-format/pinot-json/src/test/java/org/apache/pinot/json/data/readers/JSONRecordReaderTest.java diff --git a/pinot-record-readers/pinot-orc/pom.xml b/pinot-plugins/pinot-input-format/pinot-orc/pom.xml similarity index 96% rename from pinot-record-readers/pinot-orc/pom.xml rename to pinot-plugins/pinot-input-format/pinot-orc/pom.xml index a7c4a4d..998f928 100644 --- a/pinot-record-readers/pinot-orc/pom.xml +++ b/pinot-plugins/pinot-input-format/pinot-orc/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>pinot-record-readers</artifactId> + <artifactId>pinot-input-format</artifactId> <groupId>org.apache.pinot</groupId> <version>0.3.0-SNAPSHOT</version> </parent> @@ -33,7 +33,7 @@ <name>Pinot ORC</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/../..</pinot.root> + <pinot.root>${basedir}/../../..</pinot.root> </properties> <build> <plugins> diff --git a/pinot-record-readers/pinot-orc/src/main/java/org/apache/pinot/orc/data/readers/ORCRecordReader.java b/pinot-plugins/pinot-input-format/pinot-orc/src/main/java/org/apache/pinot/orc/data/readers/ORCRecordReader.java similarity index 100% rename from pinot-record-readers/pinot-orc/src/main/java/org/apache/pinot/orc/data/readers/ORCRecordReader.java rename to pinot-plugins/pinot-input-format/pinot-orc/src/main/java/org/apache/pinot/orc/data/readers/ORCRecordReader.java diff --git a/pinot-record-readers/pinot-orc/src/test/java/org/apache/pinot/orc/data/readers/ORCRecordReaderTest.java b/pinot-plugins/pinot-input-format/pinot-orc/src/test/java/org/apache/pinot/orc/data/readers/ORCRecordReaderTest.java similarity index 100% rename from pinot-record-readers/pinot-orc/src/test/java/org/apache/pinot/orc/data/readers/ORCRecordReaderTest.java rename to pinot-plugins/pinot-input-format/pinot-orc/src/test/java/org/apache/pinot/orc/data/readers/ORCRecordReaderTest.java diff --git a/pinot-record-readers/pinot-parquet/pom.xml b/pinot-plugins/pinot-input-format/pinot-parquet/pom.xml similarity index 97% rename from pinot-record-readers/pinot-parquet/pom.xml rename to pinot-plugins/pinot-input-format/pinot-parquet/pom.xml index a47014f..4e140ef 100644 --- a/pinot-record-readers/pinot-parquet/pom.xml +++ b/pinot-plugins/pinot-input-format/pinot-parquet/pom.xml @@ -22,7 +22,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>pinot-record-readers</artifactId> + <artifactId>pinot-input-format</artifactId> <groupId>org.apache.pinot</groupId> <version>0.3.0-SNAPSHOT</version> </parent> @@ -32,7 +32,7 @@ <name>Pinot Parquet</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/../..</pinot.root> + <pinot.root>${basedir}/../../..</pinot.root> </properties> <build> <plugins> diff --git a/pinot-record-readers/pinot-parquet/src/main/java/org/apache/pinot/parquet/data/readers/ParquetRecordReader.java b/pinot-plugins/pinot-input-format/pinot-parquet/src/main/java/org/apache/pinot/parquet/data/readers/ParquetRecordReader.java similarity index 100% rename from pinot-record-readers/pinot-parquet/src/main/java/org/apache/pinot/parquet/data/readers/ParquetRecordReader.java rename to pinot-plugins/pinot-input-format/pinot-parquet/src/main/java/org/apache/pinot/parquet/data/readers/ParquetRecordReader.java diff --git a/pinot-record-readers/pinot-parquet/src/main/java/org/apache/pinot/parquet/data/readers/ParquetUtils.java b/pinot-plugins/pinot-input-format/pinot-parquet/src/main/java/org/apache/pinot/parquet/data/readers/ParquetUtils.java similarity index 100% rename from pinot-record-readers/pinot-parquet/src/main/java/org/apache/pinot/parquet/data/readers/ParquetUtils.java rename to pinot-plugins/pinot-input-format/pinot-parquet/src/main/java/org/apache/pinot/parquet/data/readers/ParquetUtils.java diff --git a/pinot-record-readers/pinot-parquet/src/test/java/org/apache/pinot/parquet/data/readers/ParquetRecordReaderTest.java b/pinot-plugins/pinot-input-format/pinot-parquet/src/test/java/org/apache/pinot/parquet/data/readers/ParquetRecordReaderTest.java similarity index 100% rename from pinot-record-readers/pinot-parquet/src/test/java/org/apache/pinot/parquet/data/readers/ParquetRecordReaderTest.java rename to pinot-plugins/pinot-input-format/pinot-parquet/src/test/java/org/apache/pinot/parquet/data/readers/ParquetRecordReaderTest.java diff --git a/pinot-record-readers/pinot-thrift/pom.xml b/pinot-plugins/pinot-input-format/pinot-thrift/pom.xml similarity index 96% rename from pinot-record-readers/pinot-thrift/pom.xml rename to pinot-plugins/pinot-input-format/pinot-thrift/pom.xml index 12be925..b6607b4 100644 --- a/pinot-record-readers/pinot-thrift/pom.xml +++ b/pinot-plugins/pinot-input-format/pinot-thrift/pom.xml @@ -22,7 +22,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>pinot-record-readers</artifactId> + <artifactId>pinot-input-format</artifactId> <groupId>org.apache.pinot</groupId> <version>0.3.0-SNAPSHOT</version> </parent> @@ -32,7 +32,7 @@ <name>Pinot Thrift</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/../..</pinot.root> + <pinot.root>${basedir}/../../..</pinot.root> </properties> <build> <plugins> diff --git a/pinot-record-readers/pinot-thrift/src/main/java/org/apache/pinot/thrift/data/readers/ThriftRecordReader.java b/pinot-plugins/pinot-input-format/pinot-thrift/src/main/java/org/apache/pinot/thrift/data/readers/ThriftRecordReader.java similarity index 100% rename from pinot-record-readers/pinot-thrift/src/main/java/org/apache/pinot/thrift/data/readers/ThriftRecordReader.java rename to pinot-plugins/pinot-input-format/pinot-thrift/src/main/java/org/apache/pinot/thrift/data/readers/ThriftRecordReader.java diff --git a/pinot-record-readers/pinot-thrift/src/main/java/org/apache/pinot/thrift/data/readers/ThriftRecordReaderConfig.java b/pinot-plugins/pinot-input-format/pinot-thrift/src/main/java/org/apache/pinot/thrift/data/readers/ThriftRecordReaderConfig.java similarity index 100% rename from pinot-record-readers/pinot-thrift/src/main/java/org/apache/pinot/thrift/data/readers/ThriftRecordReaderConfig.java rename to pinot-plugins/pinot-input-format/pinot-thrift/src/main/java/org/apache/pinot/thrift/data/readers/ThriftRecordReaderConfig.java diff --git a/pinot-record-readers/pinot-thrift/src/test/java/org/apache/pinot/thrift/data/readers/ThriftRecordReaderTest.java b/pinot-plugins/pinot-input-format/pinot-thrift/src/test/java/org/apache/pinot/thrift/data/readers/ThriftRecordReaderTest.java similarity index 100% rename from pinot-record-readers/pinot-thrift/src/test/java/org/apache/pinot/thrift/data/readers/ThriftRecordReaderTest.java rename to pinot-plugins/pinot-input-format/pinot-thrift/src/test/java/org/apache/pinot/thrift/data/readers/ThriftRecordReaderTest.java diff --git a/pinot-record-readers/pinot-thrift/src/test/java/org/apache/pinot/thrift/data/readers/ThriftSampleData.java b/pinot-plugins/pinot-input-format/pinot-thrift/src/test/java/org/apache/pinot/thrift/data/readers/ThriftSampleData.java similarity index 100% rename from pinot-record-readers/pinot-thrift/src/test/java/org/apache/pinot/thrift/data/readers/ThriftSampleData.java rename to pinot-plugins/pinot-input-format/pinot-thrift/src/test/java/org/apache/pinot/thrift/data/readers/ThriftSampleData.java diff --git a/pinot-record-readers/pom.xml b/pinot-plugins/pinot-input-format/pom.xml similarity index 91% copy from pinot-record-readers/pom.xml copy to pinot-plugins/pinot-input-format/pom.xml index 96c9578..4e69b5b 100644 --- a/pinot-record-readers/pom.xml +++ b/pinot-plugins/pinot-input-format/pom.xml @@ -24,17 +24,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>pinot</artifactId> + <artifactId>pinot-plugins</artifactId> <groupId>org.apache.pinot</groupId> <version>0.3.0-SNAPSHOT</version> </parent> - <artifactId>pinot-record-readers</artifactId> + <artifactId>pinot-input-format</artifactId> <packaging>pom</packaging> - <name>Pinot Record Readers</name> + <name>Pinot Input Format </name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/..</pinot.root> + <pinot.root>${basedir}/../..</pinot.root> </properties> <modules> diff --git a/pinot-connectors/README.md b/pinot-plugins/pinot-stream-ingestion/README.md similarity index 100% rename from pinot-connectors/README.md rename to pinot-plugins/pinot-stream-ingestion/README.md diff --git a/pinot-connectors/pinot-connector-kafka-0.9/README.md b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/README.md similarity index 100% rename from pinot-connectors/pinot-connector-kafka-0.9/README.md rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/README.md diff --git a/pinot-connectors/pinot-connector-kafka-0.9/pom.xml b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/pom.xml similarity index 89% rename from pinot-connectors/pinot-connector-kafka-0.9/pom.xml rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/pom.xml index 18f39ae..906dee2 100644 --- a/pinot-connectors/pinot-connector-kafka-0.9/pom.xml +++ b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/pom.xml @@ -23,17 +23,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>pinot-connectors</artifactId> + <artifactId>pinot-stream-ingestion</artifactId> <groupId>org.apache.pinot</groupId> <version>0.3.0-SNAPSHOT</version> - <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>pinot-connector-kafka-0.9</artifactId> - <name>Pinot Connector Kafka 0.9</name> + <artifactId>pinot-kafka-0.9</artifactId> + <name>Pinot Kafka 0.9</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/../..</pinot.root> + <pinot.root>${basedir}/../../..</pinot.root> <kafka.lib.version>0.9.0.1</kafka.lib.version> <kafka.scala.version>2.10</kafka.scala.version> </properties> @@ -41,7 +40,7 @@ <dependencies> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-connector-kafka-base</artifactId> + <artifactId>pinot-kafka-base</artifactId> <version>${project.version}</version> </dependency> <!-- Kafka --> diff --git a/pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/ConsumerAndIterator.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/ConsumerAndIterator.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/ConsumerAndIterator.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/ConsumerAndIterator.java diff --git a/pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaBrokerWrapper.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaBrokerWrapper.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaBrokerWrapper.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaBrokerWrapper.java diff --git a/pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaConnectionHandler.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaConnectionHandler.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaConnectionHandler.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaConnectionHandler.java diff --git a/pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaConsumerFactory.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaConsumerFactory.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaConsumerFactory.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaConsumerFactory.java diff --git a/pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaConsumerManager.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaConsumerManager.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaConsumerManager.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaConsumerManager.java diff --git a/pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaHighLevelStreamConfig.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaHighLevelStreamConfig.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaHighLevelStreamConfig.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaHighLevelStreamConfig.java diff --git a/pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaLowLevelStreamConfig.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaLowLevelStreamConfig.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaLowLevelStreamConfig.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaLowLevelStreamConfig.java diff --git a/pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaPartitionLevelConsumer.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaPartitionLevelConsumer.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaPartitionLevelConsumer.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaPartitionLevelConsumer.java diff --git a/pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaSimpleConsumerFactory.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaSimpleConsumerFactory.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaSimpleConsumerFactory.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaSimpleConsumerFactory.java diff --git a/pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaSimpleConsumerFactoryImpl.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaSimpleConsumerFactoryImpl.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaSimpleConsumerFactoryImpl.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaSimpleConsumerFactoryImpl.java diff --git a/pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaStreamLevelConsumer.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaStreamLevelConsumer.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaStreamLevelConsumer.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaStreamLevelConsumer.java diff --git a/pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaStreamMetadataProvider.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaStreamMetadataProvider.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaStreamMetadataProvider.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaStreamMetadataProvider.java diff --git a/pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/SimpleConsumerFactory.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/SimpleConsumerFactory.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/SimpleConsumerFactory.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/SimpleConsumerFactory.java diff --git a/pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/SimpleConsumerMessageBatch.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/SimpleConsumerMessageBatch.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/SimpleConsumerMessageBatch.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/SimpleConsumerMessageBatch.java diff --git a/pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/server/KafkaDataProducer.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/server/KafkaDataProducer.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/server/KafkaDataProducer.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/server/KafkaDataProducer.java diff --git a/pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/server/KafkaDataServerStartable.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/server/KafkaDataServerStartable.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/server/KafkaDataServerStartable.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/server/KafkaDataServerStartable.java diff --git a/pinot-connectors/pinot-connector-kafka-0.9/src/main/resources/META-INF/services/org.apache.pinot.spi.stream.StreamConsumerFactory b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/resources/META-INF/services/org.apache.pinot.spi.stream.StreamConsumerFactory similarity index 100% rename from pinot-connectors/pinot-connector-kafka-0.9/src/main/resources/META-INF/services/org.apache.pinot.spi.stream.StreamConsumerFactory rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/resources/META-INF/services/org.apache.pinot.spi.stream.StreamConsumerFactory diff --git a/pinot-connectors/pinot-connector-kafka-0.9/src/test/java/org/apache/pinot/core/realtime/impl/kafka/KafkaLowLevelStreamConfigTest.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/test/java/org/apache/pinot/core/realtime/impl/kafka/KafkaLowLevelStreamConfigTest.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-0.9/src/test/java/org/apache/pinot/core/realtime/impl/kafka/KafkaLowLevelStreamConfigTest.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/test/java/org/apache/pinot/core/realtime/impl/kafka/KafkaLowLevelStreamConfigTest.java diff --git a/pinot-connectors/pinot-connector-kafka-0.9/src/test/java/org/apache/pinot/core/realtime/impl/kafka/KafkaPartitionLevelConsumerTest.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/test/java/org/apache/pinot/core/realtime/impl/kafka/KafkaPartitionLevelConsumerTest.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-0.9/src/test/java/org/apache/pinot/core/realtime/impl/kafka/KafkaPartitionLevelConsumerTest.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/test/java/org/apache/pinot/core/realtime/impl/kafka/KafkaPartitionLevelConsumerTest.java diff --git a/pinot-connectors/pinot-connector-kafka-2.0/README.md b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/README.md similarity index 100% rename from pinot-connectors/pinot-connector-kafka-2.0/README.md rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/README.md diff --git a/pinot-connectors/pinot-connector-kafka-2.0/pom.xml b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/pom.xml similarity index 91% rename from pinot-connectors/pinot-connector-kafka-2.0/pom.xml rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/pom.xml index 56d86f8..a484b3a 100644 --- a/pinot-connectors/pinot-connector-kafka-2.0/pom.xml +++ b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/pom.xml @@ -23,24 +23,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>pinot-connectors</artifactId> + <artifactId>pinot-stream-ingestion</artifactId> <groupId>org.apache.pinot</groupId> <version>0.3.0-SNAPSHOT</version> - <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>pinot-connector-kafka-2.0</artifactId> - <name>Pinot Connector Kafka 2.0</name> + <artifactId>pinot-kafka-2.0</artifactId> + <name>Pinot Kafka 2.0</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/../..</pinot.root> + <pinot.root>${basedir}/../../..</pinot.root> <kafka.lib.version>2.0.0</kafka.lib.version> </properties> <dependencies> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-connector-kafka-base</artifactId> + <artifactId>pinot-kafka-base</artifactId> <version>${project.version}</version> </dependency> <!-- Kafka --> diff --git a/pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaConsumerFactory.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaConsumerFactory.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaConsumerFactory.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaConsumerFactory.java diff --git a/pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaMessageBatch.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaMessageBatch.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaMessageBatch.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaMessageBatch.java diff --git a/pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelConnectionHandler.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelConnectionHandler.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelConnectionHandler.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelConnectionHandler.java diff --git a/pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelConsumer.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelConsumer.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelConsumer.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelConsumer.java diff --git a/pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelStreamConfig.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelStreamConfig.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelStreamConfig.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelStreamConfig.java diff --git a/pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaStreamLevelConsumer.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaStreamLevelConsumer.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaStreamLevelConsumer.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaStreamLevelConsumer.java diff --git a/pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaStreamLevelConsumerManager.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaStreamLevelConsumerManager.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaStreamLevelConsumerManager.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaStreamLevelConsumerManager.java diff --git a/pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaStreamLevelStreamConfig.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaStreamLevelStreamConfig.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaStreamLevelStreamConfig.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaStreamLevelStreamConfig.java diff --git a/pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaStreamMetadataProvider.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaStreamMetadataProvider.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaStreamMetadataProvider.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaStreamMetadataProvider.java diff --git a/pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/server/KafkaDataProducer.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/server/KafkaDataProducer.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/server/KafkaDataProducer.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/server/KafkaDataProducer.java diff --git a/pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/server/KafkaDataServerStartable.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/server/KafkaDataServerStartable.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/server/KafkaDataServerStartable.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/server/KafkaDataServerStartable.java diff --git a/pinot-connectors/pinot-connector-kafka-2.0/src/main/resources/META-INF/services/org.apache.pinot.spi.stream.StreamConsumerFactory b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/resources/META-INF/services/org.apache.pinot.spi.stream.StreamConsumerFactory similarity index 100% rename from pinot-connectors/pinot-connector-kafka-2.0/src/main/resources/META-INF/services/org.apache.pinot.spi.stream.StreamConsumerFactory rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/resources/META-INF/services/org.apache.pinot.spi.stream.StreamConsumerFactory diff --git a/pinot-connectors/pinot-connector-kafka-2.0/src/test/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelConsumerTest.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/test/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelConsumerTest.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-2.0/src/test/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelConsumerTest.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/test/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelConsumerTest.java diff --git a/pinot-connectors/pinot-connector-kafka-2.0/src/test/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelStreamConfigTest.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/test/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelStreamConfigTest.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-2.0/src/test/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelStreamConfigTest.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/test/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelStreamConfigTest.java diff --git a/pinot-connectors/pinot-connector-kafka-2.0/src/test/java/org/apache/pinot/core/realtime/impl/kafka2/utils/EmbeddedZooKeeper.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/test/java/org/apache/pinot/core/realtime/impl/kafka2/utils/EmbeddedZooKeeper.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-2.0/src/test/java/org/apache/pinot/core/realtime/impl/kafka2/utils/EmbeddedZooKeeper.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/test/java/org/apache/pinot/core/realtime/impl/kafka2/utils/EmbeddedZooKeeper.java diff --git a/pinot-connectors/pinot-connector-kafka-2.0/src/test/java/org/apache/pinot/core/realtime/impl/kafka2/utils/MiniKafkaCluster.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/test/java/org/apache/pinot/core/realtime/impl/kafka2/utils/MiniKafkaCluster.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-2.0/src/test/java/org/apache/pinot/core/realtime/impl/kafka2/utils/MiniKafkaCluster.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/test/java/org/apache/pinot/core/realtime/impl/kafka2/utils/MiniKafkaCluster.java diff --git a/pinot-connectors/pinot-connector-kafka-base/README.md b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/README.md similarity index 100% rename from pinot-connectors/pinot-connector-kafka-base/README.md rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/README.md diff --git a/pinot-connectors/pinot-connector-kafka-base/pom.xml b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/pom.xml similarity index 88% rename from pinot-connectors/pinot-connector-kafka-base/pom.xml rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/pom.xml index 8b2041a..094a290 100644 --- a/pinot-connectors/pinot-connector-kafka-base/pom.xml +++ b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/pom.xml @@ -23,17 +23,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>pinot-connectors</artifactId> + <artifactId>pinot-stream-ingestion</artifactId> <groupId>org.apache.pinot</groupId> <version>0.3.0-SNAPSHOT</version> - <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>pinot-connector-kafka-base</artifactId> - <name>Pinot Connector Kafka Base</name> + <artifactId>pinot-kafka-base</artifactId> + <name>Pinot Kafka Base</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/../..</pinot.root> + <pinot.root>${basedir}/../../..</pinot.root> </properties> <dependencies> diff --git a/pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaAvroMessageDecoder.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaAvroMessageDecoder.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaAvroMessageDecoder.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaAvroMessageDecoder.java diff --git a/pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaJSONMessageDecoder.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaJSONMessageDecoder.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaJSONMessageDecoder.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaJSONMessageDecoder.java diff --git a/pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaStarterUtils.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaStarterUtils.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaStarterUtils.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaStarterUtils.java diff --git a/pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaStreamConfigProperties.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaStreamConfigProperties.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaStreamConfigProperties.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaStreamConfigProperties.java diff --git a/pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/MessageAndOffset.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/MessageAndOffset.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/MessageAndOffset.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/MessageAndOffset.java diff --git a/pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/stream/AvroRecordToPinotRowGenerator.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/main/java/org/apache/pinot/core/realtime/stream/AvroRecordToPinotRowGenerator.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/stream/AvroRecordToPinotRowGenerator.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/main/java/org/apache/pinot/core/realtime/stream/AvroRecordToPinotRowGenerator.java diff --git a/pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/stream/SimpleAvroMessageDecoder.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/main/java/org/apache/pinot/core/realtime/stream/SimpleAvroMessageDecoder.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/stream/SimpleAvroMessageDecoder.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/main/java/org/apache/pinot/core/realtime/stream/SimpleAvroMessageDecoder.java diff --git a/pinot-connectors/pinot-connector-kafka-base/src/test/java/org/apache/pinot/core/realtime/impl/kafka/KafkaJSONMessageDecoderTest.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/test/java/org/apache/pinot/core/realtime/impl/kafka/KafkaJSONMessageDecoderTest.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-base/src/test/java/org/apache/pinot/core/realtime/impl/kafka/KafkaJSONMessageDecoderTest.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/test/java/org/apache/pinot/core/realtime/impl/kafka/KafkaJSONMessageDecoderTest.java diff --git a/pinot-connectors/pinot-connector-kafka-base/src/test/java/org/apache/pinot/core/realtime/stream/AvroRecordToPinotRowGeneratorTest.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/test/java/org/apache/pinot/core/realtime/stream/AvroRecordToPinotRowGeneratorTest.java similarity index 100% rename from pinot-connectors/pinot-connector-kafka-base/src/test/java/org/apache/pinot/core/realtime/stream/AvroRecordToPinotRowGeneratorTest.java rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/test/java/org/apache/pinot/core/realtime/stream/AvroRecordToPinotRowGeneratorTest.java diff --git a/pinot-connectors/pinot-connector-kafka-base/src/test/resources/data/test_sample_data.json b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/test/resources/data/test_sample_data.json similarity index 100% rename from pinot-connectors/pinot-connector-kafka-base/src/test/resources/data/test_sample_data.json rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/test/resources/data/test_sample_data.json diff --git a/pinot-connectors/pinot-connector-kafka-base/src/test/resources/data/test_sample_data_schema_no_time_field.json b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/test/resources/data/test_sample_data_schema_no_time_field.json similarity index 100% rename from pinot-connectors/pinot-connector-kafka-base/src/test/resources/data/test_sample_data_schema_no_time_field.json rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/test/resources/data/test_sample_data_schema_no_time_field.json diff --git a/pinot-connectors/pinot-connector-kafka-base/src/test/resources/data/test_sample_data_schema_with_outgoing_time_spec.json b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/test/resources/data/test_sample_data_schema_with_outgoing_time_spec.json similarity index 100% rename from pinot-connectors/pinot-connector-kafka-base/src/test/resources/data/test_sample_data_schema_with_outgoing_time_spec.json rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/test/resources/data/test_sample_data_schema_with_outgoing_time_spec.json diff --git a/pinot-connectors/pinot-connector-kafka-base/src/test/resources/data/test_sample_data_schema_without_outgoing_time_spec.json b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/test/resources/data/test_sample_data_schema_without_outgoing_time_spec.json similarity index 100% rename from pinot-connectors/pinot-connector-kafka-base/src/test/resources/data/test_sample_data_schema_without_outgoing_time_spec.json rename to pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/src/test/resources/data/test_sample_data_schema_without_outgoing_time_spec.json diff --git a/pinot-connectors/pom.xml b/pinot-plugins/pinot-stream-ingestion/pom.xml similarity index 88% rename from pinot-connectors/pom.xml rename to pinot-plugins/pinot-stream-ingestion/pom.xml index bb65ecc..6069a6d 100644 --- a/pinot-connectors/pom.xml +++ b/pinot-plugins/pinot-stream-ingestion/pom.xml @@ -24,23 +24,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>pinot</artifactId> + <artifactId>pinot-plugins</artifactId> <groupId>org.apache.pinot</groupId> <version>0.3.0-SNAPSHOT</version> </parent> - - <artifactId>pinot-connectors</artifactId> + <artifactId>pinot-stream-ingestion</artifactId> <packaging>pom</packaging> - <name>Pinot Connectors</name> + <name>Pinot Stream Ingestion</name> <url>https://pinot.apache.org/</url> <properties> - <pinot.root>${basedir}/..</pinot.root> + <pinot.root>${basedir}/../..</pinot.root> </properties> <modules> - <module>pinot-connector-kafka-base</module> - <module>pinot-connector-kafka-0.9</module> - <module>pinot-connector-kafka-2.0</module> + <module>pinot-kafka-base</module> + <module>pinot-kafka-0.9</module> + <module>pinot-kafka-2.0</module> </modules> <dependencies> diff --git a/pinot-record-readers/pom.xml b/pinot-plugins/pom.xml similarity index 86% rename from pinot-record-readers/pom.xml rename to pinot-plugins/pom.xml index 96c9578..c97e6e7 100644 --- a/pinot-record-readers/pom.xml +++ b/pinot-plugins/pom.xml @@ -28,22 +28,19 @@ <groupId>org.apache.pinot</groupId> <version>0.3.0-SNAPSHOT</version> </parent> - - <artifactId>pinot-record-readers</artifactId> + <artifactId>pinot-plugins</artifactId> <packaging>pom</packaging> - <name>Pinot Record Readers</name> + <name>Pinot Plugins</name> <url>https://pinot.apache.org/</url> <properties> <pinot.root>${basedir}/..</pinot.root> </properties> <modules> - <module>pinot-avro</module> - <module>pinot-orc</module> - <module>pinot-json</module> - <module>pinot-parquet</module> - <module>pinot-csv</module> - <module>pinot-thrift</module> + <module>pinot-input-format</module> + <module>pinot-file-system</module> + <module>pinot-batch-ingestion</module> + <module>pinot-stream-ingestion</module> </modules> <dependencies> diff --git a/pinot-tools/pom.xml b/pinot-tools/pom.xml index 2ac3394..f10e1fc 100644 --- a/pinot-tools/pom.xml +++ b/pinot-tools/pom.xml @@ -71,12 +71,12 @@ </dependency> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-connector-kafka-base</artifactId> + <artifactId>pinot-kafka-base</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.pinot</groupId> - <artifactId>pinot-connector-kafka-${kafka.version}</artifactId> + <artifactId>pinot-kafka-${kafka.version}</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> diff --git a/pom.xml b/pom.xml index cc3a238..1eaffe9 100644 --- a/pom.xml +++ b/pom.xml @@ -45,17 +45,12 @@ <module>pinot-server</module> <module>pinot-core</module> <module>pinot-controller</module> - <module>pinot-batch-ingestion</module> + <module>pinot-minion</module> + <module>pinot-plugins</module> <module>pinot-tools</module> <module>pinot-perf</module> <module>pinot-integration-tests</module> <module>pinot-distribution</module> - <module>pinot-minion</module> - <module>pinot-hadoop-filesystem</module> - <module>pinot-azure-filesystem</module> - <module>pinot-record-readers</module> - <module>pinot-connectors</module> - <module>pinot-gcs-filesystem</module> </modules> <licenses> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
