From e7a531c50ff1b8c4a7a6a0cbfe4bc06843d72c16 Mon Sep 17 00:00:00 2001 From: Jannik Lindemann Date: Fri, 3 Jul 2026 12:25:22 +0200 Subject: [PATCH] Move I/O Related Classes to cache.io Package --- .../apache/sysds/runtime/instructions/ooc/CachingStream.java | 2 +- .../sysds/runtime/instructions/ooc/ReblockOOCInstruction.java | 2 +- .../org/apache/sysds/runtime/ooc/cache/OOCCacheManager.java | 2 ++ .../sysds/runtime/ooc/cache/{ => io}/CloseableQueue.java | 2 +- .../apache/sysds/runtime/ooc/cache/{ => io}/OOCIOHandler.java | 4 +++- .../sysds/runtime/ooc/cache/{ => io}/OOCMatrixIOHandler.java | 4 +++- .../sysds/runtime/ooc/cache/legacy/OOCCacheScheduler.java | 2 +- .../sysds/runtime/ooc/cache/legacy/OOCLRUCacheScheduler.java | 2 +- .../org/apache/sysds/runtime/ooc/stream/SourceOOCStream.java | 2 +- .../test/component/ooc/cache/OOCLRUCacheSchedulerTest.java | 2 +- .../component/ooc/cache/SourceBackedCacheSchedulerTest.java | 4 ++-- .../component/ooc/cache/SourceBackedReadOOCIOHandlerTest.java | 4 ++-- .../sysds/test/functions/ooc/SourceReadOOCIOHandlerTest.java | 4 ++-- 13 files changed, 21 insertions(+), 15 deletions(-) rename src/main/java/org/apache/sysds/runtime/ooc/cache/{ => io}/CloseableQueue.java (98%) rename src/main/java/org/apache/sysds/runtime/ooc/cache/{ => io}/OOCIOHandler.java (96%) rename src/main/java/org/apache/sysds/runtime/ooc/cache/{ => io}/OOCMatrixIOHandler.java (99%) diff --git a/src/main/java/org/apache/sysds/runtime/instructions/ooc/CachingStream.java b/src/main/java/org/apache/sysds/runtime/instructions/ooc/CachingStream.java index 38929dcafcc..abf1efde9c2 100644 --- a/src/main/java/org/apache/sysds/runtime/instructions/ooc/CachingStream.java +++ b/src/main/java/org/apache/sysds/runtime/instructions/ooc/CachingStream.java @@ -28,7 +28,7 @@ import org.apache.sysds.runtime.meta.DataCharacteristics; import org.apache.sysds.runtime.ooc.cache.BlockKey; import org.apache.sysds.runtime.ooc.cache.GroupedBlockKey; -import org.apache.sysds.runtime.ooc.cache.OOCIOHandler; +import org.apache.sysds.runtime.ooc.cache.io.OOCIOHandler; import org.apache.sysds.runtime.ooc.cache.OOCCacheManager; import org.apache.sysds.runtime.ooc.stream.SourceOOCStream; import org.apache.sysds.runtime.ooc.stream.message.OOCGetStreamTypeMessage; diff --git a/src/main/java/org/apache/sysds/runtime/instructions/ooc/ReblockOOCInstruction.java b/src/main/java/org/apache/sysds/runtime/instructions/ooc/ReblockOOCInstruction.java index 4270836b755..75407f8cf05 100644 --- a/src/main/java/org/apache/sysds/runtime/instructions/ooc/ReblockOOCInstruction.java +++ b/src/main/java/org/apache/sysds/runtime/instructions/ooc/ReblockOOCInstruction.java @@ -30,7 +30,7 @@ import org.apache.sysds.runtime.matrix.operators.Operator; import org.apache.sysds.runtime.meta.DataCharacteristics; import org.apache.sysds.runtime.ooc.cache.OOCCacheManager; -import org.apache.sysds.runtime.ooc.cache.OOCIOHandler; +import org.apache.sysds.runtime.ooc.cache.io.OOCIOHandler; import org.apache.sysds.runtime.ooc.stream.SourceOOCStream; public class ReblockOOCInstruction extends ComputationOOCInstruction { diff --git a/src/main/java/org/apache/sysds/runtime/ooc/cache/OOCCacheManager.java b/src/main/java/org/apache/sysds/runtime/ooc/cache/OOCCacheManager.java index f1bb0cbf7f4..78d12348fe5 100644 --- a/src/main/java/org/apache/sysds/runtime/ooc/cache/OOCCacheManager.java +++ b/src/main/java/org/apache/sysds/runtime/ooc/cache/OOCCacheManager.java @@ -26,6 +26,8 @@ import org.apache.sysds.runtime.instructions.ooc.TeeOOCInstruction; import org.apache.sysds.runtime.instructions.spark.data.IndexedMatrixValue; import org.apache.sysds.runtime.matrix.data.MatrixBlock; +import org.apache.sysds.runtime.ooc.cache.io.OOCIOHandler; +import org.apache.sysds.runtime.ooc.cache.io.OOCMatrixIOHandler; import org.apache.sysds.runtime.ooc.cache.legacy.OOCCacheScheduler; import org.apache.sysds.runtime.ooc.cache.legacy.OOCLRUCacheScheduler; import org.apache.sysds.runtime.ooc.memory.InMemoryQueueCallback; diff --git a/src/main/java/org/apache/sysds/runtime/ooc/cache/CloseableQueue.java b/src/main/java/org/apache/sysds/runtime/ooc/cache/io/CloseableQueue.java similarity index 98% rename from src/main/java/org/apache/sysds/runtime/ooc/cache/CloseableQueue.java rename to src/main/java/org/apache/sysds/runtime/ooc/cache/io/CloseableQueue.java index 4f1c5799736..94411242df1 100644 --- a/src/main/java/org/apache/sysds/runtime/ooc/cache/CloseableQueue.java +++ b/src/main/java/org/apache/sysds/runtime/ooc/cache/io/CloseableQueue.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.sysds.runtime.ooc.cache; +package org.apache.sysds.runtime.ooc.cache.io; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; diff --git a/src/main/java/org/apache/sysds/runtime/ooc/cache/OOCIOHandler.java b/src/main/java/org/apache/sysds/runtime/ooc/cache/io/OOCIOHandler.java similarity index 96% rename from src/main/java/org/apache/sysds/runtime/ooc/cache/OOCIOHandler.java rename to src/main/java/org/apache/sysds/runtime/ooc/cache/io/OOCIOHandler.java index 0bc5ace1274..21085626a71 100644 --- a/src/main/java/org/apache/sysds/runtime/ooc/cache/OOCIOHandler.java +++ b/src/main/java/org/apache/sysds/runtime/ooc/cache/io/OOCIOHandler.java @@ -17,12 +17,14 @@ * under the License. */ -package org.apache.sysds.runtime.ooc.cache; +package org.apache.sysds.runtime.ooc.cache.io; import org.apache.sysds.common.Types; import org.apache.sysds.runtime.instructions.ooc.OOCStream; import org.apache.sysds.runtime.instructions.spark.data.IndexedMatrixValue; import org.apache.sysds.runtime.matrix.data.MatrixIndexes; +import org.apache.sysds.runtime.ooc.cache.BlockEntry; +import org.apache.sysds.runtime.ooc.cache.BlockKey; import java.util.concurrent.CompletableFuture; import java.util.List; diff --git a/src/main/java/org/apache/sysds/runtime/ooc/cache/OOCMatrixIOHandler.java b/src/main/java/org/apache/sysds/runtime/ooc/cache/io/OOCMatrixIOHandler.java similarity index 99% rename from src/main/java/org/apache/sysds/runtime/ooc/cache/OOCMatrixIOHandler.java rename to src/main/java/org/apache/sysds/runtime/ooc/cache/io/OOCMatrixIOHandler.java index 7509b669701..029c9e8060f 100644 --- a/src/main/java/org/apache/sysds/runtime/ooc/cache/OOCMatrixIOHandler.java +++ b/src/main/java/org/apache/sysds/runtime/ooc/cache/io/OOCMatrixIOHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.sysds.runtime.ooc.cache; +package org.apache.sysds.runtime.ooc.cache.io; import org.apache.sysds.api.DMLScript; import org.apache.hadoop.fs.FileSystem; @@ -32,6 +32,8 @@ import org.apache.sysds.runtime.io.MatrixReader; import org.apache.sysds.runtime.matrix.data.MatrixBlock; import org.apache.sysds.runtime.matrix.data.MatrixIndexes; +import org.apache.sysds.runtime.ooc.cache.BlockEntry; +import org.apache.sysds.runtime.ooc.cache.BlockKey; import org.apache.sysds.runtime.ooc.stats.OOCEventLog; import org.apache.sysds.runtime.ooc.stream.SourceOOCStream; import org.apache.sysds.runtime.util.FastBufferedDataInputStream; diff --git a/src/main/java/org/apache/sysds/runtime/ooc/cache/legacy/OOCCacheScheduler.java b/src/main/java/org/apache/sysds/runtime/ooc/cache/legacy/OOCCacheScheduler.java index 1820f15e8ae..ad161e95303 100644 --- a/src/main/java/org/apache/sysds/runtime/ooc/cache/legacy/OOCCacheScheduler.java +++ b/src/main/java/org/apache/sysds/runtime/ooc/cache/legacy/OOCCacheScheduler.java @@ -23,7 +23,7 @@ import org.apache.sysds.runtime.instructions.spark.data.IndexedMatrixValue; import org.apache.sysds.runtime.ooc.cache.BlockEntry; import org.apache.sysds.runtime.ooc.cache.BlockKey; -import org.apache.sysds.runtime.ooc.cache.OOCIOHandler; +import org.apache.sysds.runtime.ooc.cache.io.OOCIOHandler; import org.apache.sysds.runtime.ooc.memory.InMemoryQueueCallback; import java.util.Collection; diff --git a/src/main/java/org/apache/sysds/runtime/ooc/cache/legacy/OOCLRUCacheScheduler.java b/src/main/java/org/apache/sysds/runtime/ooc/cache/legacy/OOCLRUCacheScheduler.java index 305a7419166..c1f7058b5dc 100644 --- a/src/main/java/org/apache/sysds/runtime/ooc/cache/legacy/OOCLRUCacheScheduler.java +++ b/src/main/java/org/apache/sysds/runtime/ooc/cache/legacy/OOCLRUCacheScheduler.java @@ -28,7 +28,7 @@ import org.apache.sysds.runtime.ooc.cache.BlockEntry; import org.apache.sysds.runtime.ooc.cache.BlockKey; import org.apache.sysds.runtime.ooc.cache.BlockState; -import org.apache.sysds.runtime.ooc.cache.OOCIOHandler; +import org.apache.sysds.runtime.ooc.cache.io.OOCIOHandler; import org.apache.sysds.runtime.ooc.memory.InMemoryQueueCallback; import org.apache.sysds.runtime.ooc.stats.OOCEventLog; import org.apache.sysds.utils.Statistics; diff --git a/src/main/java/org/apache/sysds/runtime/ooc/stream/SourceOOCStream.java b/src/main/java/org/apache/sysds/runtime/ooc/stream/SourceOOCStream.java index 553767ef8ce..0941cf0ea5c 100644 --- a/src/main/java/org/apache/sysds/runtime/ooc/stream/SourceOOCStream.java +++ b/src/main/java/org/apache/sysds/runtime/ooc/stream/SourceOOCStream.java @@ -25,7 +25,7 @@ import org.apache.sysds.runtime.instructions.ooc.SubscribableTaskQueue; import org.apache.sysds.runtime.instructions.spark.data.IndexedMatrixValue; import org.apache.sysds.runtime.ooc.cache.OOCCacheManager; -import org.apache.sysds.runtime.ooc.cache.OOCIOHandler; +import org.apache.sysds.runtime.ooc.cache.io.OOCIOHandler; import org.apache.sysds.runtime.ooc.stream.message.OOCStreamMessage; import org.apache.sysds.runtime.matrix.data.MatrixIndexes; diff --git a/src/test/java/org/apache/sysds/test/component/ooc/cache/OOCLRUCacheSchedulerTest.java b/src/test/java/org/apache/sysds/test/component/ooc/cache/OOCLRUCacheSchedulerTest.java index 527d89ec05f..002b19e57be 100644 --- a/src/test/java/org/apache/sysds/test/component/ooc/cache/OOCLRUCacheSchedulerTest.java +++ b/src/test/java/org/apache/sysds/test/component/ooc/cache/OOCLRUCacheSchedulerTest.java @@ -24,7 +24,7 @@ import org.apache.sysds.runtime.ooc.cache.BlockEntry; import org.apache.sysds.runtime.ooc.cache.BlockKey; import org.apache.sysds.runtime.ooc.cache.BlockState; -import org.apache.sysds.runtime.ooc.cache.OOCIOHandler; +import org.apache.sysds.runtime.ooc.cache.io.OOCIOHandler; import org.apache.sysds.runtime.ooc.cache.legacy.OOCLRUCacheScheduler; import org.junit.After; import org.junit.Assert; diff --git a/src/test/java/org/apache/sysds/test/component/ooc/cache/SourceBackedCacheSchedulerTest.java b/src/test/java/org/apache/sysds/test/component/ooc/cache/SourceBackedCacheSchedulerTest.java index 4d345601982..cc206bdff40 100644 --- a/src/test/java/org/apache/sysds/test/component/ooc/cache/SourceBackedCacheSchedulerTest.java +++ b/src/test/java/org/apache/sysds/test/component/ooc/cache/SourceBackedCacheSchedulerTest.java @@ -28,9 +28,9 @@ import org.apache.sysds.runtime.ooc.cache.BlockEntry; import org.apache.sysds.runtime.ooc.cache.BlockKey; import org.apache.sysds.runtime.ooc.cache.BlockState; -import org.apache.sysds.runtime.ooc.cache.OOCIOHandler; +import org.apache.sysds.runtime.ooc.cache.io.OOCIOHandler; import org.apache.sysds.runtime.ooc.cache.legacy.OOCLRUCacheScheduler; -import org.apache.sysds.runtime.ooc.cache.OOCMatrixIOHandler; +import org.apache.sysds.runtime.ooc.cache.io.OOCMatrixIOHandler; import org.apache.sysds.test.AutomatedTestBase; import org.apache.sysds.test.TestConfiguration; import org.apache.sysds.test.TestUtils; diff --git a/src/test/java/org/apache/sysds/test/component/ooc/cache/SourceBackedReadOOCIOHandlerTest.java b/src/test/java/org/apache/sysds/test/component/ooc/cache/SourceBackedReadOOCIOHandlerTest.java index 7c93af0ba09..a8de3cb7951 100644 --- a/src/test/java/org/apache/sysds/test/component/ooc/cache/SourceBackedReadOOCIOHandlerTest.java +++ b/src/test/java/org/apache/sysds/test/component/ooc/cache/SourceBackedReadOOCIOHandlerTest.java @@ -28,8 +28,8 @@ import org.apache.sysds.runtime.ooc.cache.BlockEntry; import org.apache.sysds.runtime.ooc.cache.BlockKey; import org.apache.sysds.runtime.ooc.cache.BlockState; -import org.apache.sysds.runtime.ooc.cache.OOCIOHandler; -import org.apache.sysds.runtime.ooc.cache.OOCMatrixIOHandler; +import org.apache.sysds.runtime.ooc.cache.io.OOCIOHandler; +import org.apache.sysds.runtime.ooc.cache.io.OOCMatrixIOHandler; import org.apache.sysds.test.AutomatedTestBase; import org.apache.sysds.test.TestConfiguration; import org.apache.sysds.test.TestUtils; diff --git a/src/test/java/org/apache/sysds/test/functions/ooc/SourceReadOOCIOHandlerTest.java b/src/test/java/org/apache/sysds/test/functions/ooc/SourceReadOOCIOHandlerTest.java index 34dd01d6620..e1ec384a310 100644 --- a/src/test/java/org/apache/sysds/test/functions/ooc/SourceReadOOCIOHandlerTest.java +++ b/src/test/java/org/apache/sysds/test/functions/ooc/SourceReadOOCIOHandlerTest.java @@ -23,8 +23,8 @@ import org.apache.sysds.runtime.instructions.ooc.SubscribableTaskQueue; import org.apache.sysds.runtime.instructions.spark.data.IndexedMatrixValue; import org.apache.sysds.runtime.matrix.data.MatrixBlock; -import org.apache.sysds.runtime.ooc.cache.OOCIOHandler; -import org.apache.sysds.runtime.ooc.cache.OOCMatrixIOHandler; +import org.apache.sysds.runtime.ooc.cache.io.OOCIOHandler; +import org.apache.sysds.runtime.ooc.cache.io.OOCMatrixIOHandler; import org.apache.sysds.runtime.controlprogram.parfor.LocalTaskQueue; import org.apache.sysds.runtime.io.MatrixWriter; import org.apache.sysds.runtime.io.MatrixWriterFactory;