Changeset: 1bce6a135ae7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1bce6a135ae7
Modified Files:
gdk/gdk_batop.c
Branch: headless
Log Message:
Merge with default branch.
diffs (150 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -665,12 +665,9 @@
} else {
hval = ATOMcmp(t, th, nil);
}
- if (equi && anti) {
+ if (anti) {
equi = 0;
- li = !li;
- hi = !hi;
- } else if (anti) { /* swap sub-ranges */
- if (!lval || !hval) {
+ if (!lval || !hval) { /* swap sub-ranges */
ptr tv;
bit ti;
ti = li;
diff --git a/sql/storage/bat/bat_logger.c b/sql/storage/bat/bat_logger.c
--- a/sql/storage/bat/bat_logger.c
+++ b/sql/storage/bat/bat_logger.c
@@ -110,7 +110,7 @@
/* mark that the rest is fixed on sql level */
}
if (catalog_version == CATALOG_OCT2010) {
- BAT *b;
+ BAT *b, *b1;
char *s = "sys", n[64];
fprintf(stdout, "# upgrading catalog from Oct2010\n");
@@ -118,39 +118,64 @@
/* rename table 'keycolumns' into 'objects'
* and remove trunc column */
- while(s) {
- b = temp_descriptor(logger_find_bat(lg, N(n, "D", s,
"keycolumns")));
- if (!b) return ;
- logger_del_bat(lg, b->batCacheid);
- logger_add_bat(lg, b, N(n, "D", s, "objects"));
- bat_destroy(b);
+ while (s) {
+ b = temp_descriptor(logger_find_bat(lg, N(n, "D", s,
"keycolumns")));
+ if (!b)
+ return;
+ b1 = BATcopy(b, b->htype, b->ttype, 1);
+ if (!b1)
+ return;
+ b1 = BATsetaccess(b1, BAT_READ);
+ logger_del_bat(lg, b->batCacheid);
+ logger_add_bat(lg, b1, N(n, "D", s, "objects"));
+ bat_destroy(b);
+ bat_destroy(b1);
- b = temp_descriptor(logger_find_bat(lg, N(n, NULL, s,
"keycolumns_id")));
- if (!b) return ;
- logger_del_bat(lg, b->batCacheid);
- logger_add_bat(lg, b, N(n, NULL, s, "objects_id"));
- bat_destroy(b);
+ b = temp_descriptor(logger_find_bat(lg, N(n, NULL, s,
"keycolumns_id")));
+ if (!b)
+ return;
+ b1 = BATcopy(b, b->htype, b->ttype, 1);
+ if (!b1)
+ return;
+ b1 = BATsetaccess(b1, BAT_READ);
+ logger_del_bat(lg, b->batCacheid);
+ logger_add_bat(lg, b1, N(n, NULL, s, "objects_id"));
+ bat_destroy(b);
+ bat_destroy(b1);
- b = temp_descriptor(logger_find_bat(lg, N(n, NULL, s,
"keycolumns_column")));
- if (!b) return ;
- logger_del_bat(lg, b->batCacheid);
- logger_add_bat(lg, b, N(n, NULL, s, "objects_name"));
- bat_destroy(b);
+ b = temp_descriptor(logger_find_bat(lg, N(n, NULL, s,
"keycolumns_column")));
+ if (!b)
+ return;
+ b1 = BATcopy(b, b->htype, b->ttype, 1);
+ if (!b1)
+ return;
+ b1 = BATsetaccess(b1, BAT_READ);
+ logger_del_bat(lg, b->batCacheid);
+ logger_add_bat(lg, b1, N(n, NULL, s, "objects_name"));
+ bat_destroy(b);
+ bat_destroy(b1);
- b = temp_descriptor(logger_find_bat(lg, N(n, NULL, s,
"keycolumns_nr")));
- if (!b) return ;
- logger_del_bat(lg, b->batCacheid);
- logger_add_bat(lg, b, N(n, NULL, s, "objects_nr"));
- bat_destroy(b);
+ b = temp_descriptor(logger_find_bat(lg, N(n, NULL, s,
"keycolumns_nr")));
+ if (!b)
+ return;
+ b1 = BATcopy(b, b->htype, b->ttype, 1);
+ if (!b1)
+ return;
+ b1 = BATsetaccess(b1, BAT_READ);
+ logger_del_bat(lg, b->batCacheid);
+ logger_add_bat(lg, b1, N(n, NULL, s, "objects_nr"));
+ bat_destroy(b);
+ bat_destroy(b1);
- b = temp_descriptor(logger_find_bat(lg, N(n, NULL, s,
"keycolumns_trunc")));
- if (!b) return ;
- logger_del_bat(lg, b->batCacheid);
- bat_destroy(b);
- if (strcmp(s,"sys") == 0)
- s = "tmp";
- else
- s = NULL;
+ b = temp_descriptor(logger_find_bat(lg, N(n, NULL, s,
"keycolumns_trunc")));
+ if (!b)
+ return;
+ logger_del_bat(lg, b->batCacheid);
+ bat_destroy(b);
+ if (strcmp(s, "sys") == 0)
+ s = "tmp";
+ else
+ s = NULL;
}
}
}
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -1434,10 +1434,10 @@
}
/* check consistency of -h -p and -P args */
- if (mero_pass != NULL && mero_host == NULL) {
- fprintf(stderr, "monetdb: -P requires -h to be used\n");
+ if (mero_pass != NULL && (mero_host == NULL || *mero_host == '/')) {
+ fprintf(stderr, "monetdb: -P requires -h to be used with a TCP
hostname\n");
exit(1);
- } else if (mero_host != NULL && mero_pass == NULL) {
+ } else if (mero_host != NULL && *mero_host != '/' && mero_pass == NULL)
{
fprintf(stderr, "monetdb: -h requires -P to be used\n");
exit(1);
}
@@ -1506,6 +1506,8 @@
fprintf(stderr, "monetdb: cannot find a control socket,
use -h and/or -p\n");
exit(1);
}
+ /* don't confuse control_send lateron */
+ mero_port = -1;
}
/* for TCP connections */
if (mero_host != NULL && *mero_host != '/' && mero_port == -1)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
