Changeset: 2a53b540e596 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2a53b540e596
Modified Files:
sql/storage/bat/bat_storage.c
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.sql
sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.sql
sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.stable.out
sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.sql
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
Branch: Feb2013
Log Message:
fixed problem with concurrent appends (bug 3303)
fixed the test for join_over_multitable_using_index
diffs (93 lines):
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -344,6 +344,9 @@ append_col(sql_trans *tr, sql_column *c,
/* appends only write */
c->base.wtime = c->t->base.wtime = c->t->s->base.wtime = tr->wtime =
tr->wstime;
+ /* inserts are ordered with the current delta implementation */
+ /* therefor mark appends as reads */
+ c->t->s->base.rtime = c->t->base.rtime = tr->stime;
if (tpe == TYPE_bat)
delta_append_bat(bat, i);
else
diff --git
a/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
b/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
---
a/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
+++
b/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
@@ -28,13 +28,13 @@ Ready.
% L2, L1 # name
% tinyint, wrd # type
% 1, 2 # length
-[ 1, 33 ]
+[ 1, 32 ]
#SELECT (SELECT count(*) FROM tables), 1;
% .L1, .L1 # table_name
% L1, single_value # name
% wrd, tinyint # type
% 2, 1 # length
-[ 33, 1 ]
+[ 32, 1 ]
# 21:48:51 >
# 21:48:51 > "Done."
diff --git
a/sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.sql
b/sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.sql
--- a/sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.sql
+++ b/sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.sql
@@ -56,7 +56,7 @@ VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
?, ?,
?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
?);
-EXEC 0('', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+exec **('', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
'', '',
'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
'', '',
'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
'', '',
diff --git
a/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.sql
b/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.sql
---
a/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.sql
+++
b/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.sql
@@ -33,7 +33,7 @@ SELECT TR.x, TR.z, comp
FROM
(SELECT TR1.u as x, TR1.v as y, TR2.v as z, TR1.r as rxy, TR2.r as ryz
FROM
- RX as TR1 JOIN R as TR2
+ RX as TR1 JOIN RX as TR2
ON (TR1.v = TR2.u AND TR1.u <> TR2.v)
) as TR
JOIN
diff --git
a/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.stable.out
b/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.stable.out
---
a/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.stable.out
+++
b/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.stable.out
@@ -61,8 +61,12 @@ Ready.
# ON (TR.rxy = s AND TR.ryz = t);
% sys.tr, sys.tr, sys.trans # table_name
% x, z, comp # name
-% int, varchar, int # type
-% 1, 0, 1 # length
+% int, int, int # type
+% 1, 1, 3 # length
+[ 0, 2, 255 ]
+[ 0, 3, 31 ]
+[ 0, 4, 31 ]
+[ 3, 4, 255 ]
#Drop index trans_st_idx;
#Drop table trans;
#Drop table rx;
diff --git a/sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.sql
b/sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.sql
--- a/sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.sql
+++ b/sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.sql
@@ -15,3 +15,4 @@ END;
select * from refine();
drop function refine;
+drop table r;
diff --git
a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
--- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
+++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
@@ -60,7 +60,6 @@ Ready.
[ 6059, "storagemodelinput", 2000, NULL, 0, true, 0,
false, 0 ]
[ 6100, "tablestoragemodel", 2000, "-- A summary of the table
storage requirement is is available as a table view.\n-- The auxillary column
denotes the maximum space if all non-sorted columns\n-- would be augmented with
a hash (rare situation)\ncreate view sys.tablestoragemodel\nas select
\"schema\",\"table\",max(count) as \"count\",\n\tsum(columnsize) as
columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(indices) as
indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as
auxillary\nfrom sys.storagemodel() group by \"schema\",\"table\";", 1,
true, 0, false, 0 ]
[ 6122, "systemfunctions", 2000, NULL, 0, true, 0,
false, 0 ]
-[ 6231, "r", 2000, NULL, 0, false, 0, false, 0
]
# 18:53:13 >
# 18:53:13 > "Done."
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
