Changeset: 0cac63bd3d9d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0cac63bd3d9d
Added Files:
monetdb5/tests/BugTracker/Tests/stdev.Bug-3178.malC
Removed Files:
monetdb5/tests/BugTracker/Tests/stdev.Bug-3178.mal
Modified Files:
monetdb5/tests/BugTracker/Tests/stdev.Bug-3178.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
testing/Mfilter.py.in
Branch: Feb2013
Log Message:
Merge with Oct2012 branch.
diffs (126 lines):
diff --git a/monetdb5/tests/BugTracker/Tests/stdev.Bug-3178.mal
b/monetdb5/tests/BugTracker/Tests/stdev.Bug-3178.malC
rename from monetdb5/tests/BugTracker/Tests/stdev.Bug-3178.mal
rename to monetdb5/tests/BugTracker/Tests/stdev.Bug-3178.malC
diff --git a/monetdb5/tests/BugTracker/Tests/stdev.Bug-3178.stable.out
b/monetdb5/tests/BugTracker/Tests/stdev.Bug-3178.stable.out
--- a/monetdb5/tests/BugTracker/Tests/stdev.Bug-3178.stable.out
+++ b/monetdb5/tests/BugTracker/Tests/stdev.Bug-3178.stable.out
@@ -17,28 +17,19 @@ stdout of test 'stdev.Bug-3178` in direc
# MonetDB/GIS module loaded
# MonetDB/JAQL module loaded
# MonetDB/SQL module loaded
-# MonetDB/DataCell loaded
-function user.main():void;
- b3178 := bat.new(:oid,:int);
- b3178 := bat.append(b3178,20);
- b3178 := bat.append(b3178,480);
- b3178 := bat.append(b3178,28);
- b3178 := bat.append(b3178,841);
- b3178 := bat.append(b3178,8492);
- a3178 := aggr.stdev(b3178);
- io.print(a3178);
- b3178 := bat.append(b3178,429496700);
- b3178 := bat.append(b3178,429496700);
- b3178 := bat.append(b3178,429496700);
- b3178 := bat.append(b3178,492);
- b3178 := bat.append(b3178,92);
- a3178 := aggr.stdev(b3178);
- io.print(a3178);
-end main;
-[ 3660.7739891995500 ]
-[ 207465895.60681600 ]
-# 11:24:28 >
-# 11:24:28 > "Done."
-# 11:24:28 >
+Ready.
+# 11:04:02 >
+# 11:04:02 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=madrid"
"--port=39657"
+# 11:04:02 >
+
+#io.print(a3178);
+[ 3660.773989 ]
+#io.print(a3178);
+[ 207465895.6 ]
+
+# 11:04:02 >
+# 11:04:02 > "Done."
+# 11:04:02 >
+
diff --git
a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
@@ -19,56 +19,30 @@ Ready.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# 18:23:35 >
-# 18:23:35 > "./jdbc_no_debug.SF-1739356.SQL.sh" "jdbc_no_debug.SF-1739356"
-# 18:23:35 >
-
-
-# 18:23:35 >
-# 18:23:35 > Mtimeout -timeout 60 java nl.cwi.monetdb.client.JdbcClient -h
niels -p 32617 -d mTests_test_BugTracker -f
"../../../../../..//data/MonetDB/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356-data.sql"
-# 18:23:35 >
-
-+-------------------------------------------------------------------------------------------------------------------------+
++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| rel
|
-+=========================================================================================================================+
++===================================================================================================================================================================================================================================================================================================================+
| project (
|
| | group by (
|
| | | union (
|
| | | | group by (
|
| | | | | project (
|
| | | | | | select (
|
-| | | | | | | table(sys._tables) [ _tables.id as p.id, _tables.type as p.type,
_tables.%TID% NOT NULL as p.%TID% ] COUNT |
+| | | | | | | table(sys._tables) [ _tables.id as p.id, _tables.name as p.name,
_tables.schema_id as p.schema_id, _tables.query as p.query, _tables.type as
p.type, _tables.system as p.system, _tables.commit_action as p.commit_action,
_tables.readonly as p.readonly, _tables.%TID% NOT NULL as p.%TID% ] COUNT |
| | | | | | ) [ p.type < smallint[tinyint "2"] ]
|
| | | | | ) [ p.id as tables.id ]
|
| | | | ) [ ] [ sys.count() NOT NULL as L1 ],
|
| | | | group by (
|
| | | | | project (
|
| | | | | | select (
|
-| | | | | | | table(tmp._tables) [ _tables.id as t.id, _tables.type as t.type,
_tables.%TID% NOT NULL as t.%TID% ] COUNT |
+| | | | | | | table(tmp._tables) [ _tables.id as t.id, _tables.name as t.name,
_tables.schema_id as t.schema_id, _tables.query as t.query, _tables.type as
t.type, _tables.system as t.system, _tables.commit_action as t.commit_action,
_tables.readonly as t.readonly, _tables.%TID% NOT NULL as t.%TID% ] COUNT |
| | | | | | ) [ t.type < smallint[tinyint "2"] ]
|
| | | | | ) [ t.id as tables.id ]
|
| | | | ) [ ] [ sys.count() NOT NULL as L1 ]
|
| | | ) [ L1 ]
|
| | ) [ ] [ sys.sum no nil (L1) as L1 ]
|
| ) [ L1 NOT NULL ]
|
-+-------------------------------------------------------------------------------------------------------------------------+
++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
20 rows
Operation successful
diff --git a/testing/Mfilter.py.in b/testing/Mfilter.py.in
--- a/testing/Mfilter.py.in
+++ b/testing/Mfilter.py.in
@@ -89,7 +89,7 @@ norm_in = re.compile('(?:'+')|(?:'.join
r"^(QUERY|ERROR)( =.* connect)( to|)( ')(localhost)(' port )(\d+)( .*)\n",
# 3: 8
r"^([Uu]sage: )(/.*/\.libs/|/.*/lt-|)([A-Za-z0-9_]+:?[ \t].*)\n",
# 4: 3
r'^(!.*Exception:remote\.[^:]*:\(mapi:monetdb://monetdb@)([^/]*)(/mTests_.*\).*)\n',
# 5: 4
- r"^(DBD::monetdb::db table_info warning: Catalog parameter '' ignored at
)([\./].+/|[A-Z]:\\.+[/\\])([^/\\]+\.pl line \d+\.)\n", # 6: 3
+ r"^(DBD::monetdb::db table_info warning: Catalog parameter c has to be an
empty string, as MonetDB does not support multiple catalogs at
)([\./].+/|[A-Z]:\\.+[/\\])([^/\\]+\.pl line \d+\.)\n", # 6: 3
r'^(ERROR REPORTED: DBD:|SyntaxException:parseError)(:.+ at
)([\./].+/|[A-Z]:\\.+[/\\])([^/\\]+\.pm line \d+\.)\n',
# 7: 4
# filter for geos 3.3 vs. geos 3.2, can be removed if we have 3.3 everywhere
r"^(ERROR = !ParseException: Expected )('EMPTY' or '\(')( but encountered
: '\)')\n", # 8: 3
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
