Set `store.hive.parquet.optimize_scan_with_native_reader` to true to prevent (#500)
some TPCDS tests from failing when using hive reader until HIVE-19069 is fixed.
diff --git a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query15.sql b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query15.sql
index 89f956e..73b92c3 100644
--- a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query15.sql
+++ b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query15.sql
@@ -1,3 +1,5 @@
+-- set hive option until HIVE-19069 is fixed
+set `store.hive.parquet.optimize_scan_with_native_reader` = true;
-- start query 15 in stream 0 using template query15.tpl
SELECT ca_zip,
Sum(cs_sales_price)
@@ -18,3 +20,4 @@
GROUP BY ca_zip
ORDER BY ca_zip
LIMIT 100;
+reset `store.hive.parquet.optimize_scan_with_native_reader`;
diff --git a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query19.sql b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query19.sql
index d053670..f19513e 100644
--- a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query19.sql
+++ b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query19.sql
@@ -1,3 +1,5 @@
+-- set hive option until HIVE-19069 is fixed
+set `store.hive.parquet.optimize_scan_with_native_reader` = true;
-- start query 19 in stream 0 using template query19.tpl
SELECT i_brand_id brand_id,
i_brand brand,
@@ -29,3 +31,4 @@
i_manufact_id,
i_manufact
LIMIT 100;
+reset `store.hive.parquet.optimize_scan_with_native_reader`;
diff --git a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query3.sql b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query3.sql
index 3b6f4f5..62a698e 100644
--- a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query3.sql
+++ b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query3.sql
@@ -1,3 +1,5 @@
+-- set hive option until HIVE-19069 is fixed
+set `store.hive.parquet.optimize_scan_with_native_reader` = true;
-- start query 3 in stream 0 using template query3.tpl
SELECT dt.d_year,
item.i_brand_id brand_id,
@@ -17,3 +19,4 @@
sum_agg DESC,
brand_id
LIMIT 100;
+reset `store.hive.parquet.optimize_scan_with_native_reader`;
diff --git a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query33.sql b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query33.sql
index 1b6fcdc..79a0823 100644
--- a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query33.sql
+++ b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query33.sql
@@ -1,3 +1,5 @@
+-- set hive option until HIVE-19069 is fixed
+set `store.hive.parquet.optimize_scan_with_native_reader` = true;
-- start query 33 in stream 0 using template query33.tpl
WITH ss
AS (SELECT i_manufact_id,
@@ -63,3 +65,4 @@
GROUP BY i_manufact_id
ORDER BY total_sales
LIMIT 100;
+reset `store.hive.parquet.optimize_scan_with_native_reader`;
diff --git a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query43.sql b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query43.sql
index dbb4016..d3d0b44 100644
--- a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query43.sql
+++ b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query43.sql
@@ -1,3 +1,5 @@
+-- set hive option until HIVE-19069 is fixed
+set `store.hive.parquet.optimize_scan_with_native_reader` = true;
-- start query 43 in stream 0 using template query43.tpl
SELECT s_store_name,
s_store_id,
@@ -48,3 +50,4 @@
fri_sales,
sat_sales
LIMIT 100;
+reset `store.hive.parquet.optimize_scan_with_native_reader`;
diff --git a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query45.sql b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query45.sql
index 90454bc..218a142 100644
--- a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query45.sql
+++ b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query45.sql
@@ -1,3 +1,5 @@
+-- set hive option until HIVE-19069 is fixed
+set `store.hive.parquet.optimize_scan_with_native_reader` = true;
-- start query 45 in stream 0 using template query45.tpl
SELECT ca_zip,
ca_state,
@@ -26,3 +28,4 @@
ORDER BY ca_zip,
ca_state
LIMIT 100;
+reset `store.hive.parquet.optimize_scan_with_native_reader`;
diff --git a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query46.sql b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query46.sql
index 3562694..e861e22 100644
--- a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query46.sql
+++ b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query46.sql
@@ -1,3 +1,5 @@
+-- set hive option until HIVE-19069 is fixed
+set `store.hive.parquet.optimize_scan_with_native_reader` = true;
-- start query 46 in stream 0 using template query46.tpl
SELECT c_last_name,
c_first_name,
@@ -42,3 +44,4 @@
bought_city,
ss_ticket_number
LIMIT 100;
+reset `store.hive.parquet.optimize_scan_with_native_reader`;
diff --git a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query52.sql b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query52.sql
index 685cc9e..19a94dc 100644
--- a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query52.sql
+++ b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query52.sql
@@ -1,3 +1,5 @@
+-- set hive option until HIVE-19069 is fixed
+set `store.hive.parquet.optimize_scan_with_native_reader` = true;
-- start query 52 in stream 0 using template query52.tpl
SELECT dt.d_year,
item.i_brand_id brand_id,
@@ -18,3 +20,4 @@
ext_price DESC,
brand_id
LIMIT 100;
+reset `store.hive.parquet.optimize_scan_with_native_reader`;
diff --git a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query55.sql b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query55.sql
index 0746ad4..04225b4 100644
--- a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query55.sql
+++ b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query55.sql
@@ -1,3 +1,5 @@
+-- set hive option until HIVE-19069 is fixed
+set `store.hive.parquet.optimize_scan_with_native_reader` = true;
-- start query 55 in stream 0 using template query55.tpl
SELECT i_brand_id brand_id,
i_brand brand,
@@ -15,3 +17,4 @@
ORDER BY ext_price DESC,
i_brand_id
LIMIT 100;
+reset `store.hive.parquet.optimize_scan_with_native_reader`;
diff --git a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query59.sql b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query59.sql
index baf7a08..4f234b1 100644
--- a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query59.sql
+++ b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query59.sql
@@ -1,3 +1,5 @@
+-- set hive option until HIVE-19069 is fixed
+set `store.hive.parquet.optimize_scan_with_native_reader` = true;
-- start query 59 in stream 0 using template query59.tpl
WITH wss
AS (SELECT d_week_seq,
@@ -83,3 +85,4 @@
s_store_id1,
d_week_seq1
LIMIT 100;
+reset `store.hive.parquet.optimize_scan_with_native_reader`;
diff --git a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query60.sql b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query60.sql
index a7f480b..0dba53f 100644
--- a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query60.sql
+++ b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query60.sql
@@ -1,3 +1,5 @@
+-- set hive option until HIVE-19069 is fixed
+set `store.hive.parquet.optimize_scan_with_native_reader` = true;
-- start query 60 in stream 0 using template query60.tpl
WITH ss
AS (SELECT i_item_id,
@@ -64,3 +66,4 @@
ORDER BY i_item_id,
total_sales
LIMIT 100;
+reset `store.hive.parquet.optimize_scan_with_native_reader`;
diff --git a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query68.sql b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query68.sql
index ce217e5..58186e6 100644
--- a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query68.sql
+++ b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query68.sql
@@ -1,3 +1,5 @@
+-- set hive option until HIVE-19069 is fixed
+set `store.hive.parquet.optimize_scan_with_native_reader` = true;
-- start query 68 in stream 0 using template query68.tpl
SELECT c_last_name,
c_first_name,
@@ -39,3 +41,4 @@
ORDER BY c_last_name,
ss_ticket_number
LIMIT 100;
+reset `store.hive.parquet.optimize_scan_with_native_reader`;
diff --git a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query76.sql b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query76.sql
index ebee4a6..f1c7c6b 100644
--- a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query76.sql
+++ b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query76.sql
@@ -1,3 +1,5 @@
+-- set hive option until HIVE-19069 is fixed
+set `store.hive.parquet.optimize_scan_with_native_reader` = true;
-- start query 76 in stream 0 using template query76.tpl
SELECT channel,
col_name,
@@ -55,3 +57,4 @@
d_qoy,
i_category
LIMIT 100;
+reset `store.hive.parquet.optimize_scan_with_native_reader`;
diff --git a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query79.sql b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query79.sql
index 07c4dbd..b2bd6b3 100644
--- a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query79.sql
+++ b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query79.sql
@@ -1,3 +1,5 @@
+-- set hive option until HIVE-19069 is fixed
+set `store.hive.parquet.optimize_scan_with_native_reader` = true;
-- start query 79 in stream 0 using template query79.tpl
SELECT c_last_name,
c_first_name,
@@ -33,3 +35,4 @@
Substr(s_city, 1, 30),
profit
LIMIT 100;
+reset `store.hive.parquet.optimize_scan_with_native_reader`;
diff --git a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query91.sql b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query91.sql
index 1462192..3b81b7e 100644
--- a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query91.sql
+++ b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query91.sql
@@ -1,3 +1,5 @@
+-- set hive option until HIVE-19069 is fixed
+set `store.hive.parquet.optimize_scan_with_native_reader` = true;
-- start query 91 in stream 0 using template query91.tpl
SELECT cc_call_center_id Call_Center,
cc_name Call_Center_Name,
@@ -30,3 +32,4 @@
cd_marital_status,
cd_education_status
ORDER BY Sum(cr_net_loss) DESC;
+reset `store.hive.parquet.optimize_scan_with_native_reader`;
diff --git a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query93.sql b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query93.sql
index 1a5aeb8..eebc0cf 100644
--- a/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query93.sql
+++ b/framework/resources/Advanced/tpcds/tpcds_sf100/hive/parquet/query93.sql
@@ -1,3 +1,5 @@
+-- set hive option until HIVE-19069 is fixed
+set `store.hive.parquet.optimize_scan_with_native_reader` = true;
-- start query 93 in stream 0 using template query93.tpl
SELECT ss_customer_sk,
Sum(act_sales) sumsales
@@ -20,3 +22,4 @@
ORDER BY sumsales,
ss_customer_sk
LIMIT 100;
+reset `store.hive.parquet.optimize_scan_with_native_reader`;
diff --git a/framework/src/main/java/org/apache/drill/test/framework/DrillTestJdbc.java b/framework/src/main/java/org/apache/drill/test/framework/DrillTestJdbc.java
index a3f8413..4267057 100644
--- a/framework/src/main/java/org/apache/drill/test/framework/DrillTestJdbc.java
+++ b/framework/src/main/java/org/apache/drill/test/framework/DrillTestJdbc.java
@@ -153,7 +153,7 @@
}
}
if (testStatus == TestStatus.PASS && !TestDriver.cmdParam.outputQueryResult) {
- Utils.deleteFile(outputFilename);
+ // Utils.deleteFile(outputFilename);
}
duration = stopwatch;
diff --git a/framework/src/main/java/org/apache/drill/test/framework/DrillTestOdbc.java b/framework/src/main/java/org/apache/drill/test/framework/DrillTestOdbc.java
index 6c2af3b..108691a 100644
--- a/framework/src/main/java/org/apache/drill/test/framework/DrillTestOdbc.java
+++ b/framework/src/main/java/org/apache/drill/test/framework/DrillTestOdbc.java
@@ -145,7 +145,7 @@
fail(TestStatus.EXECUTION_FAILURE, e);
} finally {
if (testStatus == TestStatus.PASS && !TestDriver.cmdParam.outputQueryResult) {
- Utils.deleteFile(outputFilename);
+ // Utils.deleteFile(outputFilename);
}
duration = stopwatch;
