Skip to content

Commit d42041e

Browse files
committed
Fixes.
1 parent 5f959f4 commit d42041e

File tree

5 files changed

+20
-8
lines changed

5 files changed

+20
-8
lines changed

std-bits/table/src/main/java/org/enso/table/data/column/builder/DoubleBuilder.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import java.nio.ByteBuffer;
77
import java.nio.ByteOrder;
88
import java.nio.DoubleBuffer;
9-
import java.time.ZonedDateTime;
109
import org.enso.base.polyglot.NumericConverter;
1110
import org.enso.table.data.column.storage.ColumnStorage;
1211
import org.enso.table.data.column.storage.DoubleStorage;
@@ -34,8 +33,6 @@ private DoubleBuilder(
3433
DoubleBuffer buf, int initialSize, long validity, ProblemAggregator problemAggregator) {
3534
super(initialSize, validity);
3635

37-
var zonedDT = ZonedDateTime.now();
38-
3936
assert ByteOrder.LITTLE_ENDIAN == buf.order();
4037
this.data = buf;
4138
precisionLossAggregator =

std-bits/table/src/main/java/org/enso/table/data/column/builder/TimeOfDayBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public boolean accepts(Object o) {
5858
return o instanceof LocalTime;
5959
}
6060

61-
final Storage<LocalTime> seal(ColumnStorage<?> otherStorage, TimeOfDayType type) {
61+
Storage<LocalTime> seal(ColumnStorage<?> otherStorage, TimeOfDayType type) {
6262
return new TypedStorage<>(type, data, otherStorage);
6363
}
6464
}

std-bits/table/src/main/java/org/enso/table/data/column/builder/TypedBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void appendBulkStorage(ColumnStorage<?> storage) {
5252
}
5353

5454
var type = StorageType.ofStorage(storage);
55-
if (type.equals(storageType)) {
55+
if (type.equals(getStorageType())) {
5656
if (storage instanceof TypedStorage<?>) {
5757
// This cast is safe, because storage.getType() == this.getType() iff storage.T == this.T
5858
@SuppressWarnings("unchecked")
@@ -70,7 +70,7 @@ public void appendBulkStorage(ColumnStorage<?> storage) {
7070
} else if (type instanceof NullType) {
7171
appendNulls(Math.toIntExact(storage.getSize()));
7272
} else {
73-
throw new StorageTypeMismatchException(storageType, type);
73+
throw new StorageTypeMismatchException(getStorageType(), type);
7474
}
7575
}
7676

std-bits/table/src/main/java/org/enso/table/data/column/operation/IsInOperation.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,18 @@
1515
import org.enso.table.data.column.storage.ColumnStorage;
1616
import org.enso.table.data.column.storage.ColumnStorageWithInferredStorage;
1717
import org.enso.table.data.column.storage.ColumnStorageWithValidityMap;
18-
import org.enso.table.data.column.storage.type.*;
18+
import org.enso.table.data.column.storage.type.AnyObjectType;
19+
import org.enso.table.data.column.storage.type.BigDecimalType;
20+
import org.enso.table.data.column.storage.type.BigIntegerType;
21+
import org.enso.table.data.column.storage.type.BooleanType;
22+
import org.enso.table.data.column.storage.type.DateTimeType;
23+
import org.enso.table.data.column.storage.type.DateType;
24+
import org.enso.table.data.column.storage.type.FloatType;
25+
import org.enso.table.data.column.storage.type.IntegerType;
26+
import org.enso.table.data.column.storage.type.NullType;
27+
import org.enso.table.data.column.storage.type.StorageType;
28+
import org.enso.table.data.column.storage.type.TextType;
29+
import org.enso.table.data.column.storage.type.TimeOfDayType;
1930
import org.enso.table.data.table.Column;
2031
import org.enso.table.data.table.problems.MapOperationProblemAggregator;
2132
import org.enso.table.util.ImmutableBitSet;

std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToIntegerStorageConverter.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
import org.enso.base.polyglot.NumericConverter;
66
import org.enso.table.data.column.builder.Builder;
77
import org.enso.table.data.column.operation.StorageIterators;
8-
import org.enso.table.data.column.storage.*;
8+
import org.enso.table.data.column.storage.AbstractLongStorage;
9+
import org.enso.table.data.column.storage.ColumnBooleanStorage;
10+
import org.enso.table.data.column.storage.ColumnDoubleStorage;
11+
import org.enso.table.data.column.storage.ColumnLongStorage;
12+
import org.enso.table.data.column.storage.ColumnStorage;
913
import org.enso.table.data.column.storage.type.AnyObjectType;
1014
import org.enso.table.data.column.storage.type.BigDecimalType;
1115
import org.enso.table.data.column.storage.type.BigIntegerType;

0 commit comments

Comments
 (0)