Changeset: e6d6d6d619df for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e6d6d6d619df
Branch: default
Log Message:
Merged with octbugs
diffs (truncated from 358 to 300 lines):
diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -761,8 +761,9 @@ sql_bind_member(sql_allocator *sa, sql_s
if (!f->res && !IS_FILT(f))
continue;
- if (strcmp(f->base.name, sqlfname) == 0 && f->type == type) {
- if (list_length(f->ops) == nrargs && is_subtypeof(tp,
&((sql_arg *) f->ops->h->data)->type))
+ if (strcmp(f->base.name, sqlfname) == 0 && f->type == type &&
list_length(f->ops) == nrargs) {
+ sql_subtype *ft = &((sql_arg *) f->ops->h->data)->type;
+ if ((f->fix_scale == INOUT && type_cmp(tp->type,
ft->type) == 0) || (f->fix_scale != INOUT && is_subtypeof(tp, ft)))
return (type == F_AGGR) ? _dup_subaggr(sa, f,
NULL) : sql_dup_subfunc(sa, f, NULL, tp);
}
}
@@ -782,8 +783,9 @@ sql_bind_member(sql_allocator *sa, sql_s
if (!f->res && !IS_FILT(f))
continue;
- if (strcmp(f->base.name, sqlfname) == 0 && f->type ==
type) {
- if (list_length(f->ops) == nrargs &&
is_subtypeof(tp, &((sql_arg *) f->ops->h->data)->type))
+ if (strcmp(f->base.name, sqlfname) == 0 && f->type ==
type && list_length(f->ops) == nrargs) {
+ sql_subtype *ft = &((sql_arg *)
f->ops->h->data)->type;
+ if ((f->fix_scale == INOUT &&
type_cmp(tp->type, ft->type) == 0) || (f->fix_scale != INOUT &&
is_subtypeof(tp, ft)))
return (type == F_AGGR) ?
_dup_subaggr(sa, f, NULL) : sql_dup_subfunc(sa, f, NULL, tp);
}
}
diff --git a/sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.stable.out
b/sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.stable.out
--- a/sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.stable.out
+++ b/sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.stable.out
@@ -32,14 +32,14 @@ stdout of test 'Bug_LargeQueries_6571_66
# 18:48:54 >
Created table: tbl6693 Inserting rows. 3 rows inserted
-Script size is 296607
+Script size is 27960
First test repeat 10 times
Iteration: 1 2 3 4 5 6 7 8 9 10
Completed first test
Second test repeat 10 times
Iteration: 1 2 3 4 5 6 7 8 9 10
Completed second test
-Script size is 112838
+Script size is 1092
Third test repeat 3 times
Iteration: 1 2 3
Completed third test
diff --git a/sql/jdbc/tests/Tests/Test_PSsomeamount.stable.out
b/sql/jdbc/tests/Tests/Test_PSsomeamount.stable.out
--- a/sql/jdbc/tests/Tests/Test_PSsomeamount.stable.out
+++ b/sql/jdbc/tests/Tests/Test_PSsomeamount.stable.out
@@ -27,17 +27,12 @@ stdout of test 'Test_PSsomeamount` in di
0. true true
1. Preparing and executing a unique statement
0, true
-1000, true
-2000, true
-3000, true
-4000, true
-5000, true
-6000, true
-7000, true
-8000, true
-9000, true
+20, true
+40, true
+60, true
+80, true
-# 18:56:08 >
-# 18:56:08 > "Done."
-# 18:56:08 >
+# 11:53:16 >
+# 11:53:16 > "Done."
+# 11:53:16 >
diff --git a/sql/jdbc/tests/Tests/Test_Sbatching.stable.out
b/sql/jdbc/tests/Tests/Test_Sbatching.stable.out
--- a/sql/jdbc/tests/Tests/Test_Sbatching.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Sbatching.stable.out
@@ -24,234 +24,18 @@ stdout of test 'Test_Sbatching` in direc
0. true true
1. create...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
+2. executing batch (50 inserts)...passed :)
+3. checking number of update counts...50 passed :)
4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
+2. executing batch (50 inserts)...passed :)
+3. checking number of update counts...50 passed :)
4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
-3. checking number of update counts...400 passed :)
-4. checking update counts (should all be 1)...passed :)
-2. executing batch (400 inserts)...passed :)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
