Changeset: 59f0a400fbae for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=59f0a400fbae
Modified Files:
common/stream/stream.c
sql/backends/monet5/sql.mx
testing/Mfilter.py.in
Branch: default
Log Message:
Merged from Apr2012
diffs (45 lines):
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -1336,7 +1336,8 @@ open_urlstream(const char *url)
#else
stream *open_urlstream(const char *url) {
- (void) url;
+ if (url != NULL && strncmp(url, "file://", sizeof("file://") - 1) == 0)
+ return open_rastream(url + sizeof("file://") - 1);
return NULL;
}
#endif /* HAVE_CURL */
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -6793,7 +6793,7 @@ sql_storage(Client cntxt, MalBlkPtr mb,
if ( atom ) BBPreleaseref(atom->batCacheid);
if ( size ) BBPreleaseref(size->batCacheid);
if ( aux ) BBPreleaseref(aux->batCacheid);
- if ( sort ) BBPreleaseref(aux->batCacheid);
+ if ( sort ) BBPreleaseref(sort->batCacheid);
throw(SQL,"sql.storage", MAL_MALLOC_FAIL);
}
for( nsch= tr->schemas.set->h; nsch; nsch= nsch->next){
diff --git a/testing/Mfilter.py.in b/testing/Mfilter.py.in
--- a/testing/Mfilter.py.in
+++ b/testing/Mfilter.py.in
@@ -83,6 +83,7 @@ bbp_dir = re.compile(r'^(-?\d+) (-?\d+)
# element of "norm_out", unless the latter is "None" (then, the
# respective match is kept as-is).
norm_in = re.compile('(?:'+')|(?:'.join([
+
# id: #groups
### r'^(ERROR = !| *!|)(syntax|parse|parse error: syntax)( error, )(unexpected
.* on line |unexpected .* in: )?(.*)\n', # 1: 5
r'^(ERROR = !| *!|)(syntax|parse|parse error: syntax)( error,
)(?:unexpected .* on line |unexpected .* in: )?(?:.*)\n', #
2: 5
r"^(QUERY|ERROR)( =.* connect)( to|)( ')(localhost)(' port )(\d+)( .*)\n",
# 3: 8
@@ -93,7 +94,7 @@ norm_in = re.compile('(?:'+')|(?:'.join
# 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
# filter for AVG_of_SQRT.SF-2757642: result not always exactly 1.1
- r'^(\[ "avg\(sqrt\(n8\)\) == 1\.1",\s+)(1\.09999\d*)(\s+\])\n',
# 9: 3
+ r'^(\[ "avg\(sqrt\(n8\)\) ==
1\.1",\s+)(1\.09999\d*|1\.10000\d*)(\s+\])\n',
# 9: 3
])+')', re.MULTILINE)
norm_hint = '# the original non-normalized output was: '
norm_out = (
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
