From 2c1bfb497f31ff402796b57b617a9075c6044e4d Mon Sep 17 00:00:00 2001
From: Marcelo Vanzin <vanzin@cloudera.com>
Date: Tue, 8 Aug 2017 14:33:27 -0700
Subject: [PATCH] [SPARK-21671][CORE] Move kvstore to "util" sub-package, add
private annotation.
Author: Marcelo Vanzin <vanzin@cloudera.com>
Closes #18886 from vanzin/SPARK-21671.
---
.../org/apache/spark/{ => util}/kvstore/ArrayWrappers.java | 2 +-
.../org/apache/spark/{ => util}/kvstore/InMemoryStore.java | 2 +-
.../java/org/apache/spark/{ => util}/kvstore/KVIndex.java | 5 ++++-
.../java/org/apache/spark/{ => util}/kvstore/KVStore.java | 5 ++++-
.../org/apache/spark/{ => util}/kvstore/KVStoreIterator.java | 5 ++++-
.../apache/spark/{ => util}/kvstore/KVStoreSerializer.java | 5 ++++-
.../org/apache/spark/{ => util}/kvstore/KVStoreView.java | 5 ++++-
.../java/org/apache/spark/{ => util}/kvstore/KVTypeInfo.java | 5 ++++-
.../java/org/apache/spark/{ => util}/kvstore/LevelDB.java | 5 ++++-
.../org/apache/spark/{ => util}/kvstore/LevelDBIterator.java | 2 +-
.../org/apache/spark/{ => util}/kvstore/LevelDBTypeInfo.java | 2 +-
.../{ => util}/kvstore/UnsupportedStoreVersionException.java | 5 ++++-
.../apache/spark/{ => util}/kvstore/ArrayKeyIndexType.java | 2 +-
.../apache/spark/{ => util}/kvstore/ArrayWrappersSuite.java | 2 +-
.../org/apache/spark/{ => util}/kvstore/CustomType1.java | 2 +-
.../org/apache/spark/{ => util}/kvstore/DBIteratorSuite.java | 2 +-
.../spark/{ => util}/kvstore/InMemoryIteratorSuite.java | 2 +-
.../apache/spark/{ => util}/kvstore/InMemoryStoreSuite.java | 2 +-
.../apache/spark/{ => util}/kvstore/LevelDBBenchmark.java | 2 +-
.../spark/{ => util}/kvstore/LevelDBIteratorSuite.java | 2 +-
.../org/apache/spark/{ => util}/kvstore/LevelDBSuite.java | 2 +-
.../spark/{ => util}/kvstore/LevelDBTypeInfoSuite.java | 2 +-
22 files changed, 46 insertions(+), 22 deletions(-)
rename common/kvstore/src/main/java/org/apache/spark/{ => util}/kvstore/ArrayWrappers.java (99%)
rename common/kvstore/src/main/java/org/apache/spark/{ => util}/kvstore/InMemoryStore.java (99%)
rename common/kvstore/src/main/java/org/apache/spark/{ => util}/kvstore/KVIndex.java (97%)
rename common/kvstore/src/main/java/org/apache/spark/{ => util}/kvstore/KVStore.java (97%)
rename common/kvstore/src/main/java/org/apache/spark/{ => util}/kvstore/KVStoreIterator.java (93%)
rename common/kvstore/src/main/java/org/apache/spark/{ => util}/kvstore/KVStoreSerializer.java (96%)
rename common/kvstore/src/main/java/org/apache/spark/{ => util}/kvstore/KVStoreView.java (97%)
rename common/kvstore/src/main/java/org/apache/spark/{ => util}/kvstore/KVTypeInfo.java (98%)
rename common/kvstore/src/main/java/org/apache/spark/{ => util}/kvstore/LevelDB.java (99%)
rename common/kvstore/src/main/java/org/apache/spark/{ => util}/kvstore/LevelDBIterator.java (99%)
rename common/kvstore/src/main/java/org/apache/spark/{ => util}/kvstore/LevelDBTypeInfo.java (99%)
rename common/kvstore/src/main/java/org/apache/spark/{ => util}/kvstore/UnsupportedStoreVersionException.java (91%)
rename common/kvstore/src/test/java/org/apache/spark/{ => util}/kvstore/ArrayKeyIndexType.java (96%)
rename common/kvstore/src/test/java/org/apache/spark/{ => util}/kvstore/ArrayWrappersSuite.java (98%)
rename common/kvstore/src/test/java/org/apache/spark/{ => util}/kvstore/CustomType1.java (97%)
rename common/kvstore/src/test/java/org/apache/spark/{ => util}/kvstore/DBIteratorSuite.java (99%)
rename common/kvstore/src/test/java/org/apache/spark/{ => util}/kvstore/InMemoryIteratorSuite.java (96%)
rename common/kvstore/src/test/java/org/apache/spark/{ => util}/kvstore/InMemoryStoreSuite.java (99%)
rename common/kvstore/src/test/java/org/apache/spark/{ => util}/kvstore/LevelDBBenchmark.java (99%)
rename common/kvstore/src/test/java/org/apache/spark/{ => util}/kvstore/LevelDBIteratorSuite.java (97%)
rename common/kvstore/src/test/java/org/apache/spark/{ => util}/kvstore/LevelDBSuite.java (99%)
rename common/kvstore/src/test/java/org/apache/spark/{ => util}/kvstore/LevelDBTypeInfoSuite.java (99%)
diff --git a/common/kvstore/src/main/java/org/apache/spark/kvstore/ArrayWrappers.java b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/ArrayWrappers.java
similarity index 99%
rename from common/kvstore/src/main/java/org/apache/spark/kvstore/ArrayWrappers.java
rename to common/kvstore/src/main/java/org/apache/spark/util/kvstore/ArrayWrappers.java
index 5efa842e3a..9bc8c55bd5 100644
--- a/common/kvstore/src/main/java/org/apache/spark/kvstore/ArrayWrappers.java
+++ b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/ArrayWrappers.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import java.util.Arrays;
diff --git a/common/kvstore/src/main/java/org/apache/spark/kvstore/InMemoryStore.java b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/InMemoryStore.java
similarity index 99%
rename from common/kvstore/src/main/java/org/apache/spark/kvstore/InMemoryStore.java
rename to common/kvstore/src/main/java/org/apache/spark/util/kvstore/InMemoryStore.java
index f3aeb822e7..9cae5da5d2 100644
--- a/common/kvstore/src/main/java/org/apache/spark/kvstore/InMemoryStore.java
+++ b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/InMemoryStore.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/common/kvstore/src/main/java/org/apache/spark/kvstore/KVIndex.java b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/KVIndex.java
similarity index 97%
rename from common/kvstore/src/main/java/org/apache/spark/kvstore/KVIndex.java
rename to common/kvstore/src/main/java/org/apache/spark/util/kvstore/KVIndex.java
index 0cffefe07c..80f4921107 100644
--- a/common/kvstore/src/main/java/org/apache/spark/kvstore/KVIndex.java
+++ b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/KVIndex.java
@@ -15,13 +15,15 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.apache.spark.annotation.Private;
+
/**
* Tags a field to be indexed when storing an object.
*
@@ -46,6 +48,7 @@ import java.lang.annotation.Target;
* of those values.
* </p>
*/
+@Private
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD, ElementType.METHOD})
public @interface KVIndex {
diff --git a/common/kvstore/src/main/java/org/apache/spark/kvstore/KVStore.java b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/KVStore.java
similarity index 97%
rename from common/kvstore/src/main/java/org/apache/spark/kvstore/KVStore.java
rename to common/kvstore/src/main/java/org/apache/spark/util/kvstore/KVStore.java
index c7808ea3c3..72d06a8ca8 100644
--- a/common/kvstore/src/main/java/org/apache/spark/kvstore/KVStore.java
+++ b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/KVStore.java
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import java.io.Closeable;
+import org.apache.spark.annotation.Private;
+
/**
* Abstraction for a local key/value store for storing app data.
*
@@ -59,6 +61,7 @@ import java.io.Closeable;
* KVStore instances are thread-safe for both reads and writes.
* </p>
*/
+@Private
public interface KVStore extends Closeable {
/**
diff --git a/common/kvstore/src/main/java/org/apache/spark/kvstore/KVStoreIterator.java b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/KVStoreIterator.java
similarity index 93%
rename from common/kvstore/src/main/java/org/apache/spark/kvstore/KVStoreIterator.java
rename to common/kvstore/src/main/java/org/apache/spark/util/kvstore/KVStoreIterator.java
index 3efdec9ed3..28a432b26d 100644
--- a/common/kvstore/src/main/java/org/apache/spark/kvstore/KVStoreIterator.java
+++ b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/KVStoreIterator.java
@@ -15,11 +15,13 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import java.util.Iterator;
import java.util.List;
+import org.apache.spark.annotation.Private;
+
/**
* An iterator for KVStore.
*
@@ -28,6 +30,7 @@ import java.util.List;
* explicitly close iterators after they're used.
* </p>
*/
+@Private
public interface KVStoreIterator<T> extends Iterator<T>, AutoCloseable {
/**
diff --git a/common/kvstore/src/main/java/org/apache/spark/kvstore/KVStoreSerializer.java b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/KVStoreSerializer.java
similarity index 96%
rename from common/kvstore/src/main/java/org/apache/spark/kvstore/KVStoreSerializer.java
rename to common/kvstore/src/main/java/org/apache/spark/util/kvstore/KVStoreSerializer.java
index b84ec91cf6..bd8d9486ac 100644
--- a/common/kvstore/src/main/java/org/apache/spark/kvstore/KVStoreSerializer.java
+++ b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/KVStoreSerializer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -25,6 +25,8 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.spark.annotation.Private;
+
/**
* Serializer used to translate between app-defined types and the LevelDB store.
*
@@ -33,6 +35,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* and integers to be written as values directly, which will be written as UTF-8 strings.
* </p>
*/
+@Private
public class KVStoreSerializer {
/**
diff --git a/common/kvstore/src/main/java/org/apache/spark/kvstore/KVStoreView.java b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/KVStoreView.java
similarity index 97%
rename from common/kvstore/src/main/java/org/apache/spark/kvstore/KVStoreView.java
rename to common/kvstore/src/main/java/org/apache/spark/util/kvstore/KVStoreView.java
index 8cd1f52892..8ea79bbe16 100644
--- a/common/kvstore/src/main/java/org/apache/spark/kvstore/KVStoreView.java
+++ b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/KVStoreView.java
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import com.google.common.base.Preconditions;
+import org.apache.spark.annotation.Private;
+
/**
* A configurable view that allows iterating over values in a {@link KVStore}.
*
@@ -33,6 +35,7 @@ import com.google.common.base.Preconditions;
* to be closed explicitly unless all elements are read.
* </p>
*/
+@Private
public abstract class KVStoreView<T> implements Iterable<T> {
final Class<T> type;
diff --git a/common/kvstore/src/main/java/org/apache/spark/kvstore/KVTypeInfo.java b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/KVTypeInfo.java
similarity index 98%
rename from common/kvstore/src/main/java/org/apache/spark/kvstore/KVTypeInfo.java
rename to common/kvstore/src/main/java/org/apache/spark/util/kvstore/KVTypeInfo.java
index e3e61e0a0e..a2b077e453 100644
--- a/common/kvstore/src/main/java/org/apache/spark/kvstore/KVTypeInfo.java
+++ b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/KVTypeInfo.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -25,9 +25,12 @@ import java.util.stream.Stream;
import com.google.common.base.Preconditions;
+import org.apache.spark.annotation.Private;
+
/**
* Wrapper around types managed in a KVStore, providing easy access to their indexed fields.
*/
+@Private
public class KVTypeInfo {
private final Class<?> type;
diff --git a/common/kvstore/src/main/java/org/apache/spark/kvstore/LevelDB.java b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/LevelDB.java
similarity index 99%
rename from common/kvstore/src/main/java/org/apache/spark/kvstore/LevelDB.java
rename to common/kvstore/src/main/java/org/apache/spark/util/kvstore/LevelDB.java
index 27141358dc..310febc352 100644
--- a/common/kvstore/src/main/java/org/apache/spark/kvstore/LevelDB.java
+++ b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/LevelDB.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import java.io.File;
import java.io.IOException;
@@ -36,9 +36,12 @@ import org.iq80.leveldb.DB;
import org.iq80.leveldb.Options;
import org.iq80.leveldb.WriteBatch;
+import org.apache.spark.annotation.Private;
+
/**
* Implementation of KVStore that uses LevelDB as the underlying data store.
*/
+@Private
public class LevelDB implements KVStore {
@VisibleForTesting
diff --git a/common/kvstore/src/main/java/org/apache/spark/kvstore/LevelDBIterator.java b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/LevelDBIterator.java
similarity index 99%
rename from common/kvstore/src/main/java/org/apache/spark/kvstore/LevelDBIterator.java
rename to common/kvstore/src/main/java/org/apache/spark/util/kvstore/LevelDBIterator.java
index 263d45c242..a2181f3874 100644
--- a/common/kvstore/src/main/java/org/apache/spark/kvstore/LevelDBIterator.java
+++ b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/LevelDBIterator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/common/kvstore/src/main/java/org/apache/spark/kvstore/LevelDBTypeInfo.java b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/LevelDBTypeInfo.java
similarity index 99%
rename from common/kvstore/src/main/java/org/apache/spark/kvstore/LevelDBTypeInfo.java
rename to common/kvstore/src/main/java/org/apache/spark/util/kvstore/LevelDBTypeInfo.java
index 722f54e6f9..93aa0bbc9d 100644
--- a/common/kvstore/src/main/java/org/apache/spark/kvstore/LevelDBTypeInfo.java
+++ b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/LevelDBTypeInfo.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import java.lang.reflect.Array;
import java.util.Collection;
diff --git a/common/kvstore/src/main/java/org/apache/spark/kvstore/UnsupportedStoreVersionException.java b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/UnsupportedStoreVersionException.java
similarity index 91%
rename from common/kvstore/src/main/java/org/apache/spark/kvstore/UnsupportedStoreVersionException.java
rename to common/kvstore/src/main/java/org/apache/spark/util/kvstore/UnsupportedStoreVersionException.java
index 2ed246e4f4..75a33b7c75 100644
--- a/common/kvstore/src/main/java/org/apache/spark/kvstore/UnsupportedStoreVersionException.java
+++ b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/UnsupportedStoreVersionException.java
@@ -15,13 +15,16 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import java.io.IOException;
+import org.apache.spark.annotation.Private;
+
/**
* Exception thrown when the store implementation is not compatible with the underlying data.
*/
+@Private
public class UnsupportedStoreVersionException extends IOException {
}
diff --git a/common/kvstore/src/test/java/org/apache/spark/kvstore/ArrayKeyIndexType.java b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/ArrayKeyIndexType.java
similarity index 96%
rename from common/kvstore/src/test/java/org/apache/spark/kvstore/ArrayKeyIndexType.java
rename to common/kvstore/src/test/java/org/apache/spark/util/kvstore/ArrayKeyIndexType.java
index d5938acc3e..32030fb411 100644
--- a/common/kvstore/src/test/java/org/apache/spark/kvstore/ArrayKeyIndexType.java
+++ b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/ArrayKeyIndexType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import java.util.Arrays;
diff --git a/common/kvstore/src/test/java/org/apache/spark/kvstore/ArrayWrappersSuite.java b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/ArrayWrappersSuite.java
similarity index 98%
rename from common/kvstore/src/test/java/org/apache/spark/kvstore/ArrayWrappersSuite.java
rename to common/kvstore/src/test/java/org/apache/spark/util/kvstore/ArrayWrappersSuite.java
index f9b4774820..b1c8927d07 100644
--- a/common/kvstore/src/test/java/org/apache/spark/kvstore/ArrayWrappersSuite.java
+++ b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/ArrayWrappersSuite.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import org.junit.Test;
import static org.junit.Assert.*;
diff --git a/common/kvstore/src/test/java/org/apache/spark/kvstore/CustomType1.java b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/CustomType1.java
similarity index 97%
rename from common/kvstore/src/test/java/org/apache/spark/kvstore/CustomType1.java
rename to common/kvstore/src/test/java/org/apache/spark/util/kvstore/CustomType1.java
index afb72b8689..92b643b0cb 100644
--- a/common/kvstore/src/test/java/org/apache/spark/kvstore/CustomType1.java
+++ b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/CustomType1.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import com.google.common.base.Objects;
diff --git a/common/kvstore/src/test/java/org/apache/spark/kvstore/DBIteratorSuite.java b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/DBIteratorSuite.java
similarity index 99%
rename from common/kvstore/src/test/java/org/apache/spark/kvstore/DBIteratorSuite.java
rename to common/kvstore/src/test/java/org/apache/spark/util/kvstore/DBIteratorSuite.java
index 3a418189ec..9a81f86812 100644
--- a/common/kvstore/src/test/java/org/apache/spark/kvstore/DBIteratorSuite.java
+++ b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/DBIteratorSuite.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import java.util.Arrays;
import java.util.ArrayList;
diff --git a/common/kvstore/src/test/java/org/apache/spark/kvstore/InMemoryIteratorSuite.java b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/InMemoryIteratorSuite.java
similarity index 96%
rename from common/kvstore/src/test/java/org/apache/spark/kvstore/InMemoryIteratorSuite.java
rename to common/kvstore/src/test/java/org/apache/spark/util/kvstore/InMemoryIteratorSuite.java
index 57ee4f6dd7..27dde6a9fb 100644
--- a/common/kvstore/src/test/java/org/apache/spark/kvstore/InMemoryIteratorSuite.java
+++ b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/InMemoryIteratorSuite.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
public class InMemoryIteratorSuite extends DBIteratorSuite {
diff --git a/common/kvstore/src/test/java/org/apache/spark/kvstore/InMemoryStoreSuite.java b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/InMemoryStoreSuite.java
similarity index 99%
rename from common/kvstore/src/test/java/org/apache/spark/kvstore/InMemoryStoreSuite.java
rename to common/kvstore/src/test/java/org/apache/spark/util/kvstore/InMemoryStoreSuite.java
index 6a7915f938..510b3058a4 100644
--- a/common/kvstore/src/test/java/org/apache/spark/kvstore/InMemoryStoreSuite.java
+++ b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/InMemoryStoreSuite.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import java.util.NoSuchElementException;
diff --git a/common/kvstore/src/test/java/org/apache/spark/kvstore/LevelDBBenchmark.java b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/LevelDBBenchmark.java
similarity index 99%
rename from common/kvstore/src/test/java/org/apache/spark/kvstore/LevelDBBenchmark.java
rename to common/kvstore/src/test/java/org/apache/spark/util/kvstore/LevelDBBenchmark.java
index 5e33606b12..268d025f5f 100644
--- a/common/kvstore/src/test/java/org/apache/spark/kvstore/LevelDBBenchmark.java
+++ b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/LevelDBBenchmark.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import java.io.File;
import java.util.ArrayList;
diff --git a/common/kvstore/src/test/java/org/apache/spark/kvstore/LevelDBIteratorSuite.java b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/LevelDBIteratorSuite.java
similarity index 97%
rename from common/kvstore/src/test/java/org/apache/spark/kvstore/LevelDBIteratorSuite.java
rename to common/kvstore/src/test/java/org/apache/spark/util/kvstore/LevelDBIteratorSuite.java
index 9340971298..f8195da58c 100644
--- a/common/kvstore/src/test/java/org/apache/spark/kvstore/LevelDBIteratorSuite.java
+++ b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/LevelDBIteratorSuite.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import java.io.File;
diff --git a/common/kvstore/src/test/java/org/apache/spark/kvstore/LevelDBSuite.java b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/LevelDBSuite.java
similarity index 99%
rename from common/kvstore/src/test/java/org/apache/spark/kvstore/LevelDBSuite.java
rename to common/kvstore/src/test/java/org/apache/spark/util/kvstore/LevelDBSuite.java
index 86c85c1b7a..2b07d249d2 100644
--- a/common/kvstore/src/test/java/org/apache/spark/kvstore/LevelDBSuite.java
+++ b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/LevelDBSuite.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import java.io.File;
import java.util.Arrays;
diff --git a/common/kvstore/src/test/java/org/apache/spark/kvstore/LevelDBTypeInfoSuite.java b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/LevelDBTypeInfoSuite.java
similarity index 99%
rename from common/kvstore/src/test/java/org/apache/spark/kvstore/LevelDBTypeInfoSuite.java
rename to common/kvstore/src/test/java/org/apache/spark/util/kvstore/LevelDBTypeInfoSuite.java
index 8e6196506c..38db3bedae 100644
--- a/common/kvstore/src/test/java/org/apache/spark/kvstore/LevelDBTypeInfoSuite.java
+++ b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/LevelDBTypeInfoSuite.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.spark.kvstore;
+package org.apache.spark.util.kvstore;
import static java.nio.charset.StandardCharsets.UTF_8;
--
GitLab