Skip to content

Disallow mutable array use as a constant #10604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
findepi merged 2 commits into from
Jan 15, 2022
Merged

Disallow mutable array use as a constant #10604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adc270b
Disallow mutable array use as a constant
findepi Jan 14, 2022
9892e61
Disable certain useless Error Prone warnings
findepi Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/trino-spi/src/main/java/io/trino/spi/type/Decimals.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

import static io.trino.spi.StandardErrorCode.NUMERIC_VALUE_OUT_OF_RANGE;
import static io.trino.spi.type.DecimalType.createDecimalType;
import static io.trino.spi.type.Int128Math.POWERS_OF_TEN;
import static io.trino.spi.type.Int128Math.absExact;
import static io.trino.spi.type.Int128Math.powerOfTen;
import static java.lang.Math.abs;
import static java.lang.Math.pow;
import static java.lang.Math.round;
Expand Down Expand Up @@ -339,6 +339,6 @@ public static boolean overflows(Int128 value, int precision)
return overflows(value.getHigh(), value.getLow());
}

return absExact(value).compareTo(POWERS_OF_TEN[precision]) >= 0;
return absExact(value).compareTo(powerOfTen(precision)) >= 0;
}
}
7 changes: 6 additions & 1 deletion core/trino-spi/src/main/java/io/trino/spi/type/Int128Math.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public final class Int128Math
private static final int NUMBER_OF_LONGS = 2;
private static final int NUMBER_OF_INTS = 2 * NUMBER_OF_LONGS;

public static final Int128[] POWERS_OF_TEN = new Int128[38]; // 10^38 is the largest value < Int128.MAX_VALUE
private static final Int128[] POWERS_OF_TEN = new Int128[38]; // 10^38 is the largest value < Int128.MAX_VALUE
private static final Int128[] POWERS_OF_FIVE = new Int128[54]; // 5^54 is the largest value < Int128.MAX_VALUE

private static final long ALL_BITS_SET_64 = 0xFFFFFFFFFFFFFFFFL;
Expand Down Expand Up @@ -98,6 +98,11 @@ public final class Int128Math
}
}

public static Int128 powerOfTen(int exponent)
{
return POWERS_OF_TEN[exponent];
}

public static void rescale(long high, long low, int factor, long[] result, int offset)
{
if (factor == 0) {
Expand Down
10 changes: 8 additions & 2 deletions lib/trino-rcfile/src/main/java/io/trino/rcfile/text/TextRcFileEncoding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@
import io.trino.spi.type.TimestampType;
import io.trino.spi.type.Type;

import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

public class TextRcFileEncoding
implements RcFileEncoding
{
public static final byte[] DEFAULT_SEPARATORS = new byte[] {
private static final byte[] DEFAULT_SEPARATORS = new byte[] {
Copy link
Copy Markdown
Member

@kokosing kokosing Jan 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we consider using ImmutableList instead?

Copy link
Copy Markdown
Member Author

@findepi findepi Jan 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally yes, but the byte[] is used in other places, so that would be a bigger change, and maybe not warranted in this particular case

1, // Start of Heading
2, // Start of text
3, // End of Text
Expand Down Expand Up @@ -70,7 +71,7 @@ public TextRcFileEncoding()
{
this(
DEFAULT_NULL_SEQUENCE,
DEFAULT_SEPARATORS,
DEFAULT_SEPARATORS.clone(),
null,
false);
}
Expand All @@ -83,6 +84,11 @@ public TextRcFileEncoding(Slice nullSequence, byte[] separators, Byte escapeByte
this.lastColumnTakesRest = lastColumnTakesRest;
}

public static byte[] getDefaultSeparators(int nestingLevels)
{
return Arrays.copyOf(DEFAULT_SEPARATORS, nestingLevels);
}

@Override
public ColumnEncoding booleanEncoding(Type type)
{
Expand Down
5 changes: 1 addition & 4 deletions ...n/trino-accumulo/src/main/java/io/trino/plugin/accumulo/serializers/BooleanLexicoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,10 @@
public class BooleanLexicoder
implements Lexicoder<Boolean>
{
public static final byte[] TRUE = new byte[] {1};
public static final byte[] FALSE = new byte[] {0};

@Override
public byte[] encode(Boolean v)
{
return v ? TRUE : FALSE;
return new byte[] {v ? (byte) 1 : 0};
}

@Override
Expand Down
11 changes: 5 additions & 6 deletions plugin/trino-hive/src/main/java/io/trino/plugin/hive/rcfile/RcFilePageSourceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@

import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.OptionalInt;
Expand All @@ -76,7 +75,7 @@
import static io.trino.plugin.hive.ReaderPageSource.noProjectionAdaptation;
import static io.trino.plugin.hive.util.HiveUtil.getDeserializerClassName;
import static io.trino.rcfile.text.TextRcFileEncoding.DEFAULT_NULL_SEQUENCE;
import static io.trino.rcfile.text.TextRcFileEncoding.DEFAULT_SEPARATORS;
import static io.trino.rcfile.text.TextRcFileEncoding.getDefaultSeparators;
import static java.lang.Math.min;
import static java.lang.Math.toIntExact;
import static java.lang.String.format;
Expand Down Expand Up @@ -238,14 +237,14 @@ public static TextRcFileEncoding createTextVectorEncoding(Properties schema)
else {
nestingLevels = TEXT_EXTENDED_NESTING_LEVELS;
}
byte[] separators = Arrays.copyOf(DEFAULT_SEPARATORS, nestingLevels);
byte[] separators = getDefaultSeparators(nestingLevels);

// the first three separators are set by old-old properties
separators[0] = getByte(schema.getProperty(FIELD_DELIM, schema.getProperty(SERIALIZATION_FORMAT)), DEFAULT_SEPARATORS[0]);
separators[0] = getByte(schema.getProperty(FIELD_DELIM, schema.getProperty(SERIALIZATION_FORMAT)), separators[0]);
// for map field collection delimiter, Hive 1.x uses "colelction.delim" but Hive 3.x uses "collection.delim"
// https://issues.apache.org/jira/browse/HIVE-16922
separators[1] = getByte(schema.getProperty(COLLECTION_DELIM, schema.getProperty("colelction.delim")), DEFAULT_SEPARATORS[1]);
separators[2] = getByte(schema.getProperty(MAPKEY_DELIM), DEFAULT_SEPARATORS[2]);
separators[1] = getByte(schema.getProperty(COLLECTION_DELIM, schema.getProperty("colelction.delim")), separators[1]);
separators[2] = getByte(schema.getProperty(MAPKEY_DELIM), separators[2]);

// null sequence
Slice nullSequence;
Expand Down
4 changes: 4 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1817,14 +1817,18 @@
-Xep:BoxedPrimitiveConstructor:ERROR \
-Xep:ClassCanBeStatic:ERROR \
-Xep:CompareToZero:ERROR \
-Xep:EqualsGetClass:OFF <!-- we would rather want the opposite check --> \
-Xep:EqualsIncompatibleType:ERROR \
-Xep:FallThrough:ERROR \
-Xep:GuardedBy:OFF <!-- needs some careful inspection --> \
-Xep:ImmutableEnumChecker:OFF <!-- flags enums with List fields even if initialized with ImmutableList, and other false positives --> \
-Xep:ImmutableSetForContains:ERROR \
-Xep:InconsistentHashCode:ERROR \
-Xep:InjectOnConstructorOfAbstractClass:ERROR \
-Xep:MissingCasesInEnumSwitch:ERROR \
-Xep:MissingOverride:ERROR \
-Xep:MutableConstantField:OFF <!-- flags List fields even if initialized with ImmutableList --> \
-Xep:MutablePublicArray:ERROR \
-Xep:NullOptional:ERROR \
-Xep:ObjectToString:ERROR \
-Xep:UnnecessaryMethodReference:ERROR \
Expand Down
6 changes: 2 additions & 4 deletions ...no-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteRun.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ private String formatSuiteTestRuns(List<SuiteTestRun> suiteTestRuns)
private void printTestRunsSummary(List<TestRunResult> results)
{
ConsoleTable table = new ConsoleTable();
table.addHeader(HEADER);
table.addHeader(HEADER.toArray());
results.forEach(result -> table.addRow(result.toRow()));
table.addSeparator();
log.info("Suite tests results:\n%s", table.render());
Expand Down Expand Up @@ -350,9 +350,7 @@ private static String suiteRunId(String runId, String suiteName, SuiteTestRun su

static class TestRunResult
{
public static final Object[] HEADER = {
"id", "suite", "environment", "config", "options", "status", "elapsed", "error"
};
public static final List<String> HEADER = List.of("id", "suite", "environment", "config", "options", "status", "elapsed", "error");

private final String runId;
private final SuiteTestRun suiteRun;
Expand Down
2 changes: 1 addition & 1 deletion ...tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ private StatisticsFetcher fetcher(DockerContainer container)
private void printContainerStats()
{
ConsoleTable statistics = new ConsoleTable();
statistics.addHeader(HEADER);
statistics.addHeader(HEADER.toArray());
fetchers.entrySet().forEach(entry -> statistics.addRow(entry.getValue().get().toRow(entry.getKey())));
statistics.addSeparator();

Expand Down
5 changes: 2 additions & 3 deletions ...t-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/StatisticsFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,16 +183,15 @@ public void close()

public static class Stats
{
public static final String[] HEADER = {
public static final List<String> HEADER = List.of(
"container",
"cpu",
"mem",
"max mem",
"mem %",
"pids",
"net in",
"net out"
};
"net out");

private long systemCpuUsage = -1;
private long totalCpuUsage = -1;
Expand Down