MonetDB: Aug2011 - fix bug 2346, ie return properly aligned head...

[Niels Nes]

Changeset: bb23e82b4daf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bb23e82b4daf
Modified Files:
        monetdb5/modules/mal/mkey.c
        sql/test/BugTracker-2011/Tests/All
        sql/test/BugTracker-2011/Tests/operands-not-synced.Bug-2346.stable.out
Branch: Aug2011
Log Message:

fix bug 2346, ie return properly aligned head (ie head of input)


diffs (40 lines):

diff --git a/monetdb5/modules/mal/mkey.c b/monetdb5/modules/mal/mkey.c
--- a/monetdb5/modules/mal/mkey.c
+++ b/monetdb5/modules/mal/mkey.c
@@ -232,7 +232,7 @@ MKEYbathash(bat *res, bat *bid )
        assert(BAThvoid(b) || BAThrestricted(b));
 
        msg = voidbathash(&dst, b);
-       if (!BAThvoid(b)) {
+       if (dst->htype != b->htype) {
                BAT *x = VIEWcreate(b, dst);
                BBPreleaseref(dst->batCacheid);
                dst = x;
diff --git a/sql/test/BugTracker-2011/Tests/All 
b/sql/test/BugTracker-2011/Tests/All
--- a/sql/test/BugTracker-2011/Tests/All
+++ b/sql/test/BugTracker-2011/Tests/All
@@ -1,3 +1,4 @@
+operands-not-synced.Bug-2346
 mclient-lsql-d.Bug-2861
 count-count-distinct.Bug-2808
 copy-into-file-error.Bug-2722
diff --git 
a/sql/test/BugTracker-2011/Tests/operands-not-synced.Bug-2346.stable.out 
b/sql/test/BugTracker-2011/Tests/operands-not-synced.Bug-2346.stable.out
--- a/sql/test/BugTracker-2011/Tests/operands-not-synced.Bug-2346.stable.out
+++ b/sql/test/BugTracker-2011/Tests/operands-not-synced.Bug-2346.stable.out
@@ -89,6 +89,16 @@ Over..
 #"bar" 341     300     341     300     5
 #
 [ 2    ]
+#INSERT INTO applied_credit (directory, allowed, multiplicity)
+#SELECT success_credit.directory,
+#       success_credit.allowed,
+#       count(applied_credit.directory)
+#FROM success_credit
+#     LEFT OUTER JOIN applied_credit
+#     ON applied_credit.directory = success_credit.directory
+#     AND applied_credit.allowed >= success_credit.allowed
+#GROUP BY success_credit.directory, success_credit.allowed;
+[ 2    ]
 #ROLLBACK;
 
 # 13:48:57 >  
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list