Skip to content

Commit 2c6e440

Browse files
committed
Fix Formatting
1 parent 8025025 commit 2c6e440

2 files changed

Lines changed: 15 additions & 11 deletions

File tree

src/main/java/org/apache/sysds/runtime/instructions/ooc/CachingStream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public CachingStream(OOCStream<IndexedMatrixValue> source, long streamId) {
134134
mCallback = tmp.keepOpen();
135135
}
136136
else {
137-
List<IndexedMatrixValue> values = new java.util.ArrayList<>(groupSize);
137+
List<IndexedMatrixValue> values = new ArrayList<>(groupSize);
138138
long totalSize = 0;
139139
for(int gi = 0; gi < groupSize; gi++) {
140140
OOCStream.QueueCallback<IndexedMatrixValue> sub = group.getCallback(gi);

src/main/java/org/apache/sysds/runtime/ooc/cache/OOCIOHandler.java

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919

2020
package org.apache.sysds.runtime.ooc.cache;
2121

22+
import org.apache.sysds.common.Types;
23+
import org.apache.sysds.runtime.instructions.ooc.OOCStream;
24+
import org.apache.sysds.runtime.instructions.spark.data.IndexedMatrixValue;
25+
import org.apache.sysds.runtime.matrix.data.MatrixIndexes;
26+
2227
import java.util.concurrent.CompletableFuture;
2328
import java.util.List;
2429

@@ -58,18 +63,18 @@ interface SourceReadContinuation {}
5863

5964
class SourceReadRequest {
6065
public final String path;
61-
public final org.apache.sysds.common.Types.FileFormat format;
66+
public final Types.FileFormat format;
6267
public final long rows;
6368
public final long cols;
6469
public final int blen;
6570
public final long estNnz;
6671
public final long maxBytesInFlight;
6772
public final boolean keepOpenOnLimit;
68-
public final org.apache.sysds.runtime.instructions.ooc.OOCStream<org.apache.sysds.runtime.instructions.spark.data.IndexedMatrixValue> target;
73+
public final OOCStream<IndexedMatrixValue> target;
6974

70-
public SourceReadRequest(String path, org.apache.sysds.common.Types.FileFormat format, long rows, long cols,
75+
public SourceReadRequest(String path, Types.FileFormat format, long rows, long cols,
7176
int blen, long estNnz, long maxBytesInFlight, boolean keepOpenOnLimit,
72-
org.apache.sysds.runtime.instructions.ooc.OOCStream<org.apache.sysds.runtime.instructions.spark.data.IndexedMatrixValue> target) {
77+
OOCStream<IndexedMatrixValue> target) {
7378
this.path = path;
7479
this.format = format;
7580
this.rows = rows;
@@ -99,14 +104,14 @@ public SourceReadResult(long bytesRead, boolean eof, SourceReadContinuation cont
99104

100105
class SourceBlockDescriptor {
101106
public final String path;
102-
public final org.apache.sysds.common.Types.FileFormat format;
103-
public final org.apache.sysds.runtime.matrix.data.MatrixIndexes indexes;
107+
public final Types.FileFormat format;
108+
public final MatrixIndexes indexes;
104109
public final long offset;
105110
public final int recordLength;
106111
public final long serializedSize;
107112

108-
public SourceBlockDescriptor(String path, org.apache.sysds.common.Types.FileFormat format,
109-
org.apache.sysds.runtime.matrix.data.MatrixIndexes indexes, long offset, int recordLength,
113+
public SourceBlockDescriptor(String path, Types.FileFormat format,
114+
MatrixIndexes indexes, long offset, int recordLength,
110115
long serializedSize) {
111116
this.path = path;
112117
this.format = format;
@@ -121,8 +126,7 @@ class GroupSourceBlockDescriptor extends SourceBlockDescriptor {
121126
public final List<SourceBlockDescriptor> blocks;
122127
public final int count;
123128

124-
public GroupSourceBlockDescriptor(String path, org.apache.sysds.common.Types.FileFormat format,
125-
org.apache.sysds.runtime.matrix.data.MatrixIndexes indexes, long offset, int recordLength,
129+
public GroupSourceBlockDescriptor(String path, Types.FileFormat format, MatrixIndexes indexes, long offset, int recordLength,
126130
long serializedSize, List<SourceBlockDescriptor> blocks) {
127131
super(path, format, indexes, offset, recordLength, serializedSize);
128132
this.blocks = blocks;

0 commit comments

Comments
 (0)