Skip to content

Remove redundant check #12379

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 4 commits into from
May 18, 2022
Merged

Remove redundant check #12379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b393c01
Remove redundant `replace` check in `TrinoHiveCatalog`
polaris6 May 16, 2022
66058b4
Remove redundant `isArray` check in `Validator`
polaris6 May 16, 2022
54f94a3
Remove redundant not null check in `CassandraSession`
polaris6 May 16, 2022
6489f1c
Remove dead code in `CassandraSession`
polaris6 May 17, 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
7 changes: 1 addition & 6 deletions plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,11 +395,6 @@ public List<CassandraPartition> getPartitions(CassandraTable table, List<Set<Obj
rows = queryPartitionKeysLegacyWithMultipleQueries(table, filterPrefixes);
}

if (rows == null) {
// just split the whole partition range
return ImmutableList.of(CassandraPartition.UNPARTITIONED);
}

ByteBuffer buffer = ByteBuffer.allocate(1000);
HashMap<ColumnHandle, NullableValue> map = new HashMap<>();
Set<String> uniquePartitionIds = new HashSet<>();
Expand Down Expand Up @@ -489,7 +484,7 @@ private Iterable<Row> queryPartitionKeysLegacyWithMultipleQueries(CassandraTable

log.debug("Execute cql for partition keys with multiple queries: %s", partitionKeys);
List<Row> resultRows = execute(partitionKeys.build()).all();
if (resultRows != null && !resultRows.isEmpty()) {
if (!resultRows.isEmpty()) {
rowList.addAll(resultRows);
}
}
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/TrinoHiveCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ public void createMaterializedView(
.setViewExpandedText(Optional.of("/* " + ICEBERG_MATERIALIZED_VIEW_COMMENT + " */"));
io.trino.plugin.hive.metastore.Table table = tableBuilder.build();
PrincipalPrivileges principalPrivileges = isUsingSystemSecurity ? NO_PRIVILEGES : buildInitialPrivilegeSet(session.getUser());
if (existing.isPresent() && replace) {
if (existing.isPresent()) {
// drop the current storage table
String oldStorageTable = existing.get().getParameters().get(STORAGE_TABLE);
if (oldStorageTable != null) {
Expand Down
2 changes: 1 addition & 1 deletion service/trino-verifier/src/main/java/io/trino/verifier/Validator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ private static Comparator<Object> columnComparator(int precision)
if (a.getClass() != b.getClass()) {
throw new TypesDoNotMatchException(format("item types do not match: %s vs %s", a.getClass().getName(), b.getClass().getName()));
}
if ((a.getClass().isArray() && b.getClass().isArray())) {
if (a.getClass().isArray()) {
Object[] aArray = (Object[]) a;
Object[] bArray = (Object[]) b;

Expand Down