Changeset: d82fd2855f6a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d82fd2855f6a
Modified Files:
gdk/gdk_storage.c
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Solaris
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Windows
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
tools/merovingian/utils/database.c
Branch: Jan2014
Log Message:
merged
diffs (128 lines):
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -262,10 +262,12 @@ GDKextendf(int fd, size_t size, const ch
int
GDKextend(const char *fn, size_t size)
{
- int rt = -1, fd;
-
- rt = -1;
- if ((fd = open(fn, O_RDWR)) >= 0) {
+ int fd, rt = -1, flags = O_RDWR;
+#ifdef WIN32
+ /* On Windows, open() fails if the file is bigger than 2^32 bytes
without O_BINARY. */
+ flags |= O_BINARY;
+#endif
+ if ((fd = open(fn, flags)) >= 0) {
rt = GDKextendf(fd, size, fn);
close(fd);
}
diff --git a/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
b/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
--- a/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
+++ b/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
@@ -62,17 +62,17 @@ function user.s2_1{autoCommit=true}(A0:b
X_17 := sql.bind(X_7,"sys","lineitem","l_shipdate",1);
X_182 := algebra.thetasubselect(X_17,X_8,X_19,"<=");
X_20 := sql.subdelta(X_180,X_8,X_14,X_181,X_182);
- X_28 := sql.bind(X_7,"sys","lineitem","l_linestatus",0);
- (X_30,r1_36) := sql.bind(X_7,"sys","lineitem","l_linestatus",2);
- X_32 := sql.bind(X_7,"sys","lineitem","l_linestatus",1);
+ X_28 := sql.bind(X_7,"sys","lineitem","l_returnflag",0);
+ (X_30,r1_36) := sql.bind(X_7,"sys","lineitem","l_returnflag",2);
+ X_32 := sql.bind(X_7,"sys","lineitem","l_returnflag",1);
X_33 := sql.projectdelta(X_20,X_28,X_30,r1_36,X_32);
- X_22 := sql.bind(X_7,"sys","lineitem","l_returnflag",0);
- (X_24,r1_28) := sql.bind(X_7,"sys","lineitem","l_returnflag",2);
- X_26 := sql.bind(X_7,"sys","lineitem","l_returnflag",1);
+ X_22 := sql.bind(X_7,"sys","lineitem","l_linestatus",0);
+ (X_24,r1_28) := sql.bind(X_7,"sys","lineitem","l_linestatus",2);
+ X_26 := sql.bind(X_7,"sys","lineitem","l_linestatus",1);
X_27 := sql.projectdelta(X_20,X_22,X_24,r1_28,X_26);
(X_34,r1_45,r2_45) := group.subgroup(X_33,X_27);
- X_37 := algebra.leftfetchjoin(r1_45,X_33);
- X_38 := algebra.leftfetchjoin(r1_45,X_27);
+ X_37 := algebra.leftfetchjoin(r1_45,X_27);
+ X_38 := algebra.leftfetchjoin(r1_45,X_33);
X_48 := sql.bind(X_7,"sys","lineitem","l_quantity",0);
(X_53,r1_64) := sql.bind(X_7,"sys","lineitem","l_quantity",2);
X_56 := sql.bind(X_7,"sys","lineitem","l_quantity",1);
diff --git
a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Solaris
b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Solaris
--- a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Solaris
+++ b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Solaris
@@ -67,9 +67,9 @@ stderr of test 'overflow.SF-2853458` in
# 22:26:13 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=35561
# 22:26:13 >
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+MAPI = (monetdb) /var/tmp/mtest-9389/.s.monetdb.34946
QUERY = select cast(power(2,64) as bigint);
-ERROR = !overflow in conversion of 1.84467441e+19 to lng.
+ERROR = !overflow in conversion of 1.8446744073709552e+19 to lng.
# 22:26:13 >
# 22:26:13 > Done.
diff --git
a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Windows
b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Windows
--- a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Windows
+++ b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Windows
@@ -67,12 +67,12 @@ stderr of test 'overflow.SF-2853458` in
# 22:26:13 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=35561
# 22:26:13 >
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+MAPI = (monetdb) /var/tmp/mtest-9389/.s.monetdb.34946
QUERY = select cast(power(2,63) as bigint);
-ERROR = !overflow in conversion of 9.22337204e+018 to lng.
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+ERROR = !overflow in conversion of 9.2233720368547758e+018 to lng.
+MAPI = (monetdb) /var/tmp/mtest-9389/.s.monetdb.34946
QUERY = select cast(power(2,64) as bigint);
-ERROR = !overflow in conversion of 1.84467441e+019 to lng.
+ERROR = !overflow in conversion of 1.8446744073709552e+019 to lng.
# 22:26:13 >
# 22:26:13 > Done.
diff --git
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
---
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
+++
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
@@ -42,14 +42,14 @@ Ready.
function user.s5_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","t2564");
- X_6 := sql.bind(X_2,"sys","t2564","c1",0);
- (X_9,r1_9) := sql.bind(X_2,"sys","t2564","c1",2);
- X_12 := sql.bind(X_2,"sys","t2564","c1",1);
+ X_6 := sql.bind(X_2,"sys","t2564","c3",0);
+ (X_9,r1_9) := sql.bind(X_2,"sys","t2564","c3",2);
+ X_12 := sql.bind(X_2,"sys","t2564","c3",1);
X_14 := sql.delta(X_6,X_9,r1_9,X_12);
X_15 := algebra.leftfetchjoin(X_3,X_14);
- X_16 := sql.bind(X_2,"sys","t2564","c3",0);
- (X_18,r1_18) := sql.bind(X_2,"sys","t2564","c3",2);
- X_20 := sql.bind(X_2,"sys","t2564","c3",1);
+ X_16 := sql.bind(X_2,"sys","t2564","c1",0);
+ (X_18,r1_18) := sql.bind(X_2,"sys","t2564","c1",2);
+ X_20 := sql.bind(X_2,"sys","t2564","c1",1);
X_21 := sql.delta(X_16,X_18,r1_18,X_20);
X_22 := algebra.leftfetchjoin(X_3,X_21);
X_23 := sql.bind(X_2,"sys","t2564","c2",0);
diff --git a/tools/merovingian/utils/database.c
b/tools/merovingian/utils/database.c
--- a/tools/merovingian/utils/database.c
+++ b/tools/merovingian/utils/database.c
@@ -132,16 +132,6 @@ char* db_create(char* dbname) {
free(dbfarm);
return(strdup(buf));
}
- /* to all insanity, .gdk_lock is "valid" if it contains a
- * ':', which it does by pure coincidence of time having a
- * ':' in there twice... */
- if (fwrite("bla:", 1, 4, f) < 4) {
- snprintf(buf, sizeof(buf), "cannot write lock file: %s",
- strerror(errno));
- free(dbfarm);
- fclose(f);
- return(strdup(buf));
- }
fclose(f);
/* generate a vault key */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
