Skip to content
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

Fix TestConfiguredFeatures failure in suite-gcs #20350

Merged
merged 2 commits into from
Jan 12, 2024
Merged

Fix TestConfiguredFeatures failure in suite-gcs #20350

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
e61fd89
Fix TestConfiguredFeatures failure in suite-gcs
findepi Jan 11, 2024
373aa94
Use Collection.isEmpty
findepi Jan 11, 2024
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 plugin/trino-hive/src/main/java/io/trino/plugin/hive/ReaderProjectionsAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public Page adaptPage(@Nullable Page input)

private static Block createAdaptedLazyBlock(Block inputBlock, List<Integer> dereferenceSequence)
{
if (dereferenceSequence.size() == 0) {
if (dereferenceSequence.isEmpty()) {
return inputBlock;
}

Expand Down Expand Up @@ -129,7 +129,7 @@ public Block load()
*/
private Block loadInternalBlock(List<Integer> dereferences, Block parentBlock)
{
if (dereferences.size() == 0) {
if (dereferences.isEmpty()) {
return parentBlock.getLoadedBlock();
}

Expand Down
4 changes: 2 additions & 2 deletions plugin/trino-hive/src/main/java/io/trino/plugin/hive/util/AsyncQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public AsyncQueue(int targetQueueSize, Executor executor)
*/
public synchronized boolean isFinished()
{
return finishing && borrowerCount == 0 && elements.size() == 0;
return finishing && borrowerCount == 0 && elements.isEmpty();
}

public synchronized void finish()
Expand All @@ -83,7 +83,7 @@ public synchronized void finish()
private synchronized void signalIfFinishing()
{
if (finishing && borrowerCount == 0) {
if (elements.size() == 0) {
if (elements.isEmpty()) {
// Reset elements queue after finishing to avoid holding on to the full sized empty array inside
elements = new ArrayDeque<>(0);
completeAsync(executor, notEmptySignal);
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveReaderProjectionsUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static HiveColumnHandle createProjectedColumnHandle(HiveColumnHandle colu
{
checkArgument(column.isBaseColumn(), "base column is expected here");

if (indices.size() == 0) {
if (indices.isEmpty()) {
return column;
}

Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestReaderProjectionsAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ private static void verifyBlock(Block actualBlock, Type outputType, Block input,

private static Block createProjectedColumnBlock(Block data, Type finalType, RowType blockType, List<Integer> dereferences)
{
if (dereferences.size() == 0) {
if (dereferences.isEmpty()) {
return data;
}

Expand Down
2 changes: 1 addition & 1 deletion ...uncher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeGcs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public void extendEnvironment(Environment.Builder builder)
.withEnv("GCP_TEST_DIRECTORY", gcsTestDirectory));

builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-gcs/hive.properties")), CONTAINER_TRINO_HIVE_PROPERTIES);
builder.addConnector("delta", forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-gcs/delta.properties")), CONTAINER_TRINO_ETC + "/catalog/delta.properties");
builder.addConnector("delta_lake", forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-gcs/delta.properties")), CONTAINER_TRINO_ETC + "/catalog/delta.properties");
builder.addConnector("iceberg", forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-gcs/iceberg.properties")), CONTAINER_TRINO_ETC + "/catalog/iceberg.properties");

configureTempto(builder, dockerFiles.getDockerFilesHostDirectory("conf/environment/multinode-gcs/"));
Expand Down