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

Revert "Add some traceability which option is failing" #20335

Closed
wants to merge 1 commit into from
+0 −14
Closed

Revert "Add some traceability which option is failing" #20335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 7 deletions plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseJdbcConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
package io.trino.plugin.jdbc;

import com.google.common.collect.ImmutableList;
import io.airlift.log.Logger;
import io.airlift.units.Duration;
import io.trino.Session;
import io.trino.spi.QueryId;
Expand Down Expand Up @@ -126,8 +125,6 @@
public abstract class BaseJdbcConnectorTest
extends BaseConnectorTest
{
private static final Logger log = Logger.get(BaseJdbcConnectorTest.class);

private final ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getName()));

protected abstract SqlExecutor onRemoteDatabase();
Expand Down Expand Up @@ -1200,8 +1197,6 @@ public void testJoinPushdown()
"nation_lowercase",
"AS SELECT nationkey, lower(name) name, regionkey FROM nation")) {
for (JoinOperator joinOperator : JoinOperator.values()) {
log.info("Testing joinOperator=%s", joinOperator);
Copy link
Member

Choose a reason for hiding this comment

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

You can replace it with a describedAs(...) in the assertion that indicates which join operator is being evaluated. That will be included in the failure message.


if (joinOperator == FULL_JOIN && !hasBehavior(SUPPORTS_JOIN_PUSHDOWN_WITH_FULL_JOIN)) {
assertThat(query(session, "SELECT r.name, n.name FROM nation n FULL JOIN region r ON n.regionkey = r.regionkey"))
.joinIsNotFullyPushedDown();
Expand Down Expand Up @@ -1261,7 +1256,6 @@ public void testJoinPushdown()

// inequality along with an equality, which constitutes an equi-condition and allows filter to remain as part of the Join
for (String operator : nonEqualities) {
log.info("Testing [joinOperator=%s] operator=%s on number", joinOperator, operator);
assertJoinConditionallyPushedDown(
session,
format("SELECT n.name, c.name FROM nation n %s customer c ON n.nationkey = c.nationkey AND n.regionkey %s c.custkey", joinOperator, operator),
Expand All @@ -1270,7 +1264,6 @@ public void testJoinPushdown()

// varchar inequality along with an equality, which constitutes an equi-condition and allows filter to remain as part of the Join
for (String operator : nonEqualities) {
log.info("Testing [joinOperator=%s] operator=%s on varchar", joinOperator, operator);
assertJoinConditionallyPushedDown(
session,
format("SELECT n.name, nl.name FROM nation n %s %s nl ON n.regionkey = nl.regionkey AND n.name %s nl.name", joinOperator, nationLowercaseTable.getName(), operator),
Expand Down
7 changes: 0 additions & 7 deletions ...rino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import io.airlift.log.Logger;
import io.airlift.units.Duration;
import io.trino.Session;
import io.trino.plugin.jdbc.BaseJdbcConnectorTest;
Expand Down Expand Up @@ -81,8 +80,6 @@
public class TestPostgreSqlConnectorTest
extends BaseJdbcConnectorTest
{
private static final Logger log = Logger.get(TestPostgreSqlConnectorTest.class);

protected TestingPostgreSqlServer postgreSqlServer;

@Override
Expand Down Expand Up @@ -644,8 +641,6 @@ public void testStringJoinPushdownWithCollate()

// inequality
for (String operator : nonEqualities) {
log.info("Testing operator=%s", operator);

// bigint inequality predicate
assertThat(query(withoutDynamicFiltering, format("SELECT r.name, n.name FROM nation n JOIN region r ON n.regionkey %s r.regionkey", operator)))
// Currently no pushdown as inequality predicate is removed from Join to maintain Cross Join and Filter as separate nodes
Expand All @@ -659,7 +654,6 @@ public void testStringJoinPushdownWithCollate()

// inequality along with an equality, which constitutes an equi-condition and allows filter to remain as part of the Join
for (String operator : nonEqualities) {
log.info("Testing operator=%s", operator);
assertConditionallyPushedDown(
session,
format("SELECT n.name, c.name FROM nation n JOIN customer c ON n.nationkey = c.nationkey AND n.regionkey %s c.custkey", operator),
Expand All @@ -669,7 +663,6 @@ public void testStringJoinPushdownWithCollate()

// varchar inequality along with an equality, which constitutes an equi-condition and allows filter to remain as part of the Join
for (String operator : nonEqualities) {
log.info("Testing operator=%s", operator);
assertConditionallyPushedDown(
session,
format("SELECT n.name, nl.name FROM nation n JOIN %s nl ON n.regionkey = nl.regionkey AND n.name %s nl.name", nationLowercaseTable.getName(), operator),
Expand Down
Loading