Merge pull request #3052 from gchq/3051-refactor-partition-splitting

Issue 3051 - Refactor partition splitting
gchq · Aug 12, 2024 · dd4445a · dd4445a
2 parents f105e2c + 01a68ec
commit dd4445a
Show file tree

Hide file tree

Showing 23 changed files with 380 additions and 295 deletions.
diff --git a/java/athena/src/test/java/sleeper/athena/metadata/IteratorApplyingMetadataHandlerIT.java b/java/athena/src/test/java/sleeper/athena/metadata/IteratorApplyingMetadataHandlerIT.java
@@ -49,7 +49,7 @@
 import sleeper.core.partition.Partition;
 import sleeper.core.schema.Field;
 import sleeper.core.statestore.StateStore;
-import sleeper.splitter.SplitPartition;
+import sleeper.splitter.split.SplitPartition;
 import sleeper.statestore.StateStoreFactory;
 
 import java.util.ArrayList;

diff --git a/java/athena/src/test/java/sleeper/athena/metadata/SleeperMetadataHandlerIT.java b/java/athena/src/test/java/sleeper/athena/metadata/SleeperMetadataHandlerIT.java
@@ -52,7 +52,7 @@
 import sleeper.configuration.properties.table.TableProperties;
 import sleeper.core.partition.Partition;
 import sleeper.core.statestore.StateStore;
-import sleeper.splitter.SplitPartition;
+import sleeper.splitter.split.SplitPartition;
 import sleeper.statestore.StateStoreFactory;
 
 import java.io.IOException;

diff --git a/java/clients/src/main/java/sleeper/clients/status/report/DeadLettersStatusReport.java b/java/clients/src/main/java/sleeper/clients/status/report/DeadLettersStatusReport.java
@@ -30,7 +30,7 @@
 import sleeper.configuration.properties.instance.InstanceProperties;
 import sleeper.configuration.properties.table.TablePropertiesProvider;
 import sleeper.query.model.QuerySerDe;
-import sleeper.splitter.SplitPartitionJobDefinitionSerDe;
+import sleeper.splitter.find.SplitPartitionJobDefinitionSerDe;
 import sleeper.task.common.QueueMessageCount;
 
 import java.io.IOException;

diff --git a/java/clients/src/main/java/sleeper/clients/status/report/partitions/PartitionStatus.java b/java/clients/src/main/java/sleeper/clients/status/report/partitions/PartitionStatus.java
@@ -22,8 +22,8 @@
 import sleeper.core.schema.Field;
 import sleeper.core.schema.Schema;
 import sleeper.core.statestore.FileReference;
-import sleeper.splitter.FindPartitionsToSplit;
-import sleeper.splitter.PartitionSplitCheck;
+import sleeper.splitter.find.FindPartitionsToSplit;
+import sleeper.splitter.find.PartitionSplitCheck;
 
 import java.util.List;
 import java.util.Set;

diff --git a/java/splitter/splitter-core/src/main/java/sleeper/splitter/SplitPartition.java b/java/splitter/splitter-core/src/main/java/sleeper/splitter/SplitPartition.java
diff --git a/.../splitter/FindPartitionToSplitResult.java → ...tter/find/FindPartitionToSplitResult.java b/.../splitter/FindPartitionToSplitResult.java → ...tter/find/FindPartitionToSplitResult.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package sleeper.splitter;
+package sleeper.splitter.find;
 
 import sleeper.core.partition.Partition;
 import sleeper.core.statestore.FileReference;

diff --git a/...eeper/splitter/FindPartitionsToSplit.java → .../splitter/find/FindPartitionsToSplit.java b/...eeper/splitter/FindPartitionsToSplit.java → .../splitter/find/FindPartitionsToSplit.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package sleeper.splitter;
+package sleeper.splitter.find;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...sleeper/splitter/PartitionSplitCheck.java → ...er/splitter/find/PartitionSplitCheck.java b/...sleeper/splitter/PartitionSplitCheck.java → ...er/splitter/find/PartitionSplitCheck.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package sleeper.splitter;
+package sleeper.splitter.find;
 
 import sleeper.configuration.properties.table.TableProperties;
 import sleeper.core.statestore.FileReference;

diff --git a/...splitter/SplitPartitionJobDefinition.java → ...ter/find/SplitPartitionJobDefinition.java b/...splitter/SplitPartitionJobDefinition.java → ...ter/find/SplitPartitionJobDefinition.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package sleeper.splitter;
+package sleeper.splitter.find;
 
 import sleeper.core.partition.Partition;
 

diff --git a/...ter/SplitPartitionJobDefinitionSerDe.java → ...ind/SplitPartitionJobDefinitionSerDe.java b/...ter/SplitPartitionJobDefinitionSerDe.java → ...ind/SplitPartitionJobDefinitionSerDe.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package sleeper.splitter;
+package sleeper.splitter.find;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;