diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Column.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Column.enso index 7b70baaf0afb..955e12a78031 100644 --- a/distribution/lib/Standard/Table/0.0.0-dev/src/Column.enso +++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Column.enso @@ -1506,7 +1506,7 @@ type Column builder = make_string_builder length 0.up_to length . each i-> - replaced = do_replace i (storage.getItemBoxed i) + replaced = do_replace i (storage.getBoxed i) builder.append replaced Column.from_storage new_name builder.seal @@ -2293,7 +2293,7 @@ type Column valid_index = (index >= 0) && (index < self.length) if valid_index.not then default else storage = self.java_column.getStorage - java_to_enso <| storage.getItemBoxed index + java_to_enso <| storage.getBoxed index ## PRIVATE ICON data_input @@ -2362,7 +2362,7 @@ type Column to_js_object self = name = self.java_column.getName storage = self.java_column.getStorage - storage_proxy = Array_Proxy.new storage.size i-> storage.getItemBoxed i + storage_proxy = Array_Proxy.new storage.size i-> storage.getBoxed i storage_json = Vector.from_polyglot_array storage_proxy JS_Object.from_pairs [["name", name], ["data", storage_json]] @@ -2858,7 +2858,7 @@ wrap_text_argument_as_value_provider val = text : Text -> (_-> text) col : Column -> storage = col.java_column.getStorage - i-> storage.getItemBoxed i + i-> storage.getBoxed i ## PRIVATE wrap_text_or_regex_argument_as_value_provider val = diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Column_Ops.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Column_Ops.enso index 8fdb5d2ccb0d..a47aea9aaa1a 100644 --- a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Column_Ops.enso +++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Column_Ops.enso @@ -15,7 +15,7 @@ map_over_storage input_column function builder skip_nothing=True on_problems:Pro num_input_rows = input_storage.size output_storage_builder = builder num_input_rows 0.up_to num_input_rows . each i-> - input_value = input_storage.getItemBoxed i + input_value = input_storage.getBoxed i if skip_nothing && input_value.is_nothing then output_storage_builder.append Nothing else output_value = function input_value . catch Any err-> problem_builder.report_other_warning err @@ -41,8 +41,8 @@ map_2_over_storage input_column_0 input_column_1 function builder skip_nothing=T num_input_rows = input_storage_0.size output_storage_builder = builder num_input_rows ok = 0.up_to num_input_rows . each_propagate i-> - input_value_0 = input_storage_0.getItemBoxed i - input_value_1 = input_storage_1.getItemBoxed i + input_value_0 = input_storage_0.getBoxed i + input_value_1 = input_storage_1.getBoxed i if skip_nothing && input_value_0.is_nothing then output_storage_builder.append Nothing else output_value = function input_value_0 input_value_1 output_storage_builder.append output_value diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Display_Helpers.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Display_Helpers.enso index 04c753efc74e..7647368978f6 100644 --- a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Display_Helpers.enso +++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Display_Helpers.enso @@ -89,7 +89,7 @@ ansi_bold enabled txt = ## PRIVATE Gets a textual representation of the item at position `ix` in `storage`. private _get_item_as_text storage ix = - item = storage.getItemBoxed ix + item = storage.getBoxed ix ## Special handling for display of Text to avoid quotes when not necessary. case item of _ : Text -> _normalize_text_for_display item diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Fan_Out.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Fan_Out.enso index 31a08235ba55..1028fc28c8d1 100644 --- a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Fan_Out.enso +++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Fan_Out.enso @@ -152,7 +152,7 @@ fan_out_to_rows_and_columns_fixed input_storage function at_least_one_row:Boolea maybe_add_empty_row vecs = if vecs.is_empty && at_least_one_row then empty_row else vecs 0.up_to num_input_rows . each i-> - input_value = input_storage.getItemBoxed i + input_value = input_storage.getBoxed i output_values = maybe_add_empty_row (function input_value) output_values.each row_unchecked-> @@ -192,7 +192,7 @@ fan_out_to_rows_and_columns_dynamic input_storage function at_least_one_row colu [Vector.fill output_column_builders.length Nothing] 0.up_to num_input_rows . each i-> - input_value = input_storage.getItemBoxed i + input_value = input_storage.getBoxed i output_values = maybe_add_empty_row (function input_value) # get the column names for the row. @@ -250,7 +250,7 @@ map_columns_to_multiple input_column function column_count column_builder=make_s builders = Builder.new 0.up_to num_rows . each i-> - input_value = input_storage.getItemBoxed i + input_value = input_storage.getBoxed i output_values = function input_value # Add more builders if necessary to accommodate `output_values`. @@ -276,7 +276,7 @@ map_columns_to_multiple input_column function column_count column_builder=make_s builders = Vector.new column_count (_-> column_builder num_rows) output_lengths = 0.up_to num_rows . map i-> - input_value = input_storage.getItemBoxed i + input_value = input_storage.getBoxed i output_values = function input_value ## Add `output_values` to builders; if there are more builders diff --git a/std-bits/table/src/main/java/org/enso/table/aggregations/Concatenate.java b/std-bits/table/src/main/java/org/enso/table/aggregations/Concatenate.java index 4bf3e917946e..36fcdfa3e408 100644 --- a/std-bits/table/src/main/java/org/enso/table/aggregations/Concatenate.java +++ b/std-bits/table/src/main/java/org/enso/table/aggregations/Concatenate.java @@ -35,11 +35,11 @@ public Object aggregate(List indexes, ProblemAggregator problemAggregat Context context = Context.getCurrent(); StringBuilder current = null; for (int row : indexes) { - Object value = storage.getItemBoxed(row); + Object value = storage.getBoxed(row); if (value == null || value instanceof String) { String textValue = toQuotedString(value, quote, separator); - if (!separator.equals("") && quote.equals("") && textValue.contains(separator)) { + if (!separator.isEmpty() && quote.isEmpty() && textValue.contains(separator)) { innerAggregator.reportColumnAggregatedProblem( new UnquotedDelimiter(this.getName(), row, "Unquoted delimiter.")); } diff --git a/std-bits/table/src/main/java/org/enso/table/aggregations/CountEmpty.java b/std-bits/table/src/main/java/org/enso/table/aggregations/CountEmpty.java index 3d23f5ed7147..b6522169977d 100644 --- a/std-bits/table/src/main/java/org/enso/table/aggregations/CountEmpty.java +++ b/std-bits/table/src/main/java/org/enso/table/aggregations/CountEmpty.java @@ -37,7 +37,7 @@ public Object aggregate(List indexes, ProblemAggregator problemAggregat Context context = Context.getCurrent(); int count = 0; for (int row : indexes) { - Object value = storage.getItemBoxed(row); + Object value = storage.getBoxed(row); if (value == null) { count += isEmpty ? 1 : 0; } else if (value instanceof String asString) { diff --git a/std-bits/table/src/main/java/org/enso/table/aggregations/CountNothing.java b/std-bits/table/src/main/java/org/enso/table/aggregations/CountNothing.java index f9c711fd84a2..05da4d5b74cb 100644 --- a/std-bits/table/src/main/java/org/enso/table/aggregations/CountNothing.java +++ b/std-bits/table/src/main/java/org/enso/table/aggregations/CountNothing.java @@ -33,7 +33,7 @@ public Object aggregate(List indexes, ProblemAggregator problemAggregat Context context = Context.getCurrent(); long count = 0; for (int row : indexes) { - count += ((storage.getItemBoxed(row) == null) == isNothing ? 1L : 0L); + count += ((storage.getBoxed(row) == null) == isNothing ? 1L : 0L); context.safepoint(); } return count; diff --git a/std-bits/table/src/main/java/org/enso/table/aggregations/First.java b/std-bits/table/src/main/java/org/enso/table/aggregations/First.java index b87f498e48b2..5164a60b7585 100644 --- a/std-bits/table/src/main/java/org/enso/table/aggregations/First.java +++ b/std-bits/table/src/main/java/org/enso/table/aggregations/First.java @@ -53,7 +53,7 @@ private Object firstBySpecifiedOrder(List indexes) { Context context = Context.getCurrent(); for (int row : indexes) { - Object value = storage.getItemBoxed(row); + Object value = storage.getBoxed(row); if (ignoreNothing && value == null) { continue; } @@ -62,7 +62,7 @@ private Object firstBySpecifiedOrder(List indexes) { new OrderedMultiValueKey(this.orderByColumns, row, this.orderByDirections); if (key == null || key.compareTo(newKey) > 0) { key = newKey; - current = storage.getItemBoxed(row); + current = storage.getBoxed(row); } context.safepoint(); @@ -74,7 +74,7 @@ private Object firstBySpecifiedOrder(List indexes) { private Object firstByRowOrder(List indexes) { Context context = Context.getCurrent(); for (int row : indexes) { - Object value = storage.getItemBoxed(row); + Object value = storage.getBoxed(row); if (!ignoreNothing || value != null) { return value; } diff --git a/std-bits/table/src/main/java/org/enso/table/aggregations/GroupBy.java b/std-bits/table/src/main/java/org/enso/table/aggregations/GroupBy.java index 6377f6f94f10..3529fe17cf1f 100644 --- a/std-bits/table/src/main/java/org/enso/table/aggregations/GroupBy.java +++ b/std-bits/table/src/main/java/org/enso/table/aggregations/GroupBy.java @@ -16,6 +16,6 @@ public GroupBy(String name, Column column) { @Override public Object aggregate(List indexes, ProblemAggregator problemAggregator) { - return indexes.isEmpty() ? null : storage.getItemBoxed(indexes.get(0)); + return indexes.isEmpty() ? null : storage.getBoxed(indexes.getFirst()); } } diff --git a/std-bits/table/src/main/java/org/enso/table/aggregations/Last.java b/std-bits/table/src/main/java/org/enso/table/aggregations/Last.java index a69d99031043..f3508303635d 100644 --- a/std-bits/table/src/main/java/org/enso/table/aggregations/Last.java +++ b/std-bits/table/src/main/java/org/enso/table/aggregations/Last.java @@ -53,7 +53,7 @@ private Object lastBySpecifiedOrder(List indexes) { Context context = Context.getCurrent(); for (int i = indexes.size() - 1; i >= 0; i--) { int row = indexes.get(i); - Object value = storage.getItemBoxed(row); + Object value = storage.getBoxed(row); if (ignoreNothing && value == null) { continue; } @@ -62,7 +62,7 @@ private Object lastBySpecifiedOrder(List indexes) { new OrderedMultiValueKey(this.orderByColumns, row, this.orderByDirections); if (key == null || key.compareTo(newKey) < 0) { key = newKey; - current = storage.getItemBoxed(row); + current = storage.getBoxed(row); } context.safepoint(); @@ -74,7 +74,7 @@ private Object lastBySpecifiedOrder(List indexes) { private Object lastByRowOrder(List indexes) { Context context = Context.getCurrent(); for (int i = indexes.size() - 1; i >= 0; i--) { - Object value = storage.getItemBoxed(indexes.get(i)); + Object value = storage.getBoxed(indexes.get(i)); if (!ignoreNothing || value != null) { return value; } diff --git a/std-bits/table/src/main/java/org/enso/table/aggregations/Mean.java b/std-bits/table/src/main/java/org/enso/table/aggregations/Mean.java index 4b8f05727696..08dca5b60580 100644 --- a/std-bits/table/src/main/java/org/enso/table/aggregations/Mean.java +++ b/std-bits/table/src/main/java/org/enso/table/aggregations/Mean.java @@ -99,7 +99,7 @@ void accumulate( ColumnAggregatedProblemAggregator innerAggregator = new ColumnAggregatedProblemAggregator(problemAggregator); for (int i : indexes) { - Object value = storage.getItemBoxed(i); + Object value = storage.getBoxed(i); if (value != null) { Double dValue = NumericConverter.tryConvertingToDouble(value); if (dValue == null) { @@ -133,7 +133,7 @@ void accumulate( new ColumnAggregatedProblemAggregator(problemAggregator); Context context = Context.getCurrent(); for (int i : indexes) { - Object value = storage.getItemBoxed(i); + Object value = storage.getBoxed(i); if (value != null) { try { BigDecimal valueAsBigDecimal = NumericConverter.coerceToBigDecimal(value); diff --git a/std-bits/table/src/main/java/org/enso/table/aggregations/MinOrMax.java b/std-bits/table/src/main/java/org/enso/table/aggregations/MinOrMax.java index 4f3aa776bcda..bbb8833afcda 100644 --- a/std-bits/table/src/main/java/org/enso/table/aggregations/MinOrMax.java +++ b/std-bits/table/src/main/java/org/enso/table/aggregations/MinOrMax.java @@ -40,7 +40,7 @@ public Object aggregate(List indexes, ProblemAggregator problemAggregat Context context = Context.getCurrent(); Object current = null; for (int row : indexes) { - Object value = storage.getItemBoxed(row); + Object value = storage.getBoxed(row); if (value != null) { try { if (current == null diff --git a/std-bits/table/src/main/java/org/enso/table/aggregations/Mode.java b/std-bits/table/src/main/java/org/enso/table/aggregations/Mode.java index 1e09d8762245..9da4633bbd08 100644 --- a/std-bits/table/src/main/java/org/enso/table/aggregations/Mode.java +++ b/std-bits/table/src/main/java/org/enso/table/aggregations/Mode.java @@ -29,7 +29,7 @@ public Object aggregate(List indexes, ProblemAggregator problemAggregat int count = 0; Map currentMap = null; for (int row : indexes) { - Object value = storage.getItemBoxed(row); + Object value = storage.getBoxed(row); if (value != null) { // Merge all numbers onto a Long if possible or a Double if needed Long lValue = NumericConverter.tryConvertingToLong(value); diff --git a/std-bits/table/src/main/java/org/enso/table/aggregations/Percentile.java b/std-bits/table/src/main/java/org/enso/table/aggregations/Percentile.java index 9b25f45e6596..e1c54a12a125 100644 --- a/std-bits/table/src/main/java/org/enso/table/aggregations/Percentile.java +++ b/std-bits/table/src/main/java/org/enso/table/aggregations/Percentile.java @@ -32,7 +32,7 @@ public Object aggregate(List indexes, ProblemAggregator problemAggregat int count = 0; SortedMap currentMap = new TreeMap<>(); for (int row : indexes) { - Object value = storage.getItemBoxed(row); + Object value = storage.getBoxed(row); if (value != null) { Double dValue = NumericConverter.tryConvertingToDouble(value); diff --git a/std-bits/table/src/main/java/org/enso/table/aggregations/ShortestOrLongest.java b/std-bits/table/src/main/java/org/enso/table/aggregations/ShortestOrLongest.java index 833e2c5d0814..eaf4ab0505b7 100644 --- a/std-bits/table/src/main/java/org/enso/table/aggregations/ShortestOrLongest.java +++ b/std-bits/table/src/main/java/org/enso/table/aggregations/ShortestOrLongest.java @@ -32,7 +32,7 @@ public Object aggregate(List indexes, ProblemAggregator problemAggregat Object current = null; for (int row : indexes) { - Object value = storage.getItemBoxed(row); + Object value = storage.getBoxed(row); if (value != null) { if (!(value instanceof String asString)) { innerAggregator.reportColumnAggregatedProblem( diff --git a/std-bits/table/src/main/java/org/enso/table/aggregations/StandardDeviation.java b/std-bits/table/src/main/java/org/enso/table/aggregations/StandardDeviation.java index 197c54312ef0..92cfa14e3134 100644 --- a/std-bits/table/src/main/java/org/enso/table/aggregations/StandardDeviation.java +++ b/std-bits/table/src/main/java/org/enso/table/aggregations/StandardDeviation.java @@ -40,7 +40,7 @@ public Object aggregate(List indexes, ProblemAggregator problemAggregat Context context = Context.getCurrent(); Calculation current = null; for (int row : indexes) { - Object value = storage.getItemBoxed(row); + Object value = storage.getBoxed(row); if (value != null) { Double dValue = NumericConverter.tryConvertingToDouble(value); if (dValue == null) { diff --git a/std-bits/table/src/main/java/org/enso/table/aggregations/Sum.java b/std-bits/table/src/main/java/org/enso/table/aggregations/Sum.java index ce62d5516b1d..102c36c2d1fb 100644 --- a/std-bits/table/src/main/java/org/enso/table/aggregations/Sum.java +++ b/std-bits/table/src/main/java/org/enso/table/aggregations/Sum.java @@ -6,10 +6,10 @@ import org.enso.table.data.column.builder.Builder; import org.enso.table.data.column.builder.InferredIntegerBuilder; import org.enso.table.data.column.operation.map.MapOperationProblemAggregator; +import org.enso.table.data.column.storage.ColumnDoubleStorage; import org.enso.table.data.column.storage.ColumnLongStorage; import org.enso.table.data.column.storage.Storage; import org.enso.table.data.column.storage.numeric.BigIntegerStorage; -import org.enso.table.data.column.storage.numeric.DoubleStorage; import org.enso.table.data.column.storage.type.BigIntegerType; import org.enso.table.data.column.storage.type.FloatType; import org.enso.table.data.column.storage.type.IntegerType; @@ -166,7 +166,7 @@ void add(Object value) { @Override void accumulate(List indexes, Storage storage) { Context context = Context.getCurrent(); - if (storage instanceof DoubleStorage doubleStorage) { + if (storage instanceof ColumnDoubleStorage doubleStorage) { for (int row : indexes) { if (!doubleStorage.isNothing(row)) { addDouble(doubleStorage.get(row)); @@ -175,7 +175,7 @@ void accumulate(List indexes, Storage storage) { } } else { for (int row : indexes) { - add(storage.getItemBoxed(row)); + add(storage.getBoxed(row)); context.safepoint(); } } diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/builder/DateTimeBuilder.java b/std-bits/table/src/main/java/org/enso/table/data/column/builder/DateTimeBuilder.java index b7081daed7e1..345fd93d99af 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/builder/DateTimeBuilder.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/builder/DateTimeBuilder.java @@ -52,7 +52,7 @@ public void appendBulkStorage(Storage storage) { if (storage instanceof DateStorage dateStorage) { Context context = Context.getCurrent(); for (int i = 0; i < dateStorage.size(); ++i) { - LocalDate date = dateStorage.getItemBoxed(i); + LocalDate date = dateStorage.getBoxed(i); if (date == null) { data[currentSize++] = null; } else { diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/builder/InferredBuilder.java b/std-bits/table/src/main/java/org/enso/table/data/column/builder/InferredBuilder.java index 0b6f6cc94bbb..b198d7a024c7 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/builder/InferredBuilder.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/builder/InferredBuilder.java @@ -83,7 +83,7 @@ public void appendNulls(int count) { @Override public void appendBulkStorage(Storage storage) { for (int i = 0; i < storage.size(); i++) { - append(storage.getItemBoxed(i)); + append(storage.getBoxed(i)); } } diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/builder/InferredIntegerBuilder.java b/std-bits/table/src/main/java/org/enso/table/data/column/builder/InferredIntegerBuilder.java index 81995cb659b1..abbc7f130e40 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/builder/InferredIntegerBuilder.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/builder/InferredIntegerBuilder.java @@ -66,7 +66,7 @@ public void appendNulls(int count) { @Override public void appendBulkStorage(Storage storage) { for (int i = 0; i < storage.size(); i++) { - append(storage.getItemBoxed(i)); + append(storage.getBoxed(i)); } } diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/builder/ObjectBuilder.java b/std-bits/table/src/main/java/org/enso/table/data/column/builder/ObjectBuilder.java index 32d2ca99f9c5..460acddc1ecc 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/builder/ObjectBuilder.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/builder/ObjectBuilder.java @@ -34,7 +34,7 @@ public void appendBulkStorage(Storage storage) { } else { int n = storage.size(); for (int i = 0; i < n; i++) { - data[currentSize++] = storage.getItemBoxed(i); + data[currentSize++] = storage.getBoxed(i); } } } diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToBigIntegerConverter.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToBigIntegerConverter.java index 201b5379033f..19a8a6ad9095 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToBigIntegerConverter.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToBigIntegerConverter.java @@ -74,7 +74,7 @@ private Storage convertBigDecimalStorage( Builder.getForBigInteger(bigDecimalStorage.size(), problemAggregator), bigDecimalStorage, (i) -> { - BigDecimal x = bigDecimalStorage.getBoxed((int) i); + BigDecimal x = bigDecimalStorage.getBoxed(i); return x.toBigInteger(); }); } diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToFloatStorageConverter.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToFloatStorageConverter.java index 671611ea8305..882e5efd179e 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToFloatStorageConverter.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToFloatStorageConverter.java @@ -126,7 +126,7 @@ private Storage convertBigIntegerStorage( return innerLoop( Builder.getForDouble(FloatType.FLOAT_64, storage.size(), problemAggregator), storage, - (builder, i) -> builder.append(storage.getItemBoxed((int) i))); + (builder, i) -> builder.append(storage.getBoxed(i))); } private Storage convertBigDecimalStorage( @@ -134,6 +134,6 @@ private Storage convertBigDecimalStorage( return innerLoop( Builder.getForDouble(FloatType.FLOAT_64, storage.size(), problemAggregator), storage, - (builder, i) -> builder.append(storage.getItemBoxed((int) i))); + (builder, i) -> builder.append(storage.getBoxed(i))); } } diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToIntegerStorageConverter.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToIntegerStorageConverter.java index c476fd0fef96..4007075d9845 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToIntegerStorageConverter.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToIntegerStorageConverter.java @@ -164,7 +164,7 @@ private Storage convertBigIntegerStorage( Builder.getForLong(targetType, storage.size(), problemAggregator), storage, (builder, i) -> { - BigInteger value = storage.getBoxed((int) i); + BigInteger value = storage.getBoxed(i); if (targetType.fits(value)) { builder.appendLong(value.longValue()); } else { @@ -180,7 +180,7 @@ private Storage convertBigDecimalStorage( Builder.getForLong(targetType, storage.size(), problemAggregator), storage, (builder, i) -> { - BigDecimal value = storage.getItemBoxed((int) i); + BigDecimal value = storage.getBoxed(i); BigInteger bigInteger = value.toBigInteger(); if (targetType.fits(bigInteger)) { builder.appendLong(bigInteger.longValue()); diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToTextStorageConverter.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToTextStorageConverter.java index a827ef1a4251..16501ec5fc24 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToTextStorageConverter.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToTextStorageConverter.java @@ -108,7 +108,7 @@ private Storage castTemporalStorage( Builder.getForText(storage.size(), targetType), storage, (i) -> { - var value = storage.getItemBoxed((int) i); + var value = storage.getBoxed(i); return adapt(converter.apply(value), problemAggregator); }); } diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/GenericBinaryObjectMapOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/GenericBinaryObjectMapOperation.java index 726bb7520d6b..d1e7fa8e5001 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/GenericBinaryObjectMapOperation.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/GenericBinaryObjectMapOperation.java @@ -45,7 +45,7 @@ public Storage runBinaryMap( if (storage.isNothing(i)) { builder.appendNulls(1); } else { - OutputType result = run(storage.getItemBoxed(i), casted); + OutputType result = run(storage.getBoxed(i), casted); builder.append(result); } @@ -70,8 +70,8 @@ public Storage runZip( if (storage.isNothing(i) || otherCasted.isNothing(i)) { builder.appendNulls(1); } else { - InputType left = storage.getItemBoxed(i); - InputType right = otherCasted.getItemBoxed(i); + InputType left = storage.getBoxed(i); + InputType right = otherCasted.getBoxed(i); OutputType result = run(left, right); builder.append(result); } @@ -88,8 +88,8 @@ public Storage runZip( if (storage.isNothing(i) || arg.isNothing(i)) { builder.appendNulls(1); } else { - InputType left = storage.getItemBoxed(i); - Object right = arg.getItemBoxed(i); + InputType left = storage.getBoxed(i); + Object right = arg.getBoxed(i); if (inputTypeClass.isInstance(right)) { OutputType result = run(left, inputTypeClass.cast(right)); builder.append(result); diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/SpecializedIsInOp.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/SpecializedIsInOp.java index 1c33277d1376..3c8805306ec2 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/SpecializedIsInOp.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/SpecializedIsInOp.java @@ -60,7 +60,7 @@ public Storage runMap(S storage, List arg) { for (int i = 0; i < storage.size(); i++) { if (storage.isNothing(i)) { isNothing.set(i); - } else if (compactRepresentation.coercedValues.contains(storage.getItemBoxed(i))) { + } else if (compactRepresentation.coercedValues.contains(storage.getBoxed(i))) { newVals.set(i); } else if (compactRepresentation.hasNulls) { isNothing.set(i); diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/bool/GenericBinaryOpReturningBoolean.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/bool/GenericBinaryOpReturningBoolean.java index d6a2c2529a4c..dfd397ea025e 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/bool/GenericBinaryOpReturningBoolean.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/bool/GenericBinaryOpReturningBoolean.java @@ -69,7 +69,7 @@ private BoolStorage runHomogenousMap(S storage, T arg) { if (storage.isNothing(i)) { newIsNothing.set(i); } else { - T storageItem = storage.getItemBoxed(i); + T storageItem = storage.getBoxed(i); assert storageItem != null : "isNothing returned true but element was null"; boolean r = doOperation(storageItem, arg); newVals.set(i, r); @@ -89,7 +89,7 @@ private BoolStorage runMixedMap(S storage, Object arg) { if (storage.isNothing(i)) { newIsNothing.set(i); } else { - T storageItem = storage.getItemBoxed(i); + T storageItem = storage.getBoxed(i); assert storageItem != null : "isNothing returned true but element was null"; boolean r = doOther(storageItem, arg); newVals.set(i, r); @@ -110,8 +110,8 @@ private BoolStorage runHomogenousZip(S storage, SpecializedStorage argStorage if (storage.isNothing(i) || !(i < m) || argStorage.isNothing(i)) { newIsNothing.set(i); } else { - T storageItem = storage.getItemBoxed(i); - T argItem = argStorage.getItemBoxed(i); + T storageItem = storage.getBoxed(i); + T argItem = argStorage.getBoxed(i); assert storageItem != null : "isNothing returned true but element was null"; assert argItem != null : "isNothing returned true but element was null"; boolean r = doOperation(storageItem, argItem); @@ -134,8 +134,8 @@ private BoolStorage runMixedZip(S storage, Storage argStorage) { if (storage.isNothing(i) || !(i < m) || argStorage.isNothing(i)) { newIsNothing.set(i); } else { - T storageItem = storage.getItemBoxed(i); - Object argItem = argStorage.getItemBoxed(i); + T storageItem = storage.getBoxed(i); + Object argItem = argStorage.getBoxed(i); assert storageItem != null : "isNothing returned true but element was null"; assert argItem != null : "isNothing returned true but element was null"; diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/datetime/TimeLikeCoalescingOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/datetime/TimeLikeCoalescingOperation.java index 0f67802707b2..8e5b804990d4 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/datetime/TimeLikeCoalescingOperation.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/datetime/TimeLikeCoalescingOperation.java @@ -36,7 +36,7 @@ public Storage runBinaryMap( Builder builder = createOutputBuilder(n); Context context = Context.getCurrent(); for (int i = 0; i < size; i++) { - T r = storage.isNothing(i) ? casted : doOperation(storage.getItemBoxed(i), casted); + T r = storage.isNothing(i) ? casted : doOperation(storage.getBoxed(i), casted); builder.append(r); context.safepoint(); } @@ -61,8 +61,8 @@ public Storage runZip( Builder builder = createOutputBuilder(n); Context context = Context.getCurrent(); for (int i = 0; i < n; i++) { - T a = storage.getItemBoxed(i); - T b = argTStorage.getItemBoxed(i); + T a = storage.getBoxed(i); + T b = argTStorage.getBoxed(i); T r; if (a == null && b == null) { r = null; diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/comparisons/NumericComparison.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/comparisons/NumericComparison.java index 3000cd5de12a..2aa1479c736f 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/comparisons/NumericComparison.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/comparisons/NumericComparison.java @@ -106,7 +106,7 @@ public Storage runBinaryMap( BitSet comparisonResults = new BitSet(); Context context = Context.getCurrent(); for (int i = 0; i < n; ++i) { - Object item = storage.getItemBoxed(i); + Object item = storage.getBoxed(i); if (item == null) { isNothing.set(i); } else { @@ -405,8 +405,8 @@ protected BoolStorage runMixedZip( BitSet isNothing = new BitSet(); Context context = Context.getCurrent(); for (int i = 0; i < m; ++i) { - Object x = lhs.getItemBoxed(i); - Object y = rhs.getItemBoxed(i); + Object x = lhs.getBoxed(i); + Object y = rhs.getBoxed(i); if (x == null || y == null) { isNothing.set(i); } else { diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/BigIntegerArrayAdapter.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/BigIntegerArrayAdapter.java index a2a2c27e7980..b31ceba1592d 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/BigIntegerArrayAdapter.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/BigIntegerArrayAdapter.java @@ -35,7 +35,7 @@ private BigIntegerStorageAsBigInteger(BigIntegerStorage storage) { @Override public BigInteger getItem(int i) { - return storage.getItemBoxed(i); + return storage.getBoxed(i); } @Override diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/StringBooleanOp.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/StringBooleanOp.java index 9ed22c535402..6d75f6b7536c 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/StringBooleanOp.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/StringBooleanOp.java @@ -89,7 +89,7 @@ public BoolStorage runZip( BitSet newIsNothing = new BitSet(); for (int i = 0; i < storage.size(); i++) { if (!storage.isNothing(i) && i < arg.size() && !arg.isNothing(i)) { - Object x = arg.getItemBoxed(i); + Object x = arg.getBoxed(i); if (x instanceof String str) { if (doString(storage.getBoxed(i), str)) { newVals.set(i); diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/BoolStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/BoolStorage.java index ba3059c79e58..d7daa906543d 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/BoolStorage.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/BoolStorage.java @@ -53,27 +53,35 @@ public BoolStorage makeNegated() { } @Override - public int size() { + public long getSize() { return size; } + @Override + public Boolean getBoxed(long idx) { + return isNothing(idx) ? null : negated != values.get((int)idx); + } + @Override public StorageType getType() { return BooleanType.INSTANCE; } @Override - public Boolean getItemBoxed(int idx) { - return isNothing.get(idx) ? null : getItem(idx); - } + public boolean get(long index) throws ValueIsNothingException { + if (isNothing(index)) { + throw new ValueIsNothingException(index); + } - public boolean getItem(long idx) { - return negated != values.get((int) idx); + return negated != values.get((int)index); } @Override public boolean isNothing(long idx) { - return isNothing.get((int) idx); + if (idx < 0 || idx >= getSize()) { + throw new IndexOutOfBoundsException("Index out of bounds: " + idx); + } + return isNothing.get((int) idx); } @Override @@ -93,10 +101,19 @@ public Storage runVectorizedZip( return ops.runZip(name, this, argument, problemAggregator); } + public boolean isNegated() { + return negated; + } + public BitSet getValues() { return values; } + @Override + public BitSet getIsNothingMap() { + return isNothing; + } + /** * Creates a new BoolStorage in which all missing values have been replaced by arg. * @@ -146,7 +163,7 @@ public Storage fillMissingFromPrevious(BoolStorage missingIndicator) { newIsNothing.set(i); } } else { - boolean currentValue = getItem(i); + boolean currentValue = get(i); newValues.set(i, currentValue); previousValue = currentValue; hasPrevious = true; @@ -200,10 +217,6 @@ public BoolStorage applyMask(OrderMask mask) { return new BoolStorage(newVals, newNa, mask.length(), negated); } - public boolean isNegated() { - return negated; - } - public Storage iif( Value when_true, Value when_false, @@ -216,7 +229,7 @@ public Storage iif( for (int i = 0; i < size; i++) { if (isNothing.get(i)) { builder.appendNulls(1); - } else if (getItem(i)) { + } else if (get(i)) { builder.append(on_true.apply(i)); } else { builder.append(on_false.apply(i)); @@ -230,7 +243,7 @@ public Storage iif( private static IntFunction makeRowProvider(Value value) { if (value.isHostObject() && value.asHostObject() instanceof Storage s) { - return i -> (Object) s.getItemBoxed(i); + return i -> (Object) s.getBoxed(i); } var converted = Polyglot_Utils.convertPolyglotValue(value); return i -> converted; @@ -318,19 +331,6 @@ public BoolStorage slice(List ranges) { return new BoolStorage(newValues, newIsNothing, newSize, negated); } - @Override - public BitSet getIsNothingMap() { - return isNothing; - } - - @Override - public boolean get(long index) throws ValueIsNothingException { - if (isNothing(index)) { - throw new ValueIsNothingException(index); - } - return getItem(index); - } - private static class BoolEq extends BinaryMapOperation { public BoolEq() { super(Maps.EQ); @@ -360,7 +360,7 @@ public BoolStorage runZip( BitSet isNothing = new BitSet(); for (int i = 0; i < storage.size; i++) { if (!storage.isNothing(i) && i < arg.size() && !arg.isNothing(i)) { - if (((Boolean) storage.getItem(i)).equals(arg.getItemBoxed(i))) { + if (((Boolean) storage.get(i)).equals(arg.getBoxed(i))) { out.set(i); } } else { @@ -430,8 +430,8 @@ public BoolStorage runZip( } int current = isNothing.nextSetBit(0); while (current != -1) { - Boolean a = storage.getItemBoxed(current); - Boolean b = (current < v.size) ? v.getItemBoxed(current) : null; + Boolean a = storage.getBoxed(current); + Boolean b = (current < v.size) ? v.getBoxed(current) : null; if (a == Boolean.FALSE || b == Boolean.FALSE) { isNothing.clear(current); boolean falseValue = negated; @@ -502,8 +502,8 @@ public BoolStorage runZip( } int current = isNothing.nextSetBit(0); while (current != -1) { - Boolean a = storage.getItemBoxed(current); - Boolean b = (current < v.size) ? v.getItemBoxed(current) : null; + Boolean a = storage.getBoxed(current); + Boolean b = (current < v.size) ? v.getBoxed(current) : null; if (a == Boolean.TRUE || b == Boolean.TRUE) { isNothing.clear(current); boolean trueValue = !negated; @@ -536,8 +536,8 @@ public Storage runZip( if (storage.isNothing(i) || argBoolStorage.isNothing(i)) { isNothing.set(i); } else { - boolean a = storage.getItem(i); - boolean b = argBoolStorage.getItem(i); + boolean a = storage.get(i); + boolean b = argBoolStorage.get(i); boolean r = doCompare(a, b); out.set(i, r); } @@ -558,8 +558,8 @@ public Storage runZip( if (storage.isNothing(i) || arg.isNothing(i)) { isNothing.set(i); } else { - boolean a = storage.getItem(i); - Object b = arg.getItemBoxed(i); + boolean a = storage.get(i); + Object b = arg.getBoxed(i); if (b instanceof Boolean bBool) { boolean r = doCompare(a, bBool); out.set(i, r); @@ -728,11 +728,11 @@ public Storage runZip( isNothing.set(i); } else { if (isNothingA) { - out.set(i, argBoolStorage.getItem(i)); + out.set(i, argBoolStorage.get(i)); } else if (isNothingB) { - out.set(i, storage.getItem(i)); + out.set(i, storage.get(i)); } else { - out.set(i, doOperation(storage.getItem(i), argBoolStorage.getItem(i))); + out.set(i, doOperation(storage.get(i), argBoolStorage.get(i))); } } @@ -743,7 +743,7 @@ public Storage runZip( if (storage.isNothing(i)) { isNothing.set(i); } else { - out.set(i, storage.getItem(i)); + out.set(i, storage.get(i)); } context.safepoint(); diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/MixedStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/MixedStorage.java index 39d8b9840f70..c6eb75c82608 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/MixedStorage.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/MixedStorage.java @@ -78,7 +78,7 @@ public StorageType inferPreciseType() { Context context = Context.getCurrent(); for (int i = 0; i < size(); i++) { - var item = getItemBoxed(i); + var item = getBoxed(i); if (item == null) { continue; } @@ -133,7 +133,7 @@ public Storage getInferredStorage() { Builder builder = Builder.getForType(inferredType, size(), BlackholeProblemAggregator.INSTANCE); for (int i = 0; i < size(); i++) { - builder.append(getItemBoxed(i)); + builder.append(getBoxed(i)); } cachedInferredStorage = builder.seal(); } diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/SpecializedStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/SpecializedStorage.java index 220ebed2fdd0..fdca120b2595 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/SpecializedStorage.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/SpecializedStorage.java @@ -192,7 +192,7 @@ public ReadOnlyList(SpecializedStorage storage) { @Override public Object get(int index) { - return storage.getItemBoxed(index); + return storage.getBoxed(index); } @Override 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 e33ce0ead3be..588ca6c6ea75 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 @@ -48,16 +48,6 @@ public Storage tryGettingMoreSpecializedStorage() { @Override public abstract boolean isNothing(long index); - /** - * Returns a boxed representation of an item. Missing values are denoted with null. - * - * @param idx the index to look up - * @return the item at position {@code idx} - */ - public final T getItemBoxed(int idx) { - return getBoxed(idx); - } - @Override public abstract T getBoxed(long index); diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/StorageListView.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/StorageListView.java index 1de25bb6a21c..dbd4c3ad56ed 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/StorageListView.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/StorageListView.java @@ -90,7 +90,7 @@ public boolean equals(Object obj) { @Override public Object get(int index) { - return storage.getItemBoxed(from + index); + return storage.getBoxed(from + index); } @Override diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/StringStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/StringStorage.java index 4539a714b0e2..cea013846392 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/StringStorage.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/StringStorage.java @@ -112,7 +112,7 @@ public BoolStorage runZip( for (int i = 0; i < storage.size(); i++) { if (storage.getBoxed(i) == null || i >= arg.size() || arg.isNothing(i)) { isNothing.set(i); - } else if (arg.getItemBoxed(i) instanceof String s + } else if (arg.getBoxed(i) instanceof String s && Text_Utils.equals(storage.getBoxed(i), s)) { r.set(i); } diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/LongRangeStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/LongRangeStorage.java index 9dff1bb8c877..3c4135dcb797 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/LongRangeStorage.java +++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/LongRangeStorage.java @@ -17,7 +17,7 @@ public LongRangeStorage(long start, long step, int size) { @SuppressWarnings("unused") private void verifyBounds() throws ArithmeticException { - long lastIdx = size - 1; + long lastIdx = getSize() - 1; // Computing this value will throw an exception if it overflows. long lastValue = Math.addExact(start, Math.multiplyExact(step, lastIdx)); } diff --git a/std-bits/table/src/main/java/org/enso/table/data/index/MultiValueKeyBase.java b/std-bits/table/src/main/java/org/enso/table/data/index/MultiValueKeyBase.java index db594a201637..8675ae525ad0 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/index/MultiValueKeyBase.java +++ b/std-bits/table/src/main/java/org/enso/table/data/index/MultiValueKeyBase.java @@ -25,7 +25,7 @@ public MultiValueKeyBase(Storage[] storage, int rowIndex) { /** A helper function to get the item from the nth column of the key's row. */ public Object get(int column) { - return storages[column].getItemBoxed(rowIndex); + return storages[column].getBoxed(rowIndex); } public List getValues() { diff --git a/std-bits/table/src/main/java/org/enso/table/data/table/Table.java b/std-bits/table/src/main/java/org/enso/table/data/table/Table.java index 28c53d76fb3f..fb572738fa78 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/table/Table.java +++ b/std-bits/table/src/main/java/org/enso/table/data/table/Table.java @@ -466,11 +466,11 @@ public static Table transpose( for (int row = 0; row < size; row++) { for (Column column : to_transpose) { for (int i = 0; i < id_columns.length; i++) { - storage[i].append(id_columns[i].getStorage().getItemBoxed(row)); + storage[i].append(id_columns[i].getStorage().getBoxed(row)); } storage[id_columns.length].append(column.getName()); - storage[id_columns.length + 1].append(column.getStorage().getItemBoxed(row)); + storage[id_columns.length + 1].append(column.getStorage().getBoxed(row)); } context.safepoint(); diff --git a/std-bits/table/src/main/java/org/enso/table/data/table/TableToXml.java b/std-bits/table/src/main/java/org/enso/table/data/table/TableToXml.java index 04b42029b2f9..695836de202f 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/table/TableToXml.java +++ b/std-bits/table/src/main/java/org/enso/table/data/table/TableToXml.java @@ -59,7 +59,7 @@ public static Document to_xml( private static void get_set_attribute( Column attribute_column, String legal_name, int row, Element rowElement) throws DOMException { - var item = attribute_column.getStorage().getItemBoxed(row); + var item = attribute_column.getStorage().getBoxed(row); if (item != null) { rowElement.setAttribute(legal_name, item.toString()); } @@ -68,7 +68,7 @@ private static void get_set_attribute( private static void get_append_element( Column element_column, String legal_name, int row, Document doc, Element rowElement) throws DOMException { - var item = element_column.getStorage().getItemBoxed(row); + var item = element_column.getStorage().getBoxed(row); if (item != null) { var columnElement = doc.createElement(legal_name); columnElement.setTextContent(item.toString()); @@ -78,7 +78,7 @@ private static void get_append_element( private static void get_set_value(Column value_Column, int row, Element rowElement) throws DOMException { - var item = value_Column.getStorage().getItemBoxed(row); + var item = value_Column.getStorage().getBoxed(row); if (item != null) { rowElement.setTextContent(item.toString()); } diff --git a/std-bits/table/src/main/java/org/enso/table/data/table/join/lookup/LookupJoin.java b/std-bits/table/src/main/java/org/enso/table/data/table/join/lookup/LookupJoin.java index b3ae98e3db34..094a34bfaecd 100644 --- a/std-bits/table/src/main/java/org/enso/table/data/table/join/lookup/LookupJoin.java +++ b/std-bits/table/src/main/java/org/enso/table/data/table/join/lookup/LookupJoin.java @@ -110,9 +110,9 @@ private Table join() { for (LookupOutputColumn.MergeColumns mergeColumns : columnsToMerge) { Object itemToAdd; if (lookupRow != Storage.NOT_FOUND_INDEX) { - itemToAdd = mergeColumns.lookupReplacement.getItemBoxed(lookupRow); + itemToAdd = mergeColumns.lookupReplacement.getBoxed(lookupRow); } else { - itemToAdd = mergeColumns.original.getItemBoxed(i); + itemToAdd = mergeColumns.original.getBoxed(i); } mergeColumns.builder.append(itemToAdd); } diff --git a/std-bits/table/src/main/java/org/enso/table/operations/AddRunning.java b/std-bits/table/src/main/java/org/enso/table/operations/AddRunning.java index 909c5b4fb726..ccc6dbd9e02f 100644 --- a/std-bits/table/src/main/java/org/enso/table/operations/AddRunning.java +++ b/std-bits/table/src/main/java/org/enso/table/operations/AddRunning.java @@ -195,7 +195,7 @@ private abstract static class RunningStatisticBase { } public void calculateNextValue(int i, RunningIterator it) { - Object value = sourceColumn.getStorage().getItemBoxed(i); + Object value = sourceColumn.getStorage().getBoxed(i); if (value == null) { columnAggregatedProblemAggregator.reportColumnAggregatedProblem( new IgnoredNothing(sourceColumn.getName(), i)); diff --git a/std-bits/table/src/main/java/org/enso/table/operations/OrderBuilder.java b/std-bits/table/src/main/java/org/enso/table/operations/OrderBuilder.java index fbb91d99e257..faa5023c5695 100644 --- a/std-bits/table/src/main/java/org/enso/table/operations/OrderBuilder.java +++ b/std-bits/table/src/main/java/org/enso/table/operations/OrderBuilder.java @@ -50,7 +50,7 @@ public Comparator toComparator() { } final Comparator cmp = itemCmp; - return (i, j) -> cmp.compare(storage.getItemBoxed(i), storage.getItemBoxed(j)); + return (i, j) -> cmp.compare(storage.getBoxed(i), storage.getBoxed(j)); } } diff --git a/std-bits/table/src/main/java/org/enso/table/parsing/IncrementalDatatypeParser.java b/std-bits/table/src/main/java/org/enso/table/parsing/IncrementalDatatypeParser.java index 68866ae1efe8..a5812bff39f8 100644 --- a/std-bits/table/src/main/java/org/enso/table/parsing/IncrementalDatatypeParser.java +++ b/std-bits/table/src/main/java/org/enso/table/parsing/IncrementalDatatypeParser.java @@ -37,7 +37,7 @@ public Storage parseColumn( Context context = Context.getCurrent(); for (int i = 0; i < sourceStorage.size(); ++i) { - String cell = sourceStorage.getItemBoxed(i); + String cell = sourceStorage.getBoxed(i); if (cell != null) { Object parsed = parseSingleValue(cell, problemAggregator); builder.append(parsed); diff --git a/std-bits/table/src/main/java/org/enso/table/parsing/NumberParser.java b/std-bits/table/src/main/java/org/enso/table/parsing/NumberParser.java index 8c6eca18112b..63397df7a0d7 100644 --- a/std-bits/table/src/main/java/org/enso/table/parsing/NumberParser.java +++ b/std-bits/table/src/main/java/org/enso/table/parsing/NumberParser.java @@ -114,7 +114,7 @@ public Storage parseColumn( var context = Context.getCurrent(); for (int i = 0; i < sourceStorage.size(); i++) { - var text = sourceStorage.getItemBoxed(i); + var text = sourceStorage.getBoxed(i); // Check if in unknown state var mightBeEuropean = !isInteger() && parser.numberWithSeparators().mightBeEuropean(); @@ -127,7 +127,7 @@ public Storage parseColumn( builder = makeBuilderWithCapacity(sourceStorage.size(), problemAggregator.createSimpleChild()); for (int j = 0; j < i; j++) { - var subText = sourceStorage.getItemBoxed(j); + var subText = sourceStorage.getBoxed(j); var subResult = subText == null ? null : parseSingleValue(subText, problemAggregator); if (subResult == null) { builder.appendNulls(1); diff --git a/std-bits/table/src/main/java/org/enso/table/parsing/TypeInferringParser.java b/std-bits/table/src/main/java/org/enso/table/parsing/TypeInferringParser.java index cf54400db88d..819362305b13 100644 --- a/std-bits/table/src/main/java/org/enso/table/parsing/TypeInferringParser.java +++ b/std-bits/table/src/main/java/org/enso/table/parsing/TypeInferringParser.java @@ -56,7 +56,7 @@ public Storage parseColumn( Builder builder = parser.makeBuilderWithCapacity(sourceStorage.size(), innerAggregator); for (int i = 0; i < sourceStorage.size(); ++i) { - String cell = sourceStorage.getItemBoxed(i); + String cell = sourceStorage.getBoxed(i); if (cell != null) { Object parsed = parser.parseSingleValue(cell, innerAggregator); if (innerAggregator.hasProblems()) { diff --git a/std-bits/table/src/main/java/org/enso/table/write/DelimitedWriter.java b/std-bits/table/src/main/java/org/enso/table/write/DelimitedWriter.java index aba91c189c70..ff13b4beda80 100644 --- a/std-bits/table/src/main/java/org/enso/table/write/DelimitedWriter.java +++ b/std-bits/table/src/main/java/org/enso/table/write/DelimitedWriter.java @@ -141,7 +141,7 @@ public void write(Table table) throws IOException { for (int col = 0; col < numberOfColumns; ++col) { boolean isLast = col == numberOfColumns - 1; String columnName = table.getColumns()[col].getName(); - Object cellValue = table.getColumns()[col].getStorage().getItemBoxed(row); + Object cellValue = table.getColumns()[col].getStorage().getBoxed(row); String formatted = columnFormatters[col].format(cellValue); boolean wantsQuoting = writeQuoteBehavior == WriteQuoteBehavior.ALWAYS && wantsQuotesInAlwaysMode(cellValue); diff --git a/std-bits/table/src/main/java/org/enso/table/write/ExcelWriter.java b/std-bits/table/src/main/java/org/enso/table/write/ExcelWriter.java index e688e633ec83..450a7042e6b3 100644 --- a/std-bits/table/src/main/java/org/enso/table/write/ExcelWriter.java +++ b/std-bits/table/src/main/java/org/enso/table/write/ExcelWriter.java @@ -506,7 +506,7 @@ private static void writeValueToCell( } else if (storage instanceof BoolStorage boolStorage) { cell.setCellValue(boolStorage.get(j)); } else { - Object value = storage.getItemBoxed(j); + Object value = storage.getBoxed(j); switch (value) { case String s -> cell.setCellValue(s); case Boolean b -> cell.setCellValue(b); diff --git a/test/Base_Tests/polyglot-sources/enso-test-java-helpers/src/main/java/org/enso/table_test_helpers/ExplodingStorage.java b/test/Base_Tests/polyglot-sources/enso-test-java-helpers/src/main/java/org/enso/table_test_helpers/ExplodingStorage.java index 865f111c439c..add285143757 100644 --- a/test/Base_Tests/polyglot-sources/enso-test-java-helpers/src/main/java/org/enso/table_test_helpers/ExplodingStorage.java +++ b/test/Base_Tests/polyglot-sources/enso-test-java-helpers/src/main/java/org/enso/table_test_helpers/ExplodingStorage.java @@ -51,8 +51,8 @@ public long getItem(int idx) { } @Override - public Long getItemBoxed(int idx) { - return getItem(idx); + public Long getBoxed(long idx) { + return getItem((int)idx); } @Override diff --git a/test/Exploratory_Benchmarks/src/Table/Column_Aggregate.enso b/test/Exploratory_Benchmarks/src/Table/Column_Aggregate.enso index 14ef144949a2..1e896558afa1 100644 --- a/test/Exploratory_Benchmarks/src/Table/Column_Aggregate.enso +++ b/test/Exploratory_Benchmarks/src/Table/Column_Aggregate.enso @@ -33,7 +33,7 @@ type Boxed_Total_Aggregate n = self.text_column.length storage = get_storage_for_column self.text_column (0.up_to n).fold Nothing acc-> ix-> - item = storage.getItemBoxed ix + item = storage.getBoxed ix if acc.is_nothing then item else if item.is_nothing then acc else if item.length > acc.length then item else acc @@ -89,7 +89,7 @@ type Boxed_Sum_Months n = self.date_column.length storage = get_storage_for_column self.date_column (0.up_to n).fold 0 acc-> ix-> - item = storage.getItemBoxed ix + item = storage.getBoxed ix if item.is_nothing then acc else acc + item.month diff --git a/test/Exploratory_Benchmarks/src/Table/Column_Bi_Map.enso b/test/Exploratory_Benchmarks/src/Table/Column_Bi_Map.enso index e153a33eb839..e566e955948f 100644 --- a/test/Exploratory_Benchmarks/src/Table/Column_Bi_Map.enso +++ b/test/Exploratory_Benchmarks/src/Table/Column_Bi_Map.enso @@ -36,8 +36,8 @@ type Boxed_Bi_Map_Test storage_1 = get_storage_for_column self.text_column_1 storage_2 = get_storage_for_column self.text_column_2 0.up_to n . each i-> - item_1 = storage_1.getItemBoxed i - item_2 = storage_2.getItemBoxed i + item_1 = storage_1.getBoxed i + item_2 = storage_2.getBoxed i if item_1.is_nothing || item_2.is_nothing then builder.appendNulls 1 else res = item_1 + item_2 builder.append res diff --git a/test/Exploratory_Benchmarks/src/Table/Column_Map.enso b/test/Exploratory_Benchmarks/src/Table/Column_Map.enso index 578812b580ce..6d26c6819699 100644 --- a/test/Exploratory_Benchmarks/src/Table/Column_Map.enso +++ b/test/Exploratory_Benchmarks/src/Table/Column_Map.enso @@ -36,7 +36,7 @@ type Boxed_Map_Test builder = Builder.getForBoolean n storage = get_storage_for_column self.text_column 0.up_to n . each i-> - item = storage.getItemBoxed i + item = storage.getBoxed i case item of Nothing -> builder.appendNulls 1 diff --git a/test/Exploratory_Benchmarks/src/Table/Column_Map_2.enso b/test/Exploratory_Benchmarks/src/Table/Column_Map_2.enso index 4cbdf6ab9c4b..c3d626f64f65 100644 --- a/test/Exploratory_Benchmarks/src/Table/Column_Map_2.enso +++ b/test/Exploratory_Benchmarks/src/Table/Column_Map_2.enso @@ -36,7 +36,7 @@ type Boxed_Map_Test_2 builder = Builder.getForLong IntegerType.INT_64 n Nothing storage = get_storage_for_column self.date_column 0.up_to n . each i-> - case storage.getItemBoxed i of + case storage.getBoxed i of Nothing -> builder.appendNulls 1 date -> diff --git a/test/Exploratory_Benchmarks/src/Table/Enso_Callback.enso b/test/Exploratory_Benchmarks/src/Table/Enso_Callback.enso index 5df09fd890b5..910b81325d5f 100644 --- a/test/Exploratory_Benchmarks/src/Table/Enso_Callback.enso +++ b/test/Exploratory_Benchmarks/src/Table/Enso_Callback.enso @@ -40,7 +40,7 @@ type Boxed_Enso_Callback_Test builder = Builder.getForType TextType.VARIABLE_LENGTH n Nothing storage = Storage.get_storage_for_column self.text_column 0.up_to n . each i-> - case storage.getItemBoxed i of + case storage.getBoxed i of Nothing -> builder.appendNulls 1 item -> @@ -105,7 +105,7 @@ type Primitive_Enso_Callback_Test builder = Builder.getForLong IntegerType.INT_64 n Nothing storage = Storage.get_storage_for_column self.int_column 0.up_to n . each i-> - case storage.getItemBoxed i of + case storage.getBoxed i of Nothing -> builder.appendNulls 1 item ->