Changeset: 9e691b3fe553 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9e691b3fe553
Modified Files:
sql/src/benchmarks/ATIS/Tests/select_group.stable.out
sql/src/server/rel_schema.mx
sql/src/server/rel_select.mx
sql/src/storage/bat/bat_utils.mx
sql/src/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/src/test/BugTracker-2009/Tests/alter_table_drop_constraint.SF-2803477.stable.err
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
sql/src/test/BugTracker/Tests/union_order.stable.err
sql/src/test/BugTracker/Tests/union_order.stable.out
sql/src/test/Dependencies/Tests/Dependencies.stable.out
sql/src/test/leaks/Tests/check0.stable.out
sql/src/test/leaks/Tests/check1.stable.out
sql/src/test/leaks/Tests/check2.stable.out
sql/src/test/leaks/Tests/check3.stable.out
sql/src/test/leaks/Tests/check4.stable.out
sql/src/test/leaks/Tests/check5.stable.out
sql/src/test/leaks/Tests/drop3.stable.out
sql/src/test/leaks/Tests/select1.stable.out
sql/src/test/leaks/Tests/select2.stable.out
sql/src/test/leaks/Tests/temp1.stable.out
sql/src/test/leaks/Tests/temp2.stable.out
sql/src/test/leaks/Tests/temp3.stable.out
Branch: Jun2010
Log Message:
approved output
diffs (truncated from 385 to 300 lines):
diff -r e7065770051d -r 9e691b3fe553
sql/src/benchmarks/ATIS/Tests/select_group.stable.out
--- a/sql/src/benchmarks/ATIS/Tests/select_group.stable.out Fri Jul 02
23:23:50 2010 +0200
+++ b/sql/src/benchmarks/ATIS/Tests/select_group.stable.out Fri Jul 02
23:27:26 2010 +0200
@@ -55,7 +55,8 @@
[ "MAY", "FRIDAY" ]
[ "JUNE", "SATURDAY" ]
[ "JULY", "SUNDAY" ]
-% sys.day_name, sys.flight_day, sys.day_name # table_name
+#select day_name.day_name,flight_day.day_code,count(*) from
flight_day,day_name where day_name.day_code=flight_day.day_code group by
flight_day.day_code,day_name.day_name order by day_code;
+% sys.day_name, sys.flight_day, sys.flight_day # table_name
% day_name, day_code, L3 # name
% char, decimal, wrd # type
% 9, 2, 2 # length
diff -r e7065770051d -r 9e691b3fe553 sql/src/server/rel_schema.mx
--- a/sql/src/server/rel_schema.mx Fri Jul 02 23:23:50 2010 +0200
+++ b/sql/src/server/rel_schema.mx Fri Jul 02 23:27:26 2010 +0200
@@ -132,6 +132,9 @@
{
sql_rel *r = sq;
+ if (!r)
+ return NULL;
+
if (is_topn(r->op))
r = sq->l;
@@ -176,7 +179,6 @@
if ((n = as_subquery( sql, t, sq, column_spec)) != NULL) {
sql_error(sql, 01, "CREATE TABLE: duplicate column name %s", n);
- table_destroy(t);
return NULL;
}
return t;
diff -r e7065770051d -r 9e691b3fe553 sql/src/server/rel_select.mx
--- a/sql/src/server/rel_select.mx Fri Jul 02 23:23:50 2010 +0200
+++ b/sql/src/server/rel_select.mx Fri Jul 02 23:27:26 2010 +0200
@@ -4198,11 +4198,15 @@
{
if (column_e->token == SQL_TABLE) {
char *tname = column_e->data.lval->h->data.sval;
- list *exps = rel_table_projections(sql, rel, tname);
- if (exps)
+ list *exps;
+
+ if ((exps = rel_table_projections(sql, rel, tname)) != NULL)
return exps;
+ if (!tname)
+ return sql_error(sql, 02,
+ "Table expression without table name");
return sql_error(sql, 02,
- "Column expression Table '%s' unknown", tname);
+ "Column expression Table '%s' unknown", tname);
}
return NULL;
}
diff -r e7065770051d -r 9e691b3fe553 sql/src/storage/bat/bat_utils.mx
--- a/sql/src/storage/bat/bat_utils.mx Fri Jul 02 23:23:50 2010 +0200
+++ b/sql/src/storage/bat/bat_utils.mx Fri Jul 02 23:27:26 2010 +0200
@@ -53,6 +53,7 @@
extern log_bid ebat2real(log_bid b, oid ibase);
extern log_bid e_bat(int type);
+extern BAT *e_BAT(int type);
extern log_bid e_ubat(int type);
extern log_bid ebat_copy(log_bid b, oid ibase, int temp);
extern log_bid eubat_copy(log_bid b, int temp);
@@ -234,6 +235,14 @@
return temp_create(ebats[type]);
}
+BAT *
+e_BAT(int type)
+{
+ if (!ebats[type])
+ ebats[type] = BATnew(TYPE_void, type, 0);
+ return temp_descriptor(ebats[type]->batCacheid);
+}
+
log_bid
e_ubat(int type)
{
diff -r e7065770051d -r 9e691b3fe553
sql/src/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
--- a/sql/src/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
Fri Jul 02 23:23:50 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
Fri Jul 02 23:27:26 2010 +0200
@@ -41,7 +41,7 @@
_15:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","sf_2596114",1);
_16 := bat.reverse(_15);
_17 := algebra.kdifference(_14,_16);
- _18:bat[:oid,:dbl] := batmmath.pow(_17,2:dbl);
+ _18:bat[:oid,:dbl] := batmmath.pow(_17,2);
exit _36;
_19 := sql.resultSet(1,1,_18);
sql.rsColumn(_19,"sys.","power_x","double",53,0,_18);
diff -r e7065770051d -r 9e691b3fe553
sql/src/test/BugTracker-2009/Tests/alter_table_drop_constraint.SF-2803477.stable.err
---
a/sql/src/test/BugTracker-2009/Tests/alter_table_drop_constraint.SF-2803477.stable.err
Fri Jul 02 23:23:50 2010 +0200
+++
b/sql/src/test/BugTracker-2009/Tests/alter_table_drop_constraint.SF-2803477.stable.err
Fri Jul 02 23:27:26 2010 +0200
@@ -71,6 +71,9 @@
# 21:50:59 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=38418
# 21:50:59 >
+MAPI = mone...@alf:32448
+QUERY = DROP INDEX UNQ_VALUE_C;
+ERROR = !DROP INDEX: no such index 'unq_value_c'
# 21:50:59 >
# 21:50:59 > Done.
diff -r e7065770051d -r 9e691b3fe553
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
---
a/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
Fri Jul 02 23:23:50 2010 +0200
+++
b/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
Fri Jul 02 23:27:26 2010 +0200
@@ -21,30 +21,10 @@
Over..
-# 22:33:48 >
-# 22:33:48 > mclient -lsql -i -umonetdb -Pmonetdb --host=pegasus --port=30332
-# 22:33:48 >
+# 20:57:34 >
+# 20:57:34 > mclient -lsql -ftest -i -e --host=alf --port=32448
+# 20:57:34 >
-TABLE sys._columns
-TABLE sys._tables
-TABLE sys.args
-TABLE sys.auths
-VIEW sys.columns
-TABLE sys.connections
-TABLE sys.db_user_info
-TABLE sys.dependencies
-TABLE sys.functions
-TABLE sys.idxs
-TABLE sys.keycolumns
-TABLE sys.keys
-TABLE sys.privileges
-TABLE sys.schemas
-TABLE sys.sequences
-VIEW sys.tables
-TABLE sys.triggers
-TABLE sys.types
-TABLE sys.user_role
-VIEW sys.users
CREATE TABLE "sys"."triggers" (
"id" int,
"name" varchar(1024),
diff -r e7065770051d -r 9e691b3fe553
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
--- a/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
Fri Jul 02 23:23:50 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
Fri Jul 02 23:27:26 2010 +0200
@@ -21,30 +21,15 @@
Over..
-# 10:46:58 >
-# 10:46:58 > mclient -lsql -umonetdb -Pmonetdb --host=pegasus --port=36889
-# 10:46:58 >
+# 20:57:34 >
+# 20:57:34 > ./dumping_tables.SF-2776908.SQL.sh dumping_tables.SF-2776908
+# 20:57:34 >
-TABLE sys._columns
-TABLE sys._tables
-TABLE sys.args
-TABLE sys.auths
-VIEW sys.columns
-TABLE sys.connections
-TABLE sys.db_user_info
-TABLE sys.dependencies
-TABLE sys.functions
-TABLE sys.idxs
-TABLE sys.keycolumns
-TABLE sys.keys
-TABLE sys.privileges
-TABLE sys.schemas
-TABLE sys.sequences
-VIEW sys.tables
-TABLE sys.triggers
-TABLE sys.types
-TABLE sys.user_role
-VIEW sys.users
+
+# 20:57:34 >
+# 20:57:34 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=alf
--port=32448 -i <
/net/alf.ins.cwi.nl/export/scratch1/niels/rc/MonetDB/sql/src/test/BugTracker-2009/Tests/../dumping_tables.SF-2776908.sql
+# 20:57:34 >
+
CREATE TABLE "sys"."triggers" (
"id" int,
"name" varchar(1024),
diff -r e7065770051d -r 9e691b3fe553
sql/src/test/BugTracker/Tests/union_order.stable.err
--- a/sql/src/test/BugTracker/Tests/union_order.stable.err Fri Jul 02
23:23:50 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/union_order.stable.err Fri Jul 02
23:27:26 2010 +0200
@@ -10,6 +10,13 @@
# 15:51:29 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=36178
# 15:51:29 >
+MAPI = mone...@alf:31841
+QUERY = select data from tmp_one
+ERROR = !ORDER BY: missing select operator in: "select data from tmp_one
+ !union
+ !select data from tmp_two
+ !order by data
+ !;"
# 15:51:29 >
# 15:51:29 > Done.
diff -r e7065770051d -r 9e691b3fe553
sql/src/test/BugTracker/Tests/union_order.stable.out
--- a/sql/src/test/BugTracker/Tests/union_order.stable.out Fri Jul 02
23:23:50 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/union_order.stable.out Fri Jul 02
23:27:26 2010 +0200
@@ -28,10 +28,7 @@
% data # name
% decimal # type
% 6 # length
-% .tmp_one # table_name
-% data # name
-% decimal # type
-% 6 # length
+#select *
% .foo # table_name
% data # name
% decimal # type
diff -r e7065770051d -r 9e691b3fe553
sql/src/test/Dependencies/Tests/Dependencies.stable.out
--- a/sql/src/test/Dependencies/Tests/Dependencies.stable.out Fri Jul 02
23:23:50 2010 +0200
+++ b/sql/src/test/Dependencies/Tests/Dependencies.stable.out Fri Jul 02
23:27:26 2010 +0200
@@ -180,8 +180,9 @@
% sys.f, sys.tri, . # table_name
% name, name, single_value # name
% varchar, varchar, char # type
-% 5, 12, 11 # length
+% 6, 12, 11 # length
[ "<>", "trigger_test", "DEP_TRIGGER" ]
+[ "isnull", "trigger_test", "DEP_TRIGGER" ]
[ "count", "trigger_test", "DEP_TRIGGER" ]
% sys.k, sys.fk, . # table_name
% name, name, single_value # name
diff -r e7065770051d -r 9e691b3fe553 sql/src/test/leaks/Tests/check0.stable.out
--- a/sql/src/test/leaks/Tests/check0.stable.out Fri Jul 02 23:23:50
2010 +0200
+++ b/sql/src/test/leaks/Tests/check0.stable.out Fri Jul 02 23:27:26
2010 +0200
@@ -163,7 +163,7 @@
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 180 ]
+[ "transient", 158 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L3, .bbp # table_name
% L3, L4 # name
diff -r e7065770051d -r 9e691b3fe553 sql/src/test/leaks/Tests/check1.stable.out
--- a/sql/src/test/leaks/Tests/check1.stable.out Fri Jul 02 23:23:50
2010 +0200
+++ b/sql/src/test/leaks/Tests/check1.stable.out Fri Jul 02 23:27:26
2010 +0200
@@ -163,7 +163,7 @@
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 180 ]
+[ "transient", 158 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L3, .bbp # table_name
% L3, L4 # name
diff -r e7065770051d -r 9e691b3fe553 sql/src/test/leaks/Tests/check2.stable.out
--- a/sql/src/test/leaks/Tests/check2.stable.out Fri Jul 02 23:23:50
2010 +0200
+++ b/sql/src/test/leaks/Tests/check2.stable.out Fri Jul 02 23:27:26
2010 +0200
@@ -163,7 +163,7 @@
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 180 ]
+[ "transient", 160 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L3, .bbp # table_name
% L3, L4 # name
diff -r e7065770051d -r 9e691b3fe553 sql/src/test/leaks/Tests/check3.stable.out
--- a/sql/src/test/leaks/Tests/check3.stable.out Fri Jul 02 23:23:50
2010 +0200
+++ b/sql/src/test/leaks/Tests/check3.stable.out Fri Jul 02 23:27:26
2010 +0200
@@ -163,7 +163,7 @@
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 200 ]
+[ "transient", 177 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L3, .bbp # table_name
% L3, L4 # name
diff -r e7065770051d -r 9e691b3fe553 sql/src/test/leaks/Tests/check4.stable.out
--- a/sql/src/test/leaks/Tests/check4.stable.out Fri Jul 02 23:23:50
2010 +0200
+++ b/sql/src/test/leaks/Tests/check4.stable.out Fri Jul 02 23:27:26
2010 +0200
@@ -163,7 +163,7 @@
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 200 ]
+[ "transient", 178 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L3, .bbp # table_name
% L3, L4 # name
diff -r e7065770051d -r 9e691b3fe553 sql/src/test/leaks/Tests/check5.stable.out
--- a/sql/src/test/leaks/Tests/check5.stable.out Fri Jul 02 23:23:50
2010 +0200
+++ b/sql/src/test/leaks/Tests/check5.stable.out Fri Jul 02 23:27:26
2010 +0200
@@ -163,7 +163,7 @@
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 200 ]
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
