Skip to content

Commit

Permalink
Rename onPresto to onTrino in product tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@findepi
findepi committed Mar 23, 2021
1 parent 2623d1e commit dc84dac
Show file tree
Hide file tree
Showing 35 changed files with 558 additions and 552 deletions.
12 changes: 6 additions & 6 deletions testing/trino-product-tests/src/main/java/io/trino/tests/TestFunctions.java
View file
Expand Up @@ -19,7 +19,7 @@
import static io.trino.tempto.assertions.QueryAssert.Row.row;
import static io.trino.tempto.assertions.QueryAssert.assertThat;
import static io.trino.tests.TestGroups.FUNCTIONS;
import static io.trino.tests.utils.QueryExecutors.onPresto;
import static io.trino.tests.utils.QueryExecutors.onTrino;
import static org.testng.Assert.assertEquals;

public class TestFunctions
Expand All @@ -28,21 +28,21 @@ public class TestFunctions
@Test(groups = FUNCTIONS)
public void testSubstring()
{
assertThat(onPresto().executeQuery("SELECT SUBSTRING('ala ma kota' from 2 for 4)")).contains(row("la m"));
assertThat(onPresto().executeQuery("SELECT SUBSTR('ala ma kota', 2, 4)")).contains(row("la m"));
assertThat(onTrino().executeQuery("SELECT SUBSTRING('ala ma kota' from 2 for 4)")).contains(row("la m"));
assertThat(onTrino().executeQuery("SELECT SUBSTR('ala ma kota', 2, 4)")).contains(row("la m"));
}

@Test(groups = FUNCTIONS)
public void testPosition()
{
assertThat(onPresto().executeQuery("SELECT POSITION('ma' IN 'ala ma kota')")).contains(row(5));
assertThat(onTrino().executeQuery("SELECT POSITION('ma' IN 'ala ma kota')")).contains(row(5));
}

@Test(groups = FUNCTIONS)
public void testVersion()
{
assertEquals(
onPresto().executeQuery("SELECT version()").row(0).get(0),
onPresto().executeQuery("SELECT node_version FROM system.runtime.nodes WHERE coordinator = TRUE").row(0).get(0));
onTrino().executeQuery("SELECT version()").row(0).get(0),
onTrino().executeQuery("SELECT node_version FROM system.runtime.nodes WHERE coordinator = TRUE").row(0).get(0));
}
}
4 changes: 2 additions & 2 deletions testing/trino-product-tests/src/main/java/io/trino/tests/TestTls.java
View file
Expand Up @@ -30,7 +30,7 @@

import static io.trino.tests.TestGroups.PROFILE_SPECIFIC_TESTS;
import static io.trino.tests.TestGroups.TLS;
import static io.trino.tests.utils.QueryExecutors.onPresto;
import static io.trino.tests.utils.QueryExecutors.onTrino;
import static java.lang.String.format;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.stream.Collectors.toList;
Expand Down Expand Up @@ -83,7 +83,7 @@ private void waitForNodeRefresh()

private List<String> getActiveNodesUrls()
{
QueryResult queryResult = onPresto()
QueryResult queryResult = onTrino()
.executeQuery("SELECT http_uri FROM system.runtime.nodes");
return queryResult.rows()
.stream()
Expand Down
26 changes: 13 additions & 13 deletions testing/trino-product-tests/src/main/java/io/trino/tests/cassandra/TestSelect.java
View file
Expand Up @@ -42,7 +42,7 @@
import static io.trino.tests.cassandra.TestConstants.CONNECTOR_NAME;
import static io.trino.tests.cassandra.TestConstants.KEY_SPACE;
import static io.trino.tests.utils.QueryAssertions.assertContainsEventually;
import static io.trino.tests.utils.QueryExecutors.onPresto;
import static io.trino.tests.utils.QueryExecutors.onTrino;
import static java.lang.String.format;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.sql.JDBCType.BIGINT;
Expand Down Expand Up @@ -82,7 +82,7 @@ public void testSelectNation()
CONNECTOR_NAME,
KEY_SPACE,
CASSANDRA_NATION.getName());
QueryResult queryResult = onPresto()
QueryResult queryResult = onTrino()
.executeQuery(sql);

assertThat(queryResult).matches(PRESTO_NATION_RESULT);
Expand All @@ -96,7 +96,7 @@ public void testSelectWithEqualityFilterOnPartitioningKey()
CONNECTOR_NAME,
KEY_SPACE,
CASSANDRA_NATION.getName());
QueryResult queryResult = onPresto()
QueryResult queryResult = onTrino()
.executeQuery(sql);

assertThat(queryResult).containsOnly(row(0));
Expand All @@ -110,7 +110,7 @@ public void testSelectWithFilterOnPartitioningKey()
CONNECTOR_NAME,
KEY_SPACE,
CASSANDRA_NATION.getName());
QueryResult queryResult = onPresto()
QueryResult queryResult = onTrino()
.executeQuery(sql);

assertThat(queryResult).containsOnly(row(24));
Expand All @@ -124,7 +124,7 @@ public void testSelectWithEqualityFilterOnNonPartitioningKey()
CONNECTOR_NAME,
KEY_SPACE,
CASSANDRA_NATION.getName());
QueryResult queryResult = onPresto()
QueryResult queryResult = onTrino()
.executeQuery(sql);

assertThat(queryResult).containsOnly(row("UNITED STATES"));
Expand All @@ -138,7 +138,7 @@ public void testSelectWithNonEqualityFilterOnNonPartitioningKey()
CONNECTOR_NAME,
KEY_SPACE,
CASSANDRA_NATION.getName());
QueryResult queryResult = onPresto()
QueryResult queryResult = onTrino()
.executeQuery(sql);

assertThat(queryResult).containsOnly(row("ALGERIA"), row("ARGENTINA"));
Expand All @@ -152,7 +152,7 @@ public void testSelectWithMorePartitioningKeysThanLimit()
CONNECTOR_NAME,
KEY_SPACE,
CASSANDRA_SUPPLIER.getName());
QueryResult queryResult = onPresto()
QueryResult queryResult = onTrino()
.executeQuery(sql);

assertThat(queryResult).containsOnly(row(10));
Expand All @@ -166,7 +166,7 @@ public void testSelectWithMorePartitioningKeysThanLimitNonPK()
CONNECTOR_NAME,
KEY_SPACE,
CASSANDRA_SUPPLIER.getName());
QueryResult queryResult = onPresto()
QueryResult queryResult = onTrino()
.executeQuery(sql);

assertThat(queryResult).containsOnly(row(10));
Expand Down Expand Up @@ -243,7 +243,7 @@ public void testNationJoinNation()
"WHERE n1.n_nationkey=3",
tableName,
tableName);
QueryResult queryResult = onPresto()
QueryResult queryResult = onTrino()
.executeQuery(sql);

assertThat(queryResult).containsOnly(
Expand All @@ -264,7 +264,7 @@ public void testNationJoinRegion()
CONNECTOR_NAME,
KEY_SPACE,
CASSANDRA_NATION.getName());
QueryResult queryResult = onPresto()
QueryResult queryResult = onTrino()
.executeQuery(sql);

assertThat(queryResult).containsOnly(row("CANADA", "AMERICA"));
Expand Down Expand Up @@ -349,14 +349,14 @@ public void testSelectClusteringMaterializedView()
query("SELECT true"),
new Duration(1, MINUTES));

QueryResult aggregateQueryResult = onPresto()
QueryResult aggregateQueryResult = onTrino()
.executeQuery(format(
"SELECT MAX(s_nationkey), SUM(s_suppkey), AVG(s_acctbal) " +
"FROM %s.%s.%s WHERE s_suppkey BETWEEN 1 AND 10 ", CONNECTOR_NAME, KEY_SPACE, mvName));
assertThat(aggregateQueryResult).containsOnly(
row(24, 55, 4334.653));

QueryResult orderedResult = onPresto()
QueryResult orderedResult = onTrino()
.executeQuery(format(
"SELECT s_nationkey, s_suppkey, s_acctbal " +
"FROM %s.%s.%s WHERE s_nationkey = 1 LIMIT 1", CONNECTOR_NAME, KEY_SPACE, mvName));
Expand All @@ -369,7 +369,7 @@ public void testSelectClusteringMaterializedView()
@Test(groups = {CASSANDRA, PROFILE_SPECIFIC_TESTS})
public void testProtocolVersion()
{
QueryResult queryResult = onPresto()
QueryResult queryResult = onTrino()
.executeQuery(format("SELECT native_protocol_version FROM %s.system.local", CONNECTOR_NAME));
assertThat(queryResult).containsOnly(row("4"));
}
Expand Down
14 changes: 7 additions & 7 deletions .../trino-product-tests/src/main/java/io/trino/tests/cassandra/TestSelectMultiColumnKey.java
View file
Expand Up @@ -28,7 +28,7 @@
import static io.trino.tests.cassandra.MultiColumnKeyTableDefinition.CASSANDRA_MULTI_COLUMN_KEY;
import static io.trino.tests.cassandra.TestConstants.CONNECTOR_NAME;
import static io.trino.tests.cassandra.TestConstants.KEY_SPACE;
import static io.trino.tests.utils.QueryExecutors.onPresto;
import static io.trino.tests.utils.QueryExecutors.onTrino;
import static java.lang.String.format;

public class TestSelectMultiColumnKey
Expand All @@ -49,7 +49,7 @@ public void testSelectWithEqualityFilterOnClusteringKey()
CONNECTOR_NAME,
KEY_SPACE,
CASSANDRA_MULTI_COLUMN_KEY.getName());
QueryResult queryResult = onPresto()
QueryResult queryResult = onTrino()
.executeQuery(sql);

assertThat(queryResult).containsOnly(row("Test value 1"));
Expand All @@ -63,7 +63,7 @@ public void testSelectWithEqualityFilterOnPrimaryAndClusteringKeys()
CONNECTOR_NAME,
KEY_SPACE,
CASSANDRA_MULTI_COLUMN_KEY.getName());
QueryResult queryResult = onPresto()
QueryResult queryResult = onTrino()
.executeQuery(sql);

assertThat(queryResult).containsOnly(row("Test value 1"));
Expand All @@ -77,7 +77,7 @@ public void testSelectWithMixedFilterOnPrimaryAndClusteringKeys()
CONNECTOR_NAME,
KEY_SPACE,
CASSANDRA_MULTI_COLUMN_KEY.getName());
QueryResult queryResult = onPresto()
QueryResult queryResult = onTrino()
.executeQuery(sql);

assertThat(queryResult).containsOnly(row("Test value 1"));
Expand All @@ -91,7 +91,7 @@ public void testSelectWithFilterOnPrimaryKeyNoMatch()
CONNECTOR_NAME,
KEY_SPACE,
CASSANDRA_MULTI_COLUMN_KEY.getName());
QueryResult queryResult = onPresto()
QueryResult queryResult = onTrino()
.executeQuery(sql);

assertThat(queryResult).hasNoRows();
Expand All @@ -105,7 +105,7 @@ public void testSelectWithFilterOnPrefixOfClusteringKey()
CONNECTOR_NAME,
KEY_SPACE,
CASSANDRA_MULTI_COLUMN_KEY.getName());
QueryResult queryResult = onPresto()
QueryResult queryResult = onTrino()
.executeQuery(sql);

assertThat(queryResult).containsOnly(row("Test value 2"));
Expand All @@ -120,7 +120,7 @@ public void testSelectWithFilterOnSecondClusteringKey()
CONNECTOR_NAME,
KEY_SPACE,
CASSANDRA_MULTI_COLUMN_KEY.getName());
QueryResult queryResult = onPresto()
QueryResult queryResult = onTrino()
.executeQuery(sql);

assertThat(queryResult).containsOnly(row("Test value 2"));
Expand Down
20 changes: 10 additions & 10 deletions testing/trino-product-tests/src/main/java/io/trino/tests/hive/AbstractTestHiveViews.java
View file
Expand Up @@ -32,7 +32,7 @@
import static io.trino.tempto.query.QueryExecutor.query;
import static io.trino.tests.TestGroups.HIVE_VIEWS;
import static io.trino.tests.utils.QueryExecutors.onHive;
import static io.trino.tests.utils.QueryExecutors.onPresto;
import static io.trino.tests.utils.QueryExecutors.onTrino;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.testng.Assert.assertEquals;
Expand Down Expand Up @@ -148,8 +148,8 @@ public void testShowCreateView()
@Test(groups = HIVE_VIEWS)
public void testLateralViewExplode()
{
onPresto().executeQuery("DROP TABLE IF EXISTS pageAds");
onPresto().executeQuery("CREATE TABLE pageAds(pageid, adid_list) WITH (format='TEXTFILE') AS " +
onTrino().executeQuery("DROP TABLE IF EXISTS pageAds");
onTrino().executeQuery("CREATE TABLE pageAds(pageid, adid_list) WITH (format='TEXTFILE') AS " +
"VALUES " +
" (CAST('two' AS varchar), ARRAY[11, 22]), " +
" ('nothing', NULL), " +
Expand Down Expand Up @@ -223,8 +223,8 @@ public void testRichSqlSyntax()
@Test(groups = HIVE_VIEWS)
public void testIdentifierThatStartWithDigit()
{
onPresto().executeQuery("DROP TABLE IF EXISTS \"7_table_with_number\"");
onPresto().executeQuery("CREATE TABLE \"7_table_with_number\" WITH (format='TEXTFILE') AS SELECT CAST('abc' AS varchar) x");
onTrino().executeQuery("DROP TABLE IF EXISTS \"7_table_with_number\"");
onTrino().executeQuery("CREATE TABLE \"7_table_with_number\" WITH (format='TEXTFILE') AS SELECT CAST('abc' AS varchar) x");

onHive().executeQuery("DROP VIEW IF EXISTS view_on_identifiers_starting_with_numbers");
onHive().executeQuery("CREATE VIEW view_on_identifiers_starting_with_numbers AS SELECT * FROM 7_table_with_number");
Expand All @@ -242,8 +242,8 @@ public void testHiveViewInInformationSchema()
onHive().executeQuery("CREATE SCHEMA test_schema;");
onHive().executeQuery("CREATE VIEW test_schema.hive_test_view AS SELECT * FROM nation");
onHive().executeQuery("CREATE TABLE test_schema.hive_table(a string)");
onPresto().executeQuery("CREATE TABLE test_schema.trino_table(a int)");
onPresto().executeQuery("CREATE VIEW test_schema.trino_test_view AS SELECT * FROM nation");
onTrino().executeQuery("CREATE TABLE test_schema.trino_table(a int)");
onTrino().executeQuery("CREATE VIEW test_schema.trino_test_view AS SELECT * FROM nation");

boolean hiveWithTableNamesByType = getHiveVersionMajor() >= 3 ||
(getHiveVersionMajor() == 2 && getHiveVersionMinor() >= 3);
Expand Down Expand Up @@ -363,7 +363,7 @@ protected static void assertViewQuery(String query, Consumer<QueryAssert> assert
{
// Ensure Hive and Presto view compatibility by comparing the results
assertion.accept(assertThat(onHive().executeQuery(query)));
assertion.accept(assertThat(onPresto().executeQuery(query)));
assertion.accept(assertThat(onTrino().executeQuery(query)));
}

protected static Date sqlDate(int year, int month, int day)
Expand All @@ -379,14 +379,14 @@ protected QueryExecutor connectToPresto(String catalog)
protected void setSessionProperty(String key, String value)
{
// We need to setup sessions for both "presto" and "default" executors in tempto
onPresto().executeQuery(format("SET SESSION %s = %s", key, value));
onTrino().executeQuery(format("SET SESSION %s = %s", key, value));
query(format("SET SESSION %s = %s", key, value));
}

protected void unsetSessionProperty(String key)
{
// We need to setup sessions for both "presto" and "default" executors in tempto
onPresto().executeQuery("RESET SESSION " + key);
onTrino().executeQuery("RESET SESSION " + key);
query("RESET SESSION " + key);
}
}

0 comments on commit dc84dac

Please sign in to comment.