Changeset: 0081365a4b92 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0081365a4b92
Modified Files:
gdk/gdk_bbp.c
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
Branch: Feb2013
Log Message:
merged
diffs (61 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -3165,7 +3165,6 @@ do_backup(const char *srcdir, const char
* and a backup already exists in the main backup directory
* (see GDKupgradevarheap), move the file */
if (subcommit && file_exists(BAKDIR, nme, extbase)) {
- assert(h->storage == STORE_MMAP);
if (file_move(BAKDIR, SUBDIR, nme, extbase))
return -1;
} else if (h->storage != STORE_MMAP) {
diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
@@ -44,32 +44,25 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 70 # length
+% 58 # length
function user.s0_1():void;
X_1 := sql.mvc();
X_2:bat[:oid,:oid] := sql.tid(X_1,"sys","treeitems");
- X_5 := sql.bind(X_1,"sys","treeitems","subject",0);
+ X_5 := sql.bind(X_1,"sys","treeitems","pre",0);
X_8 := algebra.leftfetchjoin(X_2,X_5);
- (X_9,r1_12) := algebra.crossproduct(X_8,X_8);
- X_11 := sql.bind(X_1,"sys","treeitems","pre",0);
- X_13 := algebra.leftfetchjoin(X_2,X_11);
- X_14 := algebra.leftfetchjoin(r1_12,X_13);
- X_15 := algebra.leftfetchjoin(X_9,X_13);
- X_25:bat[:oid,:bit] := batcalc.>=(X_14,X_15);
- X_16 := sql.bind(X_1,"sys","treeitems","size",0);
+ X_9 := sql.bind(X_1,"sys","treeitems","size",0);
+ X_11 := algebra.leftfetchjoin(X_2,X_9);
+ X_12:bat[:oid,:lng] := batcalc.+(X_8,X_11);
+ (X_13,r1_18) := algebra.join(X_8,X_8,X_12,true,true);
+ X_16 := sql.bind(X_1,"sys","treeitems","subject",0);
X_18 := algebra.leftfetchjoin(X_2,X_16);
- X_19:bat[:oid,:lng] := batcalc.+(X_13,X_18);
- X_20 := algebra.leftfetchjoin(X_9,X_19);
- X_21:bat[:oid,:bit] := batcalc.<=(X_14,X_20);
- X_22 := algebra.subselect(X_21,true,true,true,true,false);
- X_26 := algebra.subselect(X_25,X_22,true,true,true,true,false);
- X_27:bat[:oid,:int] := algebra.leftfetchjoinPath(X_26,X_9,X_8);
- X_28:bat[:oid,:int] := algebra.leftfetchjoinPath(X_26,r1_12,X_8);
- X_29 := sql.resultSet(2,1,X_27);
- sql.rsColumn(X_29,"sys.L","id1","int",32,0,X_27);
- sql.rsColumn(X_29,"sys.L","id2","int",32,0,X_28);
- X_40 := io.stdout();
- sql.exportResult(X_40,X_29);
+ X_19 := algebra.leftfetchjoin(r1_18,X_18);
+ X_20 := algebra.leftfetchjoin(X_13,X_18);
+ X_21 := sql.resultSet(2,1,X_19);
+ sql.rsColumn(X_21,"sys.L","id1","int",32,0,X_19);
+ sql.rsColumn(X_21,"sys.L","id2","int",32,0,X_20);
+ X_31 := io.stdout();
+ sql.exportResult(X_31,X_21);
end s0_1;
#ROLLBACK;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
