This is an automated email from the ASF dual-hosted git repository. kishoreg pushed a commit to branch extract-pinot-fs-to-spi in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit e7130466f6ededbaf88c36f9c9a424816021d001 Author: kishoreg <[email protected]> AuthorDate: Sat Nov 30 11:46:23 2019 -0800 Pushing PinotFS to pinot-spi --- .../java/org/apache/pinot/filesystem/AzurePinotFS.java | 1 + .../java/org/apache/pinot/broker/api/AccessControl.java | 4 ++-- .../pinot/broker/broker/helix/ClusterChangeHandler.java | 4 ++-- .../org/apache/pinot/common/metadata/RowMetadata.java | 4 ++-- .../common/segment/fetcher/PinotFSSegmentFetcher.java | 2 +- .../java/org/apache/pinot/filesystem/LocalPinotFS.java | 1 + .../java/org/apache/pinot/filesystem/PinotFSFactory.java | 1 + .../org/apache/pinot/filesystem/PinotFSFactoryTest.java | 1 + .../pinot/controller/api/access/AccessControl.java | 4 ++-- .../controller/api/access/AccessControlFactory.java | 4 ++-- .../controller/api/resources/FileUploadPathProvider.java | 2 +- .../api/resources/LLCSegmentCompletionHandlers.java | 2 +- .../PinotSegmentUploadDownloadRestletResource.java | 2 +- .../apache/pinot/controller/api/upload/ZKOperator.java | 2 +- .../controller/helix/core/SegmentDeletionManager.java | 2 +- .../core/realtime/PinotLLCRealtimeSegmentManager.java | 2 +- .../org/apache/pinot/core/indexsegment/IndexSegment.java | 2 +- .../apache/pinot/core/realtime/stream/MessageBatch.java | 4 ++-- .../core/realtime/stream/PartitionLevelConsumer.java | 4 ++-- .../pinot/core/realtime/stream/StreamLevelConsumer.java | 4 ++-- .../pinot/core/realtime/stream/StreamMessageDecoder.java | 4 ++-- .../core/realtime/stream/StreamMetadataProvider.java | 4 ++-- .../java/org/apache/pinot/filesystem/HadoopPinotFS.java | 1 + pinot-spi/pom.xml | 14 ++++++++++++++ .../apache/pinot/spi}/annotations/InterfaceAudience.java | 16 ++++++++-------- .../pinot/spi}/annotations/InterfaceStability.java | 12 ++++++------ .../java/org/apache/pinot/spi}/filesystem/PinotFS.java | 6 +++--- 27 files changed, 64 insertions(+), 45 deletions(-) diff --git a/pinot-azure-filesystem/src/main/java/org/apache/pinot/filesystem/AzurePinotFS.java b/pinot-azure-filesystem/src/main/java/org/apache/pinot/filesystem/AzurePinotFS.java index 0f07f67..9b4d7be 100644 --- a/pinot-azure-filesystem/src/main/java/org/apache/pinot/filesystem/AzurePinotFS.java +++ b/pinot-azure-filesystem/src/main/java/org/apache/pinot/filesystem/AzurePinotFS.java @@ -42,6 +42,7 @@ import org.apache.commons.configuration.Configuration; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.pinot.common.utils.CommonConstants; +import org.apache.pinot.spi.filesystem.PinotFS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/api/AccessControl.java b/pinot-broker/src/main/java/org/apache/pinot/broker/api/AccessControl.java index 86b6551..8d3787e 100644 --- a/pinot-broker/src/main/java/org/apache/pinot/broker/api/AccessControl.java +++ b/pinot-broker/src/main/java/org/apache/pinot/broker/api/AccessControl.java @@ -18,8 +18,8 @@ */ package org.apache.pinot.broker.api; -import org.apache.pinot.annotations.InterfaceAudience; -import org.apache.pinot.annotations.InterfaceStability; +import org.apache.pinot.spi.annotations.InterfaceAudience; +import org.apache.pinot.spi.annotations.InterfaceStability; import org.apache.pinot.common.request.BrokerRequest; diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/ClusterChangeHandler.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/ClusterChangeHandler.java index 9d335a6..fff67be 100644 --- a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/ClusterChangeHandler.java +++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/ClusterChangeHandler.java @@ -20,8 +20,8 @@ package org.apache.pinot.broker.broker.helix; import org.apache.helix.HelixConstants; import org.apache.helix.HelixManager; -import org.apache.pinot.annotations.InterfaceAudience; -import org.apache.pinot.annotations.InterfaceStability; +import org.apache.pinot.spi.annotations.InterfaceAudience; +import org.apache.pinot.spi.annotations.InterfaceStability; /** diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metadata/RowMetadata.java b/pinot-common/src/main/java/org/apache/pinot/common/metadata/RowMetadata.java index 63be9f1..7c25db0 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/metadata/RowMetadata.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/metadata/RowMetadata.java @@ -18,8 +18,8 @@ */ package org.apache.pinot.common.metadata; -import org.apache.pinot.annotations.InterfaceAudience; -import org.apache.pinot.annotations.InterfaceStability; +import org.apache.pinot.spi.annotations.InterfaceAudience; +import org.apache.pinot.spi.annotations.InterfaceStability; /** diff --git a/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/PinotFSSegmentFetcher.java b/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/PinotFSSegmentFetcher.java index 8b099e9..99c4fd1 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/PinotFSSegmentFetcher.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/segment/fetcher/PinotFSSegmentFetcher.java @@ -23,7 +23,7 @@ import java.net.URI; import java.util.Collections; import java.util.Set; import org.apache.commons.configuration.Configuration; -import org.apache.pinot.filesystem.PinotFS; +import org.apache.pinot.spi.filesystem.PinotFS; import org.apache.pinot.filesystem.PinotFSFactory; diff --git a/pinot-common/src/main/java/org/apache/pinot/filesystem/LocalPinotFS.java b/pinot-common/src/main/java/org/apache/pinot/filesystem/LocalPinotFS.java index 4a6e263..ba0a025 100644 --- a/pinot-common/src/main/java/org/apache/pinot/filesystem/LocalPinotFS.java +++ b/pinot-common/src/main/java/org/apache/pinot/filesystem/LocalPinotFS.java @@ -28,6 +28,7 @@ import java.util.Arrays; import org.apache.commons.configuration.Configuration; import org.apache.commons.io.FileUtils; import org.apache.pinot.common.utils.URIUtils; +import org.apache.pinot.spi.filesystem.PinotFS; /** diff --git a/pinot-common/src/main/java/org/apache/pinot/filesystem/PinotFSFactory.java b/pinot-common/src/main/java/org/apache/pinot/filesystem/PinotFSFactory.java index 7415d34..9f0c98c 100644 --- a/pinot-common/src/main/java/org/apache/pinot/filesystem/PinotFSFactory.java +++ b/pinot-common/src/main/java/org/apache/pinot/filesystem/PinotFSFactory.java @@ -23,6 +23,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; import org.apache.commons.configuration.Configuration; +import org.apache.pinot.spi.filesystem.PinotFS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-common/src/test/java/org/apache/pinot/filesystem/PinotFSFactoryTest.java b/pinot-common/src/test/java/org/apache/pinot/filesystem/PinotFSFactoryTest.java index 803bcb8..6e83d1b 100644 --- a/pinot-common/src/test/java/org/apache/pinot/filesystem/PinotFSFactoryTest.java +++ b/pinot-common/src/test/java/org/apache/pinot/filesystem/PinotFSFactoryTest.java @@ -24,6 +24,7 @@ import java.lang.reflect.Constructor; import java.net.URI; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.pinot.spi.filesystem.PinotFS; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/AccessControl.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/AccessControl.java index 37b3f3b..4084a4f 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/AccessControl.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/AccessControl.java @@ -19,8 +19,8 @@ package org.apache.pinot.controller.api.access; import javax.ws.rs.core.HttpHeaders; -import org.apache.pinot.annotations.InterfaceAudience; -import org.apache.pinot.annotations.InterfaceStability; +import org.apache.pinot.spi.annotations.InterfaceAudience; +import org.apache.pinot.spi.annotations.InterfaceStability; @InterfaceAudience.Public diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/AccessControlFactory.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/AccessControlFactory.java index 8463666..5b3d8d0 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/AccessControlFactory.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/AccessControlFactory.java @@ -18,8 +18,8 @@ */ package org.apache.pinot.controller.api.access; -import org.apache.pinot.annotations.InterfaceAudience; -import org.apache.pinot.annotations.InterfaceStability; +import org.apache.pinot.spi.annotations.InterfaceAudience; +import org.apache.pinot.spi.annotations.InterfaceStability; @InterfaceAudience.Public diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/FileUploadPathProvider.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/FileUploadPathProvider.java index 839c3da..4bcf090 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/FileUploadPathProvider.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/FileUploadPathProvider.java @@ -26,7 +26,7 @@ import org.apache.pinot.common.utils.CommonConstants; import org.apache.pinot.controller.ControllerConf; import org.apache.pinot.common.utils.URIUtils; import org.apache.pinot.filesystem.LocalPinotFS; -import org.apache.pinot.filesystem.PinotFS; +import org.apache.pinot.spi.filesystem.PinotFS; import org.apache.pinot.filesystem.PinotFSFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/LLCSegmentCompletionHandlers.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/LLCSegmentCompletionHandlers.java index 024429d..bdfd9cb 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/LLCSegmentCompletionHandlers.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/LLCSegmentCompletionHandlers.java @@ -54,7 +54,7 @@ import org.apache.pinot.controller.helix.core.realtime.segment.CommittingSegment import org.apache.pinot.controller.util.SegmentCompletionUtils; import org.apache.pinot.core.segment.creator.impl.V1Constants; import org.apache.pinot.core.segment.index.SegmentMetadataImpl; -import org.apache.pinot.filesystem.PinotFS; +import org.apache.pinot.spi.filesystem.PinotFS; import org.apache.pinot.filesystem.PinotFSFactory; import org.glassfish.jersey.media.multipart.FormDataBodyPart; import org.glassfish.jersey.media.multipart.FormDataMultiPart; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentUploadDownloadRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentUploadDownloadRestletResource.java index 4667f8b..b7574bf 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentUploadDownloadRestletResource.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentUploadDownloadRestletResource.java @@ -75,7 +75,7 @@ import org.apache.pinot.core.crypt.PinotCrypter; import org.apache.pinot.core.crypt.PinotCrypterFactory; import org.apache.pinot.core.metadata.DefaultMetadataExtractor; import org.apache.pinot.core.metadata.MetadataExtractorFactory; -import org.apache.pinot.filesystem.PinotFS; +import org.apache.pinot.spi.filesystem.PinotFS; import org.apache.pinot.filesystem.PinotFSFactory; import org.glassfish.grizzly.http.server.Request; import org.glassfish.jersey.media.multipart.FormDataBodyPart; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/ZKOperator.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/ZKOperator.java index 6bf4d68..e9b5a42 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/ZKOperator.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/ZKOperator.java @@ -33,7 +33,7 @@ import org.apache.pinot.common.utils.FileUploadDownloadClient; import org.apache.pinot.controller.ControllerConf; import org.apache.pinot.controller.api.resources.ControllerApplicationException; import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; -import org.apache.pinot.filesystem.PinotFS; +import org.apache.pinot.spi.filesystem.PinotFS; import org.apache.pinot.filesystem.PinotFSFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java index 53bcb61..62f38c4 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java @@ -41,7 +41,7 @@ import org.apache.pinot.common.config.TableNameBuilder; import org.apache.pinot.common.metadata.ZKMetadataProvider; import org.apache.pinot.common.utils.SegmentName; import org.apache.pinot.common.utils.URIUtils; -import org.apache.pinot.filesystem.PinotFS; +import org.apache.pinot.spi.filesystem.PinotFS; import org.apache.pinot.filesystem.PinotFSFactory; import org.joda.time.DateTime; import org.slf4j.Logger; diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java index 1a654ed..e4687da 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java @@ -78,7 +78,7 @@ import org.apache.pinot.core.realtime.stream.PartitionOffsetFetcher; import org.apache.pinot.core.realtime.stream.StreamConfig; import org.apache.pinot.core.realtime.stream.StreamConfigProperties; import org.apache.pinot.core.segment.index.SegmentMetadataImpl; -import org.apache.pinot.filesystem.PinotFS; +import org.apache.pinot.spi.filesystem.PinotFS; import org.apache.pinot.filesystem.PinotFSFactory; import org.apache.zookeeper.data.Stat; import org.slf4j.Logger; diff --git a/pinot-core/src/main/java/org/apache/pinot/core/indexsegment/IndexSegment.java b/pinot-core/src/main/java/org/apache/pinot/core/indexsegment/IndexSegment.java index 9d61a04..72254af 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/indexsegment/IndexSegment.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/indexsegment/IndexSegment.java @@ -20,7 +20,7 @@ package org.apache.pinot.core.indexsegment; import java.util.List; import java.util.Set; -import org.apache.pinot.annotations.InterfaceAudience; +import org.apache.pinot.spi.annotations.InterfaceAudience; import org.apache.pinot.common.segment.SegmentMetadata; import org.apache.pinot.core.common.DataSource; import org.apache.pinot.spi.data.readers.GenericRow; diff --git a/pinot-core/src/main/java/org/apache/pinot/core/realtime/stream/MessageBatch.java b/pinot-core/src/main/java/org/apache/pinot/core/realtime/stream/MessageBatch.java index 09849ca..c4c5428 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/realtime/stream/MessageBatch.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/realtime/stream/MessageBatch.java @@ -18,8 +18,8 @@ */ package org.apache.pinot.core.realtime.stream; -import org.apache.pinot.annotations.InterfaceAudience; -import org.apache.pinot.annotations.InterfaceStability; +import org.apache.pinot.spi.annotations.InterfaceAudience; +import org.apache.pinot.spi.annotations.InterfaceStability; import org.apache.pinot.common.metadata.RowMetadata; diff --git a/pinot-core/src/main/java/org/apache/pinot/core/realtime/stream/PartitionLevelConsumer.java b/pinot-core/src/main/java/org/apache/pinot/core/realtime/stream/PartitionLevelConsumer.java index 5741d3b..6b30055 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/realtime/stream/PartitionLevelConsumer.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/realtime/stream/PartitionLevelConsumer.java @@ -19,8 +19,8 @@ package org.apache.pinot.core.realtime.stream; import java.io.Closeable; -import org.apache.pinot.annotations.InterfaceAudience; -import org.apache.pinot.annotations.InterfaceStability; +import org.apache.pinot.spi.annotations.InterfaceAudience; +import org.apache.pinot.spi.annotations.InterfaceStability; /** diff --git a/pinot-core/src/main/java/org/apache/pinot/core/realtime/stream/StreamLevelConsumer.java b/pinot-core/src/main/java/org/apache/pinot/core/realtime/stream/StreamLevelConsumer.java index 301410f..eb1f8c8 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/realtime/stream/StreamLevelConsumer.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/realtime/stream/StreamLevelConsumer.java @@ -18,8 +18,8 @@ */ package org.apache.pinot.core.realtime.stream; -import org.apache.pinot.annotations.InterfaceAudience; -import org.apache.pinot.annotations.InterfaceStability; +import org.apache.pinot.spi.annotations.InterfaceAudience; +import org.apache.pinot.spi.annotations.InterfaceStability; import org.apache.pinot.spi.data.readers.GenericRow; diff --git a/pinot-core/src/main/java/org/apache/pinot/core/realtime/stream/StreamMessageDecoder.java b/pinot-core/src/main/java/org/apache/pinot/core/realtime/stream/StreamMessageDecoder.java index 6fceb32..82a1356 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/realtime/stream/StreamMessageDecoder.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/realtime/stream/StreamMessageDecoder.java @@ -19,8 +19,8 @@ package org.apache.pinot.core.realtime.stream; import java.util.Map; -import org.apache.pinot.annotations.InterfaceAudience; -import org.apache.pinot.annotations.InterfaceStability; +import org.apache.pinot.spi.annotations.InterfaceAudience; +import org.apache.pinot.spi.annotations.InterfaceStability; import org.apache.pinot.spi.data.Schema; import org.apache.pinot.spi.data.readers.GenericRow; diff --git a/pinot-core/src/main/java/org/apache/pinot/core/realtime/stream/StreamMetadataProvider.java b/pinot-core/src/main/java/org/apache/pinot/core/realtime/stream/StreamMetadataProvider.java index e7e2a94..b9469c4 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/realtime/stream/StreamMetadataProvider.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/realtime/stream/StreamMetadataProvider.java @@ -20,8 +20,8 @@ package org.apache.pinot.core.realtime.stream; import java.io.Closeable; import javax.annotation.Nonnull; -import org.apache.pinot.annotations.InterfaceAudience; -import org.apache.pinot.annotations.InterfaceStability; +import org.apache.pinot.spi.annotations.InterfaceAudience; +import org.apache.pinot.spi.annotations.InterfaceStability; /** diff --git a/pinot-hadoop-filesystem/src/main/java/org/apache/pinot/filesystem/HadoopPinotFS.java b/pinot-hadoop-filesystem/src/main/java/org/apache/pinot/filesystem/HadoopPinotFS.java index 8f6b13a..e5d7637 100644 --- a/pinot-hadoop-filesystem/src/main/java/org/apache/pinot/filesystem/HadoopPinotFS.java +++ b/pinot-hadoop-filesystem/src/main/java/org/apache/pinot/filesystem/HadoopPinotFS.java @@ -34,6 +34,7 @@ import org.apache.hadoop.fs.RemoteIterator; import org.apache.hadoop.security.UserGroupInformation; import org.apache.pinot.common.utils.retry.RetryPolicies; import org.apache.pinot.common.utils.retry.RetryPolicy; +import org.apache.pinot.spi.filesystem.PinotFS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pinot-spi/pom.xml b/pinot-spi/pom.xml index 929da01..d663cf3 100644 --- a/pinot-spi/pom.xml +++ b/pinot-spi/pom.xml @@ -57,6 +57,20 @@ </build> <dependencies> <dependency> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <scope>test</scope> diff --git a/pinot-common/src/main/java/org/apache/pinot/annotations/InterfaceAudience.java b/pinot-spi/src/main/java/org/apache/pinot/spi/annotations/InterfaceAudience.java similarity index 76% rename from pinot-common/src/main/java/org/apache/pinot/annotations/InterfaceAudience.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/annotations/InterfaceAudience.java index 6e92234..2e50824 100644 --- a/pinot-common/src/main/java/org/apache/pinot/annotations/InterfaceAudience.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/annotations/InterfaceAudience.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.annotations; +package org.apache.pinot.spi.annotations; import java.lang.annotation.Documented; @@ -24,23 +24,23 @@ import java.lang.annotation.Documented; /** * Annotation to inform users of a package, class or method's intended audience. * - * Currently the audience can be {@link org.apache.pinot.annotations.InterfaceAudience.Public}, - * {@link org.apache.pinot.annotations.InterfaceAudience.LimitedPrivate} or - * {@link org.apache.pinot.annotations.InterfaceAudience.Private}. <br> + * Currently the audience can be {@link InterfaceAudience.Public}, + * {@link InterfaceAudience.LimitedPrivate} or + * {@link InterfaceAudience.Private}. <br> * * <ul> * <li>Public classes that are not marked with this annotation must be - * considered by default as {@link org.apache.pinot.annotations.InterfaceAudience.Private}.</li> + * considered by default as {@link InterfaceAudience.Private}.</li> * * <li>External application developers depending on Pinot must only use classes that are marked - * {@link org.apache.pinot.annotations.InterfaceAudience.Public}. Do not depend on classes without an + * {@link InterfaceAudience.Public}. Do not depend on classes without an * explicit InterfaceAudience.Public annotation as these classes * could be removed or change in incompatible ways.</li> * * <li> Methods may have a different annotation that it is more restrictive * compared to the audience classification of the class. Example: A class - * might be {@link org.apache.pinot.annotations.InterfaceAudience.Public}, - * but a method may be {@link org.apache.pinot.annotations.InterfaceAudience.LimitedPrivate} + * might be {@link InterfaceAudience.Public}, + * but a method may be {@link InterfaceAudience.LimitedPrivate} * </li></ul> * * The annotation is borrowed from a similar Apache Hadoop annotation. diff --git a/pinot-common/src/main/java/org/apache/pinot/annotations/InterfaceStability.java b/pinot-spi/src/main/java/org/apache/pinot/spi/annotations/InterfaceStability.java similarity index 83% rename from pinot-common/src/main/java/org/apache/pinot/annotations/InterfaceStability.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/annotations/InterfaceStability.java index 8b74394..3afb081 100644 --- a/pinot-common/src/main/java/org/apache/pinot/annotations/InterfaceStability.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/annotations/InterfaceStability.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.annotations; +package org.apache.pinot.spi.annotations; import java.lang.annotation.Documented; @@ -24,14 +24,14 @@ import java.lang.annotation.Documented; /** * Annotation to inform users of how much to rely on a particular package, * class or method not changing over time. Currently the stability can be - * {@link org.apache.pinot.annotations.InterfaceStability.Stable}, - * {@link org.apache.pinot.annotations.InterfaceStability.Evolving} or - * {@link org.apache.pinot.annotations.InterfaceStability.Unstable}. <br> + * {@link InterfaceStability.Stable}, + * {@link InterfaceStability.Evolving} or + * {@link InterfaceStability.Unstable}. <br> * * <ul> - * <li>All classes that are annotated with {@link org.apache.pinot.annotations.InterfaceAudience.Public} must have + * <li>All classes that are annotated with {@link InterfaceAudience.Public} must have * InterfaceStability annotation. </li> - * <li>Classes that are {@link org.apache.pinot.annotations.InterfaceAudience.Private} are to be considered unstable + * <li>Classes that are {@link InterfaceAudience.Private} are to be considered unstable * unless a different InterfaceStability annotation states otherwise.</li> * <li>Pinot contributors should NOT make incompatible changes to classes marked as stable. * Some things to watch out for classes marked as stable: diff --git a/pinot-common/src/main/java/org/apache/pinot/filesystem/PinotFS.java b/pinot-spi/src/main/java/org/apache/pinot/spi/filesystem/PinotFS.java similarity index 98% rename from pinot-common/src/main/java/org/apache/pinot/filesystem/PinotFS.java rename to pinot-spi/src/main/java/org/apache/pinot/spi/filesystem/PinotFS.java index 4014441..2485ab6 100644 --- a/pinot-common/src/main/java/org/apache/pinot/filesystem/PinotFS.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/filesystem/PinotFS.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pinot.filesystem; +package org.apache.pinot.spi.filesystem; import java.io.Closeable; import java.io.File; @@ -24,8 +24,8 @@ import java.io.IOException; import java.net.URI; import java.nio.file.Paths; import org.apache.commons.configuration.Configuration; -import org.apache.pinot.annotations.InterfaceAudience; -import org.apache.pinot.annotations.InterfaceStability; +import org.apache.pinot.spi.annotations.InterfaceAudience; +import org.apache.pinot.spi.annotations.InterfaceStability; import org.slf4j.Logger; import org.slf4j.LoggerFactory; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
