update tpcds tp02 query

Change-Id: I19bda97e277872ca56709523695f428861fce32d
Reviewed-on: http://review.couchbase.org/c/perfrunner/+/149004
Tested-by: Build Bot <[email protected]>
Reviewed-by: Korrigan Clark <[email protected]>

Author: bochun

perfrunner/workloads/tpcdsfun/query_gen.py

@@ -45,25 +45,19 @@
             'SELECT c.c_customer_id ORDER BY c.c_customer_id LIMIT 100;',
     'TP02': 'WITH customer_total_return AS ('
             'SELECT sr.sr_customer_sk AS ctr_customer_sk, '
-            'sr.sr_store_sk AS ctr_store_sk, '
-            'SUM(sr.sr_return_amt) AS ctr_total_return '
-            'FROM date_dim dd, store_returns sr '
+            'sr.sr_store_sk AS ctr_store_sk, SUM(sr.sr_return_amt) '
+            'AS ctr_total_return FROM date_dim dd, store_returns sr '
             'WHERE tostring(dd.d_date_sk) /*+ indexnl */ = sr.sr_returned_date_sk '
             'AND dd.d_year = 2000 '
-            'GROUP BY sr.sr_customer_sk, sr.sr_store_sk) '
-            'SELECT c.c_customer_id '
-            'FROM ('
-            'SELECT ctr1.ctr_store_sk, ctr1.ctr_customer_sk '
-            'FROM customer_total_return ctr1 '
-            'WHERE ctr1.ctr_total_return > ('
-            'SELECT VALUE AVG(ctr2.ctr_total_return) * 1.2 '
-            'FROM customer_total_return ctr2 '
-            'WHERE ctr1.ctr_store_sk = ctr2.ctr_store_sk)[0]'
-            ') ctr2 '
-            'JOIN store s ON ctr2.ctr_store_sk /*+ hash-bcast */ = s.s_store_sk '
-            'JOIN customer c ON '
-            'tostring(ctr2.ctr_customer_sk) /*+ indexnl */ = c.c_customer_sk '
-            'WHERE s.s_state= "TN" ORDER BY c.c_customer_id LIMIT 100;',
+            'GROUP BY sr.sr_customer_sk, sr.sr_store_sk), store_avg_returns AS ('
+            'FROM customer_total_return ctr2 GROUP BY ctr2.ctr_store_sk '
+            'SELECT ctr2.ctr_store_sk, AVG(ctr2.ctr_total_return) AS avg_total_returns) '
+            'FROM customer_total_return ctr1 JOIN store_avg_returns '
+            'AS sar ON ctr1.ctr_store_sk = sar.ctr_store_sk JOIN store s '
+            'ON ctr1.ctr_store_sk /*+ hash-bcast */ = s.s_store_sk JOIN customer c '
+            'ON tostring(ctr1.ctr_customer_sk) /*+ indexnl */ = c.c_customer_sk WHERE '
+            'ctr1.ctr_total_return > 1.2 * sar.avg_total_returns AND s.s_state = "TN" '
+            'SELECT c.c_customer_id ORDER BY c.c_customer_id LIMIT 100;',
     'TP03': 'SELECT i_item_id, i_item_desc, '
             'i_category, i_class, i_current_price, '
             'SUM(ss.ss_ext_sales_price) AS itemrevenue, '