diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/SQL_Type.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/SQL_Type.enso index 101a544d2ef7..2ef1b8870bb1 100644 --- a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/SQL_Type.enso +++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/SQL_Type.enso @@ -28,7 +28,6 @@ type SQL_Type null : SQL_Type null = SQL_Type.Value Types.NULL "NULL" - ## PRIVATE Constructs a `SQL_Type` from a `ResultSetMetaData` object. from_metadata metadata ix = diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/builder/object/InferredBuilder.java b/std-bits/table/src/main/java/org/enso/table/data/column/builder/object/InferredBuilder.java index 35df388199a9..30bb22802ff0 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/builder/object/InferredBuilder.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/builder/object/InferredBuilder.java @@ -116,13 +116,15 @@ private record RetypeInfo(Class clazz, StorageType type) {} new RetypeInfo(Long.class, Constants.INTEGER_64), new RetypeInfo(Double.class, Constants.FLOAT_64), new RetypeInfo(String.class, Constants.STRING), - // TODO [RW] I think BigDecimals should not be coerced to floats, we should add Decimal support to in-memory tables at some point - //new RetypeInfo(BigDecimal.class, StorageType.FLOAT_64), + // TODO [RW] I think BigDecimals should not be coerced to floats, we should add Decimal + // support to in-memory tables at some point + // new RetypeInfo(BigDecimal.class, StorageType.FLOAT_64), new RetypeInfo(LocalDate.class, Constants.DATE), new RetypeInfo(LocalTime.class, Constants.TIME_OF_DAY), new RetypeInfo(ZonedDateTime.class, Constants.DATE_TIME), new RetypeInfo(Float.class, Constants.FLOAT_64), - // Smaller integer types are upcast to 64-bit integers by default anyway. This logic does not apply only if a specific type is requested (so not in inferred builder). + // Smaller integer types are upcast to 64-bit integers by default anyway. This logic does + // not apply only if a specific type is requested (so not in inferred builder). new RetypeInfo(Integer.class, Constants.INTEGER_64), new RetypeInfo(Short.class, Constants.INTEGER_64), new RetypeInfo(Byte.class, Constants.INTEGER_64)); diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/builder/object/TypedBuilder.java b/std-bits/table/src/main/java/org/enso/table/data/column/builder/object/TypedBuilder.java index de0200951473..5ede18233440 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/builder/object/TypedBuilder.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/builder/object/TypedBuilder.java @@ -20,8 +20,8 @@ public abstract class TypedBuilder extends Builder { public abstract boolean canRetypeTo(StorageType type); /** - * Retype this builder to the given type. Can only be called if {@link #canRetypeTo(StorageType)} returns - * true for the type. + * Retype this builder to the given type. Can only be called if {@link #canRetypeTo(StorageType)} + * returns true for the type. * * @param type the target type * @return a retyped builder diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/DoubleStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/DoubleStorage.java index 240f6c0bfdbf..10a77a2f433e 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/DoubleStorage.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/DoubleStorage.java @@ -73,9 +73,7 @@ public Double getItemBoxed(int idx) { return isMissing.get(idx) ? null : Double.longBitsToDouble(data[idx]); } - /** - * @inheritDoc - */ + /** @inheritDoc */ @Override public StorageType getType() { return Constants.FLOAT_64; diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/LongStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/LongStorage.java index f8860d64d9bc..fa15243deabb 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/LongStorage.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/LongStorage.java @@ -20,9 +20,9 @@ /** A column storing 64-bit integers. */ public final class LongStorage extends NumericStorage { - // TODO at some point we will want to add separate storage classes for byte, short and int, for more compact - // storage and more efficient handling of smaller integers; for now we will be handling this just by checking the - // bounds + // TODO [RW] at some point we will want to add separate storage classes for byte, short and int, + // for more compact storage and more efficient handling of smaller integers; for now we will be + // handling this just by checking the bounds private final long[] data; private final BitSet isMissing; private final int size; @@ -80,18 +80,14 @@ public Long getItemBoxed(int idx) { return isMissing.get(idx) ? null : data[idx]; } - /** - * @inheritDoc - */ + /** @inheritDoc */ @Override public StorageType getType() { // TODO add possibility to set integer bit limit return Constants.INTEGER_64; } - /** - * @inheritDoc - */ + /** @inheritDoc */ @Override public boolean isNa(long idx) { return isMissing.get((int) idx); diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/MixedStorageFacade.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/MixedStorageFacade.java index 4be6c9c062f0..6e9ec825a118 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/MixedStorageFacade.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/MixedStorageFacade.java @@ -12,6 +12,7 @@ public class MixedStorageFacade extends Storage { private final Storage underlyingStorage; + public MixedStorageFacade(Storage storage) { underlyingStorage = storage; } @@ -47,12 +48,14 @@ public boolean isOpVectorized(String name) { } @Override - protected Storage runVectorizedMap(String name, Object argument, MapOperationProblemBuilder problemBuilder) { + protected Storage runVectorizedMap( + String name, Object argument, MapOperationProblemBuilder problemBuilder) { return underlyingStorage.runVectorizedMap(name, argument, problemBuilder); } @Override - protected Storage runVectorizedZip(String name, Storage argument, MapOperationProblemBuilder problemBuilder) { + protected Storage runVectorizedZip( + String name, Storage argument, MapOperationProblemBuilder problemBuilder) { return underlyingStorage.runVectorizedZip(name, argument, problemBuilder); } diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/Storage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/Storage.java index f7877b8c8a71..d2e8c986bb37 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/Storage.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/Storage.java @@ -23,7 +23,7 @@ public abstract class Storage { /** @return the number of NA elements in this column */ public abstract int countMissing(); - /** @return the type tag of this column's storage.*/ + /** @return the type tag of this column's storage. */ public abstract StorageType getType(); /** @@ -245,8 +245,8 @@ protected final Storage fillMissingHelper(Value arg, Builder builder) { * counts[i]}. * * @param counts the mask specifying elements duplication - * @param total the sum of all elements in the mask, also interpreted as the length of the resulting - * storage + * @param total the sum of all elements in the mask, also interpreted as the length of the + * resulting storage * @return the storage masked according to the specified rules */ public abstract Storage countMask(int[] counts, int total); diff --git a/std-bits/table/src/main/java/org/enso/table/data/index/Index.java b/std-bits/table/src/main/java/org/enso/table/data/index/Index.java index 70fbe10c7520..2cf0b37df445 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/index/Index.java +++ b/std-bits/table/src/main/java/org/enso/table/data/index/Index.java @@ -66,8 +66,8 @@ public abstract class Index { * consecutive copies of the i-th element of the original index should be {@code counts[i]}. * * @param counts the mask specifying elements duplication - * @param total the sum of all elements in the mask, also interpreted as the length of the resulting - * index + * @param total the sum of all elements in the mask, also interpreted as the length of the + * resulting index * @return the index masked according to the specified rules */ public abstract Index countMask(int[] counts, int total); diff --git a/std-bits/table/src/main/java/org/enso/table/data/table/join/IndexJoin.java b/std-bits/table/src/main/java/org/enso/table/data/table/join/IndexJoin.java index f365e1f9ef83..4d0a2d71f08f 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/table/join/IndexJoin.java +++ b/std-bits/table/src/main/java/org/enso/table/data/table/join/IndexJoin.java @@ -15,7 +15,8 @@ public class IndexJoin implements JoinStrategy { private record HashEqualityCondition( - Column left, Column right, TextFoldingStrategy textFoldingStrategy) {} + Column left, Column right, TextFoldingStrategy textFoldingStrategy) { + } @Override public JoinResult join(Table left, Table right, List conditions) {