Skip to content

Commit 8447ce0

Browse files
committed
style: fix checkstyle and forbidden-apis violations (imports, argument line breaking, DateTimes.utc, Maps.newHashMapWithExpectedSize)
1 parent 2339330 commit 8447ce0

2 files changed

Lines changed: 40 additions & 15 deletions

File tree

extensions-contrib/druid-iceberg-extensions/src/main/java/org/apache/druid/iceberg/input/IcebergArrowInputSourceReader.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
package org.apache.druid.iceberg.input;
2121

22+
import com.google.common.collect.Maps;
2223
import org.apache.arrow.vector.BigIntVector;
2324
import org.apache.arrow.vector.BitVector;
2425
import org.apache.arrow.vector.DateDayVector;
@@ -29,14 +30,14 @@
2930
import org.apache.arrow.vector.Float8Vector;
3031
import org.apache.arrow.vector.IntVector;
3132
import org.apache.arrow.vector.SmallIntVector;
33+
import org.apache.arrow.vector.TimeMicroVector;
3234
import org.apache.arrow.vector.TimeStampMicroTZVector;
3335
import org.apache.arrow.vector.TimeStampMicroVector;
34-
import org.apache.arrow.vector.TimeStampNanoTZVector;
35-
import org.apache.arrow.vector.TimeStampNanoVector;
3636
import org.apache.arrow.vector.TimeStampMilliTZVector;
3737
import org.apache.arrow.vector.TimeStampMilliVector;
38+
import org.apache.arrow.vector.TimeStampNanoTZVector;
39+
import org.apache.arrow.vector.TimeStampNanoVector;
3840
import org.apache.arrow.vector.TinyIntVector;
39-
import org.apache.arrow.vector.TimeMicroVector;
4041
import org.apache.arrow.vector.VarBinaryVector;
4142
import org.apache.arrow.vector.VarCharVector;
4243
import org.apache.druid.data.input.InputRow;
@@ -46,7 +47,6 @@
4647
import org.apache.druid.data.input.InputStats;
4748
import org.apache.druid.data.input.MapBasedInputRow;
4849
import org.apache.druid.iceberg.filter.IcebergFilter;
49-
import org.apache.druid.java.util.common.RE;
5050
import org.apache.druid.java.util.common.parsers.CloseableIterator;
5151
import org.apache.iceberg.CombinedScanTask;
5252
import org.apache.iceberg.Table;
@@ -61,7 +61,6 @@
6161
import java.io.IOException;
6262
import java.nio.charset.StandardCharsets;
6363
import java.util.ArrayList;
64-
import java.util.HashMap;
6564
import java.util.List;
6665
import java.util.Map;
6766
import java.util.NoSuchElementException;
@@ -183,7 +182,7 @@ private TableScan buildScan()
183182
private InputRow batchRowToInputRow(final ColumnarBatch batch, final int rowIdx)
184183
{
185184
final int numCols = batch.numCols();
186-
final Map<String, Object> event = new HashMap<>(numCols);
185+
final Map<String, Object> event = Maps.newHashMapWithExpectedSize(numCols);
187186
for (int col = 0; col < numCols; col++) {
188187
final FieldVector vec = batch.column(col).getFieldVector();
189188
if (!vec.isNull(rowIdx)) {

extensions-contrib/druid-iceberg-extensions/src/test/java/org/apache/druid/iceberg/input/IcebergArrowInputSourceReaderTest.java

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.apache.druid.data.input.impl.StringDimensionSchema;
2828
import org.apache.druid.data.input.impl.TimestampSpec;
2929
import org.apache.druid.iceberg.filter.IcebergEqualsFilter;
30+
import org.apache.druid.java.util.common.DateTimes;
3031
import org.apache.druid.java.util.common.FileUtils;
3132
import org.apache.druid.java.util.common.parsers.CloseableIterator;
3233
import org.apache.iceberg.DataFile;
@@ -106,7 +107,12 @@ public void testBasicRead() throws IOException
106107
writeRows(table, row(1_000L, "alice", 1.1), row(2_000L, "bob", 2.2), row(3_000L, "carol", 3.3));
107108

108109
final IcebergArrowInputSourceReader reader = new IcebergArrowInputSourceReader(
109-
table, null, null, true, INPUT_SCHEMA, IcebergArrowInputSourceReader.DEFAULT_BATCH_SIZE
110+
table,
111+
null,
112+
null,
113+
true,
114+
INPUT_SCHEMA,
115+
IcebergArrowInputSourceReader.DEFAULT_BATCH_SIZE
110116
);
111117

112118
final List<InputRow> rows = readAll(reader);
@@ -126,7 +132,12 @@ public void testEmptyTable() throws IOException
126132
final Table table = catalog.retrieveTable(NAMESPACE, TABLE);
127133

128134
final IcebergArrowInputSourceReader reader = new IcebergArrowInputSourceReader(
129-
table, null, null, true, INPUT_SCHEMA, IcebergArrowInputSourceReader.DEFAULT_BATCH_SIZE
135+
table,
136+
null,
137+
null,
138+
true,
139+
INPUT_SCHEMA,
140+
IcebergArrowInputSourceReader.DEFAULT_BATCH_SIZE
130141
);
131142

132143
final List<InputRow> rows = readAll(reader);
@@ -175,7 +186,12 @@ public void testColumnPruning() throws IOException
175186
);
176187

177188
final IcebergArrowInputSourceReader reader = new IcebergArrowInputSourceReader(
178-
table, null, null, true, pruned, IcebergArrowInputSourceReader.DEFAULT_BATCH_SIZE
189+
table,
190+
null,
191+
null,
192+
true,
193+
pruned,
194+
IcebergArrowInputSourceReader.DEFAULT_BATCH_SIZE
179195
);
180196

181197
final List<InputRow> rows = readAll(reader);
@@ -196,29 +212,34 @@ public void testLargeBatch() throws IOException
196212
writeRows(table, data);
197213

198214
final IcebergArrowInputSourceReader reader = new IcebergArrowInputSourceReader(
199-
table, null, null, true, INPUT_SCHEMA, IcebergArrowInputSourceReader.DEFAULT_BATCH_SIZE
215+
table,
216+
null,
217+
null,
218+
true,
219+
INPUT_SCHEMA,
220+
IcebergArrowInputSourceReader.DEFAULT_BATCH_SIZE
200221
);
201222

202223
final List<InputRow> rows = readAll(reader);
203224
Assert.assertEquals(count, rows.size());
204225
}
205226

206227
@Test
207-
public void testSnapshotTime() throws IOException
228+
public void testSnapshotTime() throws IOException, InterruptedException
208229
{
209230
final Table table = catalog.retrieveCatalog().createTable(tableId, SCHEMA);
210231
writeRows(table, row(1_000L, "snap1", 1.0));
211232
final long afterFirstSnapshot = System.currentTimeMillis();
212233

213234
// Small sleep to ensure second snapshot has later timestamp
214-
try { Thread.sleep(10); } catch (InterruptedException ignored) { }
235+
Thread.sleep(10);
215236
writeRows(table, row(2_000L, "snap2", 2.0));
216237

217238
// Read as-of the first snapshot — should only see 1 row.
218239
final IcebergArrowInputSourceReader reader = new IcebergArrowInputSourceReader(
219240
table,
220241
null,
221-
new org.joda.time.DateTime(afterFirstSnapshot),
242+
DateTimes.utc(afterFirstSnapshot),
222243
true,
223244
INPUT_SCHEMA,
224245
IcebergArrowInputSourceReader.DEFAULT_BATCH_SIZE
@@ -277,9 +298,14 @@ private static List<InputRow> readAll(final IcebergArrowInputSourceReader reader
277298
private static final class NoopInputStats implements org.apache.druid.data.input.InputStats
278299
{
279300
@Override
280-
public void incrementProcessedBytes(final long v) {}
301+
public void incrementProcessedBytes(final long v)
302+
{
303+
}
281304

282305
@Override
283-
public long getProcessedBytes() { return 0; }
306+
public long getProcessedBytes()
307+
{
308+
return 0;
309+
}
284310
}
285311
}

0 commit comments

Comments
 (0)