Skip to content

[cleanup] moving test sql to a yaml file for better readability #9580

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
walterddr merged 2 commits into from
Oct 12, 2022
Merged

[cleanup] moving test sql to a yaml file for better readability #9580

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
3de055d
moving test sql to a yaml file for better readability
Oct 12, 2022
b754721
fix style
walterddr Oct 12, 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
81 changes: 15 additions & 66 deletions ...ation-tests/src/test/java/org/apache/pinot/integration/tests/SSBQueryIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@

import com.google.common.collect.ImmutableMap;
import java.io.File;
import java.io.InputStream;
import java.net.URL;
import java.sql.ResultSet;
import java.sql.Statement;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import org.apache.commons.io.FileUtils;
Expand All @@ -46,6 +48,7 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import org.yaml.snakeyaml.Yaml;


public class SSBQueryIntegrationTest extends BaseClusterIntegrationTest {
Expand All @@ -57,6 +60,7 @@ public class SSBQueryIntegrationTest extends BaseClusterIntegrationTest {
"lineorder", "examples/batch/ssb/lineorder",
"part", "examples/batch/ssb/part",
"supplier", "examples/batch/ssb/supplier");
private static final String SSB_QUERY_SET_RESOURCE_NAME = "ssb/ssb_query_set.yaml";

@BeforeClass
public void setUp()
Expand Down Expand Up @@ -100,13 +104,13 @@ public void setUp()
DataTableBuilderFactory.setDataTableVersion(DataTableFactory.VERSION_4);
}

@Test(dataProvider = "ssbQueryDataProvider")
@Test(dataProvider = "QueryDataProvider")
public void testSSBQueries(String query)
throws Exception {
testSSBQuery(query);
testQueriesValidateAgainstH2(query);
}

private void testSSBQuery(String query)
protected void testQueriesValidateAgainstH2(String query)
throws Exception {
// connection response
ResultSetGroup pinotResultSetGroup = getPinotConnection().execute(query);
Expand Down Expand Up @@ -192,68 +196,13 @@ public void tearDown()
FileUtils.deleteDirectory(_tempDir);
}

@DataProvider(name = "ssbQueryDataProvider")
public static Object[][] ssbQueryDataProvider() {
// TODO: refactor these out to .sql files
return new Object[][]{
new Object[]{"select sum(CAST(LO_EXTENDEDPRICE AS DOUBLE) * LO_DISCOUNT) as revenue "
+ " from lineorder, dates where LO_ORDERDATE = D_DATEKEY and D_YEAR = 1993 "
+ " and LO_DISCOUNT between 1 and 3 and LO_QUANTITY < 25; \n"},
new Object[]{"select sum(CAST(LO_EXTENDEDPRICE AS DOUBLE) * LO_DISCOUNT) as revenue "
+ " from lineorder, dates where LO_ORDERDATE = D_DATEKEY and D_YEARMONTHNUM = 199401 "
+ " and LO_DISCOUNT between 4 and 6 and LO_QUANTITY between 26 and 35; \n"},
new Object[]{"select sum(CAST(LO_EXTENDEDPRICE AS DOUBLE) * LO_DISCOUNT) as revenue "
+ " from lineorder, dates where LO_ORDERDATE = D_DATEKEY and D_WEEKNUMINYEAR = 6 and D_YEAR = 1994 "
+ " and LO_DISCOUNT between 5 and 7 and LO_QUANTITY between 26 and 35; \n"},
new Object[]{"select sum(CAST(LO_REVENUE AS DOUBLE)), D_YEAR, P_BRAND1 "
+ " from lineorder, dates, part, supplier where LO_ORDERDATE = D_DATEKEY and LO_PARTKEY = P_PARTKEY "
+ " and LO_SUPPKEY = S_SUPPKEY and P_CATEGORY = 'MFGR#12' and S_REGION = 'AMERICA' "
+ " group by D_YEAR, P_BRAND1 order by D_YEAR, P_BRAND1; \n"},
new Object[]{"select sum(CAST(LO_REVENUE AS DOUBLE)), D_YEAR, P_BRAND1 "
+ " from lineorder, dates, part, supplier where LO_ORDERDATE = D_DATEKEY and LO_PARTKEY = P_PARTKEY "
+ " and LO_SUPPKEY = S_SUPPKEY and P_BRAND1 between 'MFGR#2221' and 'MFGR#2228' and S_REGION = 'ASIA' "
+ " group by D_YEAR, P_BRAND1 order by D_YEAR, P_BRAND1; \n"},
new Object[]{"select sum(CAST(LO_REVENUE AS DOUBLE)), D_YEAR, P_BRAND1 "
+ " from lineorder, dates, part, supplier where LO_ORDERDATE = D_DATEKEY and LO_PARTKEY = P_PARTKEY "
+ " and LO_SUPPKEY = S_SUPPKEY and P_BRAND1 = 'MFGR#2221' and S_REGION = 'EUROPE' "
+ " group by D_YEAR, P_BRAND1 order by D_YEAR, P_BRAND1\n"},
new Object[]{"select C_NATION, S_NATION, D_YEAR, sum(LO_REVENUE) as revenue "
+ " from customer, lineorder, supplier, dates where LO_CUSTKEY = C_CUSTKEY and LO_SUPPKEY = S_SUPPKEY "
+ " and LO_ORDERDATE = D_DATEKEY and C_REGION = 'ASIA' and S_REGION = 'ASIA' and D_YEAR >= 1992 "
+ " and D_YEAR <= 1997 "
+ " group by C_NATION, S_NATION, D_YEAR order by D_YEAR asc, revenue desc; \n"},
new Object[]{"select C_CITY, S_CITY, D_YEAR, sum(LO_REVENUE) as revenue "
+ " from customer, lineorder, supplier, dates where LO_CUSTKEY = C_CUSTKEY and LO_SUPPKEY = S_SUPPKEY "
+ " and LO_ORDERDATE = D_DATEKEY and C_NATION = 'UNITED STATES' and S_NATION = 'UNITED STATES' "
+ " and D_YEAR >= 1992 and D_YEAR <= 1997 "
+ " group by C_CITY, S_CITY, D_YEAR order by D_YEAR asc, revenue desc; \n"},
new Object[]{"select C_CITY, S_CITY, D_YEAR, sum(LO_REVENUE) as revenue "
+ " from customer, lineorder, supplier, dates where LO_CUSTKEY = C_CUSTKEY and LO_SUPPKEY = S_SUPPKEY "
+ " and LO_ORDERDATE = D_DATEKEY and (C_CITY='UNITED KI1' or C_CITY='UNITED KI5') "
+ " and (S_CITY='UNITED KI1' or S_CITY='UNITED KI5') and D_YEAR >= 1992 and D_YEAR <= 1997 "
+ " group by C_CITY, S_CITY, D_YEAR order by D_YEAR asc, revenue desc;\n"},
new Object[]{"select C_CITY, S_CITY, D_YEAR, sum(LO_REVENUE) as revenue "
+ " from customer, lineorder, supplier, dates where LO_CUSTKEY = C_CUSTKEY and LO_SUPPKEY = S_SUPPKEY "
+ " and LO_ORDERDATE = D_DATEKEY and (C_CITY='UNITED KI1' or C_CITY='UNITED KI5') "
+ " and (S_CITY='UNITED KI1' or S_CITY='UNITED KI5') and D_YEARMONTH = 'Jul1995' "
+ " group by C_CITY, S_CITY, D_YEAR order by D_YEAR asc, revenue desc; \n"},
new Object[]{"select D_YEAR, C_NATION, sum(LO_REVENUE - LO_SUPPLYCOST) as profit "
+ " from lineorder, customer, supplier, part, dates where LO_CUSTKEY = C_CUSTKEY "
+ " and LO_SUPPKEY = S_SUPPKEY and LO_PARTKEY = P_PARTKEY and LO_ORDERDATE = D_DATEKEY "
+ " and C_REGION = 'AMERICA' and S_REGION = 'AMERICA' and (P_MFGR = 'MFGR#1' or P_MFGR = 'MFGR#2') "
+ " group by D_YEAR, C_NATION order by D_YEAR, C_NATION\n"},
new Object[]{"select D_YEAR, S_NATION, P_CATEGORY, sum(LO_REVENUE - LO_SUPPLYCOST) as profit "
+ " from lineorder, dates, customer, supplier, part where LO_CUSTKEY = C_CUSTKEY "
+ " and LO_SUPPKEY = S_SUPPKEY and LO_PARTKEY = P_PARTKEY and LO_ORDERDATE = D_DATEKEY "
+ " and C_REGION = 'AMERICA' and S_REGION = 'AMERICA' and (D_YEAR = 1997 or D_YEAR = 1998) "
+ " and (P_MFGR = 'MFGR#1' or P_MFGR = 'MFGR#2') "
+ " group by D_YEAR, S_NATION, P_CATEGORY order by D_YEAR, S_NATION, P_CATEGORY\n"},
new Object[]{"select D_YEAR, S_CITY, P_BRAND1, sum(LO_REVENUE - LO_SUPPLYCOST) as profit "
+ " from lineorder, dates, customer, supplier, part where LO_CUSTKEY = C_CUSTKEY "
+ " and LO_SUPPKEY = S_SUPPKEY and LO_PARTKEY = P_PARTKEY and LO_ORDERDATE = D_DATEKEY "
+ " and C_REGION = 'AMERICA' and S_NATION = 'UNITED STATES' and (D_YEAR = 1997 or D_YEAR = 1998) "
+ " and P_CATEGORY = 'MFGR#14' "
+ " group by D_YEAR, S_CITY, P_BRAND1 order by D_YEAR, S_CITY, P_BRAND1 \n"},
};
@DataProvider(name = "QueryDataProvider")
public static Object[][] queryDataProvider() {
Yaml yaml = new Yaml();
InputStream inputStream = SSBQueryIntegrationTest.class.getClassLoader()
.getResourceAsStream(SSB_QUERY_SET_RESOURCE_NAME);
Map<String, List<String>> ssbQuerySet = yaml.load(inputStream);
List<String> ssbQueryList = ssbQuerySet.get("sqls");
return ssbQueryList.stream().map(s -> new Object[]{s}).toArray(Object[][]::new);
}
}
94 changes: 94 additions & 0 deletions pinot-integration-tests/src/test/resources/ssb/ssb_query_set.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#

# This function defines the test set of SSB queries
# see also: https://www.cs.umb.edu/~poneil/StarSchemaB.PDF
sqls:
# SSB Q1
- |
select sum(CAST(LO_EXTENDEDPRICE AS DOUBLE) * LO_DISCOUNT) as revenue
from lineorder, dates where LO_ORDERDATE = D_DATEKEY and D_YEAR = 1993
and LO_DISCOUNT between 1 and 3 and LO_QUANTITY < 25;
- |
select sum(CAST(LO_EXTENDEDPRICE AS DOUBLE) * LO_DISCOUNT) as revenue
from lineorder, dates where LO_ORDERDATE = D_DATEKEY and D_YEARMONTHNUM = 199401
and LO_DISCOUNT between 4 and 6 and LO_QUANTITY between 26 and 35;
- |
select sum(CAST(LO_EXTENDEDPRICE AS DOUBLE) * LO_DISCOUNT) as revenue
from lineorder, dates where LO_ORDERDATE = D_DATEKEY and D_WEEKNUMINYEAR = 6 and D_YEAR = 1994
and LO_DISCOUNT between 5 and 7 and LO_QUANTITY between 26 and 35;
# SSB Q2
- |
select sum(CAST(LO_REVENUE AS DOUBLE)), D_YEAR, P_BRAND1
from lineorder, dates, part, supplier where LO_ORDERDATE = D_DATEKEY and LO_PARTKEY = P_PARTKEY
and LO_SUPPKEY = S_SUPPKEY and P_CATEGORY = 'MFGR#12' and S_REGION = 'AMERICA'
group by D_YEAR, P_BRAND1 order by D_YEAR, P_BRAND1;
- |
select sum(CAST(LO_REVENUE AS DOUBLE)), D_YEAR, P_BRAND1
from lineorder, dates, part, supplier where LO_ORDERDATE = D_DATEKEY and LO_PARTKEY = P_PARTKEY
and LO_SUPPKEY = S_SUPPKEY and P_BRAND1 between 'MFGR#2221' and 'MFGR#2228' and S_REGION = 'ASIA'
group by D_YEAR, P_BRAND1 order by D_YEAR, P_BRAND1;
- |
select sum(CAST(LO_REVENUE AS DOUBLE)), D_YEAR, P_BRAND1
from lineorder, dates, part, supplier where LO_ORDERDATE = D_DATEKEY and LO_PARTKEY = P_PARTKEY
and LO_SUPPKEY = S_SUPPKEY and P_BRAND1 = 'MFGR#2221' and S_REGION = 'EUROPE'
group by D_YEAR, P_BRAND1 order by D_YEAR, P_BRAND1;
# SSB Q3
- |
select C_NATION, S_NATION, D_YEAR, sum(LO_REVENUE) as revenue
from customer, lineorder, supplier, dates where LO_CUSTKEY = C_CUSTKEY and LO_SUPPKEY = S_SUPPKEY
and LO_ORDERDATE = D_DATEKEY and C_REGION = 'ASIA' and S_REGION = 'ASIA' and D_YEAR >= 1992
and D_YEAR <= 1997 group by C_NATION, S_NATION, D_YEAR order by D_YEAR asc, revenue desc;
- |
select C_CITY, S_CITY, D_YEAR, sum(LO_REVENUE) as revenue
from customer, lineorder, supplier, dates where LO_CUSTKEY = C_CUSTKEY and LO_SUPPKEY = S_SUPPKEY
and LO_ORDERDATE = D_DATEKEY and C_NATION = 'UNITED STATES' and S_NATION = 'UNITED STATES'
and D_YEAR >= 1992 and D_YEAR <= 1997group by C_CITY, S_CITY, D_YEAR order by D_YEAR asc, revenue desc;
- |
select C_CITY, S_CITY, D_YEAR, sum(LO_REVENUE) as revenue
from customer, lineorder, supplier, dates where LO_CUSTKEY = C_CUSTKEY and LO_SUPPKEY = S_SUPPKEY
and LO_ORDERDATE = D_DATEKEY and (C_CITY='UNITED KI1' or C_CITY='UNITED KI5')
and (S_CITY='UNITED KI1' or S_CITY='UNITED KI5') and D_YEAR >= 1992 and D_YEAR <= 1997
group by C_CITY, S_CITY, D_YEAR order by D_YEAR asc, revenue desc;;
- |
select C_CITY, S_CITY, D_YEAR, sum(LO_REVENUE) as revenue
from customer, lineorder, supplier, dates where LO_CUSTKEY = C_CUSTKEY and LO_SUPPKEY = S_SUPPKEY
and LO_ORDERDATE = D_DATEKEY and (C_CITY='UNITED KI1' or C_CITY='UNITED KI5')
and (S_CITY='UNITED KI1' or S_CITY='UNITED KI5') and D_YEARMONTH = 'Jul1995'
group by C_CITY, S_CITY, D_YEAR order by D_YEAR asc, revenue desc;
# SSB Q4
- |
select D_YEAR, C_NATION, sum(LO_REVENUE - LO_SUPPLYCOST) as profit
from lineorder, customer, supplier, part, dates where LO_CUSTKEY = C_CUSTKEY
and LO_SUPPKEY = S_SUPPKEY and LO_PARTKEY = P_PARTKEY and LO_ORDERDATE = D_DATEKEY
and C_REGION = 'AMERICA' and S_REGION = 'AMERICA' and (P_MFGR = 'MFGR#1' or P_MFGR = 'MFGR#2')
group by D_YEAR, C_NATION order by D_YEAR, C_NATION;
- |
select D_YEAR, S_NATION, P_CATEGORY, sum(LO_REVENUE - LO_SUPPLYCOST) as profit
from lineorder, dates, customer, supplier, part where LO_CUSTKEY = C_CUSTKEY
and LO_SUPPKEY = S_SUPPKEY and LO_PARTKEY = P_PARTKEY and LO_ORDERDATE = D_DATEKEY
and C_REGION = 'AMERICA' and S_REGION = 'AMERICA' and (D_YEAR = 1997 or D_YEAR = 1998)
and (P_MFGR = 'MFGR#1' or P_MFGR = 'MFGR#2') group by D_YEAR, S_NATION, P_CATEGORY
order by D_YEAR, S_NATION, P_CATEGORY;
- |
select D_YEAR, S_CITY, P_BRAND1, sum(LO_REVENUE - LO_SUPPLYCOST) as profit
from lineorder, dates, customer, supplier, part where LO_CUSTKEY = C_CUSTKEY
and LO_SUPPKEY = S_SUPPKEY and LO_PARTKEY = P_PARTKEY and LO_ORDERDATE = D_DATEKEY
and C_REGION = 'AMERICA' and S_NATION = 'UNITED STATES' and (D_YEAR = 1997 or D_YEAR = 1998)
and P_CATEGORY = 'MFGR#14' group by D_YEAR, S_CITY, P_BRAND1 order by D_YEAR, S_CITY, P_BRAND1 ;