Changeset: 8bc61745fb7d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8bc61745fb7d
Modified Files:
sql/benchmarks/tpch/load.sh
sql/server/sql_parser.y
sql/test/remote/Tests/ssbm.SQL.py
sql/test/remote/Tests/ssbm.stable.out
Branch: default
Log Message:
allow for WITH on more queries (in copy, return etc)
reverted change in tpch/load.sh (ie include keys)
order tests in ssbm...py
diffs (129 lines):
diff --git a/sql/benchmarks/tpch/load.sh b/sql/benchmarks/tpch/load.sh
--- a/sql/benchmarks/tpch/load.sh
+++ b/sql/benchmarks/tpch/load.sh
@@ -24,8 +24,8 @@ SF='sf-0.01'
#SF='sf-5'
dir=`echo $SF | tr '[a-z]' '[A-Z]'`
-$SQL < c.sql
-#$SQL < c.sql-primary-foreign
+#$SQL < c.sql
+$SQL < c.sql-primary-foreign
#cat load-$SF-LOCKED.sql$T | sed -e s+PWD+$PWD/$dir+ | $SQL
cat load-$SF.sql$T | sed -e s+PWD+$PWD/$dir+ | $SQL
#$SQL < alter.sql
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -109,6 +109,7 @@ int yydebug=1;
table_def
view_def
query_expression
+ with_query_expression
role_def
type_def
func_def
@@ -1764,6 +1765,7 @@ view_def:
query_expression:
select_no_parens_orderby
+ | with_query
;
opt_with_check_option:
@@ -2035,9 +2037,9 @@ return_statement:
;
return_value:
- select_no_parens_orderby
+ query_expression
| search_condition
- | TABLE '(' select_no_parens_orderby ')'
+ | TABLE '(' query_expression ')'
{ $$ = _symbol_create_symbol(SQL_TABLE, $3); }
| sqlNULL { $$ = _newAtomNode( NULL); }
;
@@ -2541,14 +2543,14 @@ copyfrom_stmt:
append_list(l, $7);
append_int(l, $8);
$$ = _symbol_create_list( SQL_BINCOPYFROM, l ); }
- | COPY select_no_parens_orderby INTO string opt_seps opt_null_string
+ | COPY query_expression INTO string opt_seps opt_null_string
{ dlist *l = L();
append_symbol(l, $2);
append_string(l, $4);
append_list(l, $5);
append_string(l, $6);
$$ = _symbol_create_list( SQL_COPYTO, l ); }
- | COPY select_no_parens_orderby INTO STDOUT opt_seps opt_null_string
+ | COPY query_expression INTO STDOUT opt_seps opt_null_string
{ dlist *l = L();
append_symbol(l, $2);
append_string(l, NULL);
@@ -2719,7 +2721,7 @@ values_or_query_spec:
{ $$ = _symbol_create_list( SQL_VALUES, L()); }
| VALUES row_commalist
{ $$ = _symbol_create_list( SQL_VALUES, $2); }
- | select_no_parens_orderby
+ | query_expression
;
@@ -2898,7 +2900,7 @@ sql: with_query
;
with_query:
- WITH with_list query_expression
+ WITH with_list with_query_expression
{
dlist *l = L();
append_list(l, $2);
@@ -2913,7 +2915,7 @@ with_list:
;
with_list_element:
- ident opt_column_list AS '(' query_expression ')'
+ ident opt_column_list AS '(' with_query_expression ')'
{ dlist *l = L();
append_list(l, append_string(L(), $1));
append_list(l, $2);
@@ -2924,6 +2926,11 @@ with_list_element:
}
;
+with_query_expression:
+ select_no_parens_orderby
+ ;
+
+
sql:
select_statement_single_row
|
diff --git a/sql/test/remote/Tests/ssbm.SQL.py
b/sql/test/remote/Tests/ssbm.SQL.py
--- a/sql/test/remote/Tests/ssbm.SQL.py
+++ b/sql/test/remote/Tests/ssbm.SQL.py
@@ -175,6 +175,7 @@ print str(c.fetchall()[0][0]) + ' rows i
# run queries
queries = glob.glob(os.path.join(ssbmpath, '[0-1][0-9].sql'))
+queries.sort()
for q in queries:
print os.path.basename(q).replace('.sql','')
c.execute(codecs.open(q, 'r', encoding='utf8').read())
diff --git a/sql/test/remote/Tests/ssbm.stable.out
b/sql/test/remote/Tests/ssbm.stable.out
--- a/sql/test/remote/Tests/ssbm.stable.out
+++ b/sql/test/remote/Tests/ssbm.stable.out
@@ -26,7 +26,13 @@ Ready.
# 20:00:45 >
60175 rows in mergetable
+01
[(4199635969,)]
+02
+[(927530712,)]
+03
+[(213477639,)]
+04
[(35741623, 1992, u'MFGR#1211'), (13582129, 1992, u'MFGR#1212'), (2420150,
1992, u'MFGR#1217'), (7015912, 1992, u'MFGR#1219'), (2641607, 1992,
u'MFGR#122'), (2563912, 1992, u'MFGR#1221'), (6003315, 1992, u'MFGR#1223'),
(8704784, 1992, u'MFGR#1224'), (13700463, 1992, u'MFGR#1225'), (12610793, 1992,
u'MFGR#1226'), (5995739, 1992, u'MFGR#1228'), (7552882, 1992, u'MFGR#1230'),
(13184783, 1992, u'MFGR#1232'), (3231894, 1992, u'MFGR#1240'), (7214844, 1992,
u'MFGR#125'), (35054814, 1992, u'MFGR#127'), (15102503, 1992, u'MFGR#128'),
(7639101, 1992, u'MFGR#129'), (3339630, 1993, u'MFGR#121'), (11514911, 1993,
u'MFGR#1211'), (4294668, 1993, u'MFGR#1212'), (8122643, 1993, u'MFGR#1213'),
(3678145, 1993, u'MFGR#1214'), (7325684, 1993, u'MFGR#1217'), (16038869, 1993,
u'MFGR#1218'), (26560659, 1993, u'MFGR#1219'), (5551142, 1993, u'MFGR#1220'),
(3484096, 1993, u'MFGR#1222'), (21747351, 1993, u'MFGR#1223'), (5762459, 1993,
u'MFGR#1224'), (10279155, 1993, u'MFGR#1225'), (9952878, 1993, u'MFGR#1226')
, (6572535, 1993, u'MFGR#1228'), (10193031, 1993, u'MFGR#1230'), (12137253,
1993, u'MFGR#1233'), (6960104, 1993, u'MFGR#1236'), (10329821, 1993,
u'MFGR#1239'), (4258048, 1993, u'MFGR#1240'), (1382981, 1993, u'MFGR#125'),
(2821764, 1993, u'MFGR#126'), (14693311, 1993, u'MFGR#127'), (1799648, 1993,
u'MFGR#128'), (5071393, 1993, u'MFGR#129'), (18995020, 1994, u'MFGR#121'),
(4586682, 1994, u'MFGR#1211'), (19530708, 1994, u'MFGR#1212'), (1728488, 1994,
u'MFGR#1213'), (13010765, 1994, u'MFGR#1218'), (10997176, 1994, u'MFGR#1219'),
(4554495, 1994, u'MFGR#122'), (8557774, 1994, u'MFGR#1220'), (5584069, 1994,
u'MFGR#1222'), (10104525, 1994, u'MFGR#1223'), (4775592, 1994, u'MFGR#1224'),
(10713992, 1994, u'MFGR#1225'), (3750100, 1994, u'MFGR#1226'), (1794201, 1994,
u'MFGR#123'), (5980941, 1994, u'MFGR#1232'), (7859272, 1994, u'MFGR#1233'),
(3550796, 1994, u'MFGR#1236'), (2106877, 1994, u'MFGR#1238'), (14223208, 1994,
u'MFGR#1239'), (4027318, 1994, u'MFGR#1240'), (17777153, 1994, u'MFGR#125'),
(4869251, 1994, u'MFGR#126'), (15392246, 1994, u'MFGR#127'), (900044, 1994,
u'MFGR#128'), (5656126, 1994, u'MFGR#129'), (1097742, 1995, u'MFGR#1211'),
(2707025, 1995, u'MFGR#1213'), (4200351, 1995, u'MFGR#1214'), (2509211, 1995,
u'MFGR#1217'), (5595420, 1995, u'MFGR#1218'), (9841612, 1995, u'MFGR#1219'),
(4624540, 1995, u'MFGR#1220'), (19279359, 1995, u'MFGR#1222'), (5452000, 1995,
u'MFGR#1223'), (18723136, 1995, u'MFGR#1224'), (14590136, 1995, u'MFGR#1225'),
(8338345, 1995, u'MFGR#1226'), (8260673, 1995, u'MFGR#1228'), (97819, 1995,
u'MFGR#1230'), (6377178, 1995, u'MFGR#1232'), (14117772, 1995, u'MFGR#1233'),
(22661695, 1995, u'MFGR#1236'), (5142893, 1995, u'MFGR#1239'), (17227363, 1995,
u'MFGR#1240'), (7873139, 1995, u'MFGR#125'), (14385634, 1995, u'MFGR#128'),
(4383708, 1995, u'MFGR#129'), (12158316, 1996, u'MFGR#121'), (13534131, 1996,
u'MFGR#1211'), (27850979, 1996, u'MFGR#1212'), (784827, 1996, u'MFGR#1218'),
(1069800, 1996, u'MFGR#122'), (4348542, 1996, u'MFGR#1221'), (829533
2, 1996, u'MFGR#1222'), (11183976, 1996, u'MFGR#1224'), (19971623, 1996,
u'MFGR#1225'), (10005626, 1996, u'MFGR#1232'), (5135891, 1996, u'MFGR#1236'),
(4613081, 1996, u'MFGR#1239'), (16358592, 1996, u'MFGR#1240'), (18374286, 1996,
u'MFGR#125'), (4288542, 1996, u'MFGR#126'), (32750117, 1996, u'MFGR#127'),
(128577, 1996, u'MFGR#128'), (6040770, 1996, u'MFGR#129'), (4313787, 1997,
u'MFGR#121'), (15464411, 1997, u'MFGR#1211'), (17725171, 1997, u'MFGR#1212'),
(2137125, 1997, u'MFGR#1213'), (4188998, 1997, u'MFGR#1214'), (4172057, 1997,
u'MFGR#1217'), (15556327, 1997, u'MFGR#1219'), (5953230, 1997, u'MFGR#122'),
(10529427, 1997, u'MFGR#1220'), (9097752, 1997, u'MFGR#1221'), (8668003, 1997,
u'MFGR#1222'), (18232285, 1997, u'MFGR#1223'), (13859956, 1997, u'MFGR#1224'),
(2793729, 1997, u'MFGR#1225'), (19174753, 1997, u'MFGR#1226'), (5128426, 1997,
u'MFGR#123'), (4304076, 1997, u'MFGR#1230'), (8866362, 1997, u'MFGR#1232'),
(5328122, 1997, u'MFGR#1233'), (13735907, 1997, u'MFGR#1236'), (107550
17, 1997, u'MFGR#1240'), (327046, 1997, u'MFGR#125'), (13218597, 1997,
u'MFGR#127'), (10434877, 1997, u'MFGR#128'), (8052920, 1997, u'MFGR#129'),
(10864281, 1998, u'MFGR#121'), (2140471, 1998, u'MFGR#1211'), (15949227, 1998,
u'MFGR#1212'), (9091580, 1998, u'MFGR#1217'), (7834997, 1998, u'MFGR#1219'),
(2319634, 1998, u'MFGR#1220'), (19485508, 1998, u'MFGR#1222'), (1919741, 1998,
u'MFGR#1223'), (7617265, 1998, u'MFGR#1224'), (4074189, 1998, u'MFGR#1225'),
(7341274, 1998, u'MFGR#123'), (2607543, 1998, u'MFGR#1230'), (13307853, 1998,
u'MFGR#1232'), (5316438, 1998, u'MFGR#1233'), (1879252, 1998, u'MFGR#1236'),
(2738610, 1998, u'MFGR#1238'), (733435, 1998, u'MFGR#1239'), (5151646, 1998,
u'MFGR#1240'), (3651938, 1998, u'MFGR#126'), (8693908, 1998, u'MFGR#127'),
(2768015, 1998, u'MFGR#128'), (11569138, 1998, u'MFGR#129')]
# 20:00:49 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
