You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by je...@apache.org on 2019/12/06 15:40:36 UTC
[incubator-pinot] 01/01: Moving crypter classes to pinot-spi
This is an automated email from the ASF dual-hosted git repository.
jenniferdai pushed a commit to branch spicrypt
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit 0ee28402d38ecc29c5bb3b1ddd217a7eb675daba
Author: Jennifer Dai <jd...@linkedin.com>
AuthorDate: Fri Dec 6 07:42:49 2019 -0800
Moving crypter classes to pinot-spi
---
.../main/java/org/apache/pinot/controller/ControllerStarter.java | 2 +-
.../api/resources/PinotSegmentUploadDownloadRestletResource.java | 6 +++---
.../apache/pinot/{core => spi}/crypt/PinotCrypterFactoryTest.java | 2 +-
.../src/main/java/org/apache/pinot/minion/MinionStarter.java | 2 +-
.../apache/pinot/server/starter/helix/SegmentFetcherAndLoader.java | 5 ++---
.../src/main/java/org/apache/pinot/spi}/crypt/NoOpPinotCrypter.java | 2 +-
.../src/main/java/org/apache/pinot/spi}/crypt/PinotCrypter.java | 2 +-
.../main/java/org/apache/pinot/spi}/crypt/PinotCrypterFactory.java | 2 +-
8 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerStarter.java b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerStarter.java
index e92d2f3..984953a 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerStarter.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerStarter.java
@@ -71,7 +71,7 @@ import org.apache.pinot.controller.helix.starter.HelixConfig;
import org.apache.pinot.controller.validation.BrokerResourceValidationManager;
import org.apache.pinot.controller.validation.OfflineSegmentIntervalChecker;
import org.apache.pinot.controller.validation.RealtimeSegmentValidationManager;
-import org.apache.pinot.core.crypt.PinotCrypterFactory;
+import org.apache.pinot.spi.crypt.PinotCrypterFactory;
import org.apache.pinot.core.periodictask.PeriodicTask;
import org.apache.pinot.core.periodictask.PeriodicTaskScheduler;
import org.apache.pinot.filesystem.PinotFSFactory;
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 b7574bf..ca77291 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
@@ -70,9 +70,9 @@ import org.apache.pinot.controller.api.access.AccessControlFactory;
import org.apache.pinot.controller.api.upload.SegmentValidator;
import org.apache.pinot.controller.api.upload.ZKOperator;
import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
-import org.apache.pinot.core.crypt.NoOpPinotCrypter;
-import org.apache.pinot.core.crypt.PinotCrypter;
-import org.apache.pinot.core.crypt.PinotCrypterFactory;
+import org.apache.pinot.spi.crypt.NoOpPinotCrypter;
+import org.apache.pinot.spi.crypt.PinotCrypter;
+import org.apache.pinot.spi.crypt.PinotCrypterFactory;
import org.apache.pinot.core.metadata.DefaultMetadataExtractor;
import org.apache.pinot.core.metadata.MetadataExtractorFactory;
import org.apache.pinot.spi.filesystem.PinotFS;
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/crypt/PinotCrypterFactoryTest.java b/pinot-core/src/test/java/org/apache/pinot/spi/crypt/PinotCrypterFactoryTest.java
similarity index 98%
rename from pinot-core/src/test/java/org/apache/pinot/core/crypt/PinotCrypterFactoryTest.java
rename to pinot-core/src/test/java/org/apache/pinot/spi/crypt/PinotCrypterFactoryTest.java
index 15c19ef..398558c 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/crypt/PinotCrypterFactoryTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/spi/crypt/PinotCrypterFactoryTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.core.crypt;
+package org.apache.pinot.spi.crypt;
import java.io.File;
import org.apache.commons.configuration.Configuration;
diff --git a/pinot-minion/src/main/java/org/apache/pinot/minion/MinionStarter.java b/pinot-minion/src/main/java/org/apache/pinot/minion/MinionStarter.java
index f6bc0b1..537d299 100644
--- a/pinot-minion/src/main/java/org/apache/pinot/minion/MinionStarter.java
+++ b/pinot-minion/src/main/java/org/apache/pinot/minion/MinionStarter.java
@@ -39,7 +39,7 @@ import org.apache.pinot.common.utils.ClientSSLContextGenerator;
import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.common.utils.NetUtil;
import org.apache.pinot.common.utils.ServiceStatus;
-import org.apache.pinot.core.crypt.PinotCrypterFactory;
+import org.apache.pinot.spi.crypt.PinotCrypterFactory;
import org.apache.pinot.filesystem.PinotFSFactory;
import org.apache.pinot.minion.events.EventObserverFactoryRegistry;
import org.apache.pinot.minion.events.MinionEventObserverFactory;
diff --git a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/SegmentFetcherAndLoader.java b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/SegmentFetcherAndLoader.java
index d92fce2..e179965 100644
--- a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/SegmentFetcherAndLoader.java
+++ b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/SegmentFetcherAndLoader.java
@@ -28,15 +28,14 @@ import org.apache.commons.io.FileUtils;
import org.apache.helix.ZNRecord;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
import org.apache.pinot.common.Utils;
-import org.apache.pinot.common.config.TableNameBuilder;
import org.apache.pinot.common.metadata.ZKMetadataProvider;
import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
import org.apache.pinot.common.segment.SegmentMetadata;
import org.apache.pinot.common.segment.fetcher.SegmentFetcherFactory;
import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.common.utils.TarGzCompressionUtils;
-import org.apache.pinot.core.crypt.PinotCrypter;
-import org.apache.pinot.core.crypt.PinotCrypterFactory;
+import org.apache.pinot.spi.crypt.PinotCrypter;
+import org.apache.pinot.spi.crypt.PinotCrypterFactory;
import org.apache.pinot.core.data.manager.InstanceDataManager;
import org.apache.pinot.core.segment.index.SegmentMetadataImpl;
import org.apache.pinot.core.segment.index.loader.LoaderUtils;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/crypt/NoOpPinotCrypter.java b/pinot-spi/src/main/java/org/apache/pinot/spi/crypt/NoOpPinotCrypter.java
similarity index 97%
rename from pinot-core/src/main/java/org/apache/pinot/core/crypt/NoOpPinotCrypter.java
rename to pinot-spi/src/main/java/org/apache/pinot/spi/crypt/NoOpPinotCrypter.java
index a457877..1f5e83a 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/crypt/NoOpPinotCrypter.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/crypt/NoOpPinotCrypter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.core.crypt;
+package org.apache.pinot.spi.crypt;
import java.io.File;
import org.apache.commons.configuration.Configuration;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/crypt/PinotCrypter.java b/pinot-spi/src/main/java/org/apache/pinot/spi/crypt/PinotCrypter.java
similarity index 97%
rename from pinot-core/src/main/java/org/apache/pinot/core/crypt/PinotCrypter.java
rename to pinot-spi/src/main/java/org/apache/pinot/spi/crypt/PinotCrypter.java
index ee4bcbc..9a2c561 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/crypt/PinotCrypter.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/crypt/PinotCrypter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.core.crypt;
+package org.apache.pinot.spi.crypt;
import java.io.File;
import org.apache.commons.configuration.Configuration;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/crypt/PinotCrypterFactory.java b/pinot-spi/src/main/java/org/apache/pinot/spi/crypt/PinotCrypterFactory.java
similarity index 98%
rename from pinot-core/src/main/java/org/apache/pinot/core/crypt/PinotCrypterFactory.java
rename to pinot-spi/src/main/java/org/apache/pinot/spi/crypt/PinotCrypterFactory.java
index 80fa994..5f41068 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/crypt/PinotCrypterFactory.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/crypt/PinotCrypterFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.core.crypt;
+package org.apache.pinot.spi.crypt;
import java.util.HashMap;
import java.util.Iterator;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org