Changeset: a114ee3926ac for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a114ee3926ac
Modified Files:
sql/src/server/sql_scan.c
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (127 lines):
diff -r 77b10924c410 -r a114ee3926ac MonetDB/src/gdk/gdk_batop.mx
--- a/MonetDB/src/gdk/gdk_batop.mx Thu Oct 14 15:23:50 2010 +0200
+++ b/MonetDB/src/gdk/gdk_batop.mx Fri Oct 15 10:40:29 2010 +0200
@@ -991,7 +991,6 @@
BBPreclaim(bn);
return NULL;
}
- BATaccessBegin(b, USE_HEAD | USE_HHASH | USE_TAIL, MMAP_WILLNEED);
while (bn) {
BUN q = BUNfirst(bn);
BUN r;
@@ -1012,7 +1011,6 @@
BBPreclaim(bn);
bn = BATnew(ht, tt, size);
}
- BATaccessEnd(b, USE_HEAD | USE_HHASH | USE_TAIL, MMAP_WILLNEED);
return bn;
}
diff -r 77b10924c410 -r a114ee3926ac MonetDB/src/gdk/gdk_relop.mx
--- a/MonetDB/src/gdk/gdk_relop.mx Thu Oct 14 15:23:50 2010 +0200
+++ b/MonetDB/src/gdk/gdk_relop.mx Fri Oct 15 10:40:29 2010 +0200
@@ -809,7 +809,8 @@
@= defaultvoidfetchjoin
ALGODEBUG THRprintf(GDKout, "#BATfetchjoin:
defaultvoidfetchjoin(@1);\n");
BATaccessBegin(l, USE_TAIL, MMAP_SEQUENTIAL);
- BATaccessBegin(r, USE_TAIL, MMAP_WILLNEED);
+ if (BATcount(l) > (BATcount(r)/10))
+ BATaccessBegin(r, USE_TAIL, MMAP_WILLNEED);
BATloop(l, l_cur, l_end) {
BUN _yy = (BUN) (offset + * (oid *) BUNtloc(li, l_cur));
@@ -824,7 +825,8 @@
dst++;
}
BATaccessEnd(l, USE_TAIL, MMAP_SEQUENTIAL);
- BATaccessEnd(r, USE_TAIL, MMAP_WILLNEED);
+ if (BATcount(l) > (BATcount(r)/10))
+ BATaccessEnd(r, USE_TAIL, MMAP_WILLNEED);
if (nondense) {
BATiter bni;
/* not (yet?) completely type-optimized ! */
diff -r 77b10924c410 -r a114ee3926ac sql/src/benchmarks/tpch/dbgen/bm_utils.c
--- a/sql/src/benchmarks/tpch/dbgen/bm_utils.c Thu Oct 14 15:23:50 2010 +0200
+++ b/sql/src/benchmarks/tpch/dbgen/bm_utils.c Fri Oct 15 10:40:29 2010 +0200
@@ -381,14 +381,14 @@
fprintf(stderr, "stat(%s) failed.\n", fullpath);
exit(-1);
}
- if (S_ISREG(fstats.st_mode) && !force && *mode != 'r' )
+ if (retcode == 0 && S_ISREG(fstats.st_mode) && !force && *mode != 'r' )
{
sprintf(prompt, "Do you want to overwrite %s ?", fullpath);
if (!yes_no(prompt))
exit(0);
}
- if (S_ISFIFO(fstats.st_mode))
+ if (retcode == 0 && S_ISFIFO(fstats.st_mode))
{
retcode =
open(fullpath, ((*mode == 'r')?O_RDONLY:O_WRONLY)|O_CREAT);
diff -r 77b10924c410 -r a114ee3926ac sql/src/benchmarks/tpch/dbgen/driver.c
--- a/sql/src/benchmarks/tpch/dbgen/driver.c Thu Oct 14 15:23:50 2010 +0200
+++ b/sql/src/benchmarks/tpch/dbgen/driver.c Fri Oct 15 10:40:29 2010 +0200
@@ -746,8 +746,10 @@
strcpy (db_name, optarg);
break;
default:
+#ifdef STDLIB_HAS_GETOPT /* standard library already prints something */
printf ("ERROR: option '%c' unknown.\n",
*(vector[optind] + 1));
+#endif
case 'h': /* something
unexpected */
fprintf (stderr,
"%s Population Generator (Version
%d.%d.%d%s)\n",
diff -r 77b10924c410 -r a114ee3926ac sql/src/server/sql_scan.c
--- a/sql/src/server/sql_scan.c Thu Oct 14 15:23:50 2010 +0200
+++ b/sql/src/server/sql_scan.c Fri Oct 15 10:40:29 2010 +0200
@@ -734,7 +734,8 @@
int next = 0;
int started = lc->started;
- if (cur == '/') {
+ switch (cur) {
+ case '/':
lc->started = 1;
next = scanner_getc(lc);
if (next == '*') {
@@ -745,16 +746,24 @@
utf8_putchar(lc, next);
return scanner_token(lc, cur);
}
- } else if (isdigit(cur)) {
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
return number(c, cur);
- } else if (cur == '#') {
+ case '#':
if ((cur = skip_sql_comment(lc)) == EOF)
return cur;
return tokenize(c, cur);
- } else if (cur == '\'' || cur == '"') {
+ case '\'':
+ case '"':
return scanner_string(c, cur);
- }
- switch (cur) {
case '-':
lc->started = 1;
next = scanner_getc(lc);
@@ -773,7 +782,6 @@
case '^':
case '+':
case '&':
- case '/':
case '(':
case ')':
case ',':
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
