Changeset: f993b1c9aa9a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f993b1c9aa9a
Modified Files:
gdk/gdk_batop.c
monetdb5/mal/mal_interpreter.c
sql/server/rel_updates.c
sql/test/BugTracker-2014/Tests/queueError.Bug-3604.sql
sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.err
sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (115 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -177,7 +177,7 @@ insert_string_bat(BAT *b, BAT *n, int ap
toff = ~(size_t) 0;
goto bunins_failed;
}
- memcpy(b->T->vheap->base + toff,
n->T->vheap->base, n->T->vheap->size);
+ memcpy(b->T->vheap->base + toff,
n->T->vheap->base, n->T->vheap->free);
b->T->vheap->free = toff + n->T->vheap->free;
/* flush double-elimination hash table */
memset(b->T->vheap->base, 0, GDK_STRHASHSIZE);
diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -768,7 +768,8 @@ str runMALsequence(Client cntxt, MalBlkP
if( mb->stop <= 1)
continue;
runtimeProfileExit(cntxt, mb, stk, pci,
&runtimeProfile);
- runtimeProfileFinish(cntxt, mb);
+ if (ret != MAL_SUCCEED)
+ runtimeProfileFinish(cntxt, mb);
/* check for strong debugging after each MAL statement
*/
if ( pci->token != FACcall && ret== MAL_SUCCEED) {
if (GDKdebug & (CHECKMASK|PROPMASK) &&
exceptionVar < 0) {
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -113,6 +113,7 @@ get_inserts( sql_rel *ins )
static sql_rel *
rel_insert_hash_idx(mvc *sql, sql_idx *i, sql_rel *inserts)
{
+ char *iname = sa_strconcat( sql->sa, "%", i->base.name);
node *m;
sql_subtype *it, *wrd;
int bits = 1 + ((sizeof(wrd)*8)-1)/(list_length(i->columns)+1);
@@ -156,6 +157,7 @@ rel_insert_hash_idx(mvc *sql, sql_idx *i
}
/* append inserts to hash */
append(get_inserts(inserts), h);
+ exp_setname(sql->sa, h, i->t->base.name, iname);
return inserts;
}
diff --git a/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.sql
b/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.sql
--- a/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.sql
+++ b/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.sql
@@ -1,5 +1,5 @@
-select qtag,user,status,query from sys.queue();
+select user,status,query from sys.queue();
drop table xyz;
-select qtag,user,status,query from sys.queue();
+select user,status,query from sys.queue();
drop table yz;
-select qtag,user,status,query from sys.queue();
+select user,status,query from sys.queue();
diff --git a/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.err
b/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.err
--- a/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.err
+++ b/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.err
@@ -27,10 +27,10 @@ stderr of test 'queueError.Bug-3604` in
# cmdline opt gdk_debug = 536870922
-MAPI = (monetdb) /var/tmp/mtest-31705/.s.monetdb.38458
+MAPI = (monetdb) /var/tmp/mtest-8635/.s.monetdb.30394
QUERY = drop table xyz;
ERROR = !DROP TABLE: no such table 'xyz'
-MAPI = (monetdb) /var/tmp/mtest-31705/.s.monetdb.38458
+MAPI = (monetdb) /var/tmp/mtest-8635/.s.monetdb.30394
QUERY = drop table yz;
ERROR = !DROP TABLE: no such table 'yz'
diff --git a/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out
b/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out
--- a/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out
+++ b/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out
@@ -53,21 +53,24 @@ Ready.
# 11:43:52 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-3599" "--port=35114"
# 11:43:52 >
-#select qtag,user,status,query from sys.queue();
-% .L, .L1, .L1, .L1 # table_name
-% qtag, L1, status, query # name
-% bigint, varchar, clob, clob # type
-% 1, 0, 0, 0 # length
-#select qtag,user,status,query from sys.queue();
-% .L, .L1, .L1, .L1 # table_name
-% qtag, L1, status, query # name
-% bigint, varchar, clob, clob # type
-% 1, 0, 0, 0 # length
-#select qtag,user,status,query from sys.queue();
-% .L, .L1, .L1, .L1 # table_name
-% qtag, L1, status, query # name
-% bigint, varchar, clob, clob # type
-% 1, 0, 0, 0 # length
+#select user,status,query from sys.queue();
+% .L1, .L1, .L1 # table_name
+% L1, status, query # name
+% varchar, clob, clob # type
+% 7, 7, 42 # length
+[ "monetdb", "running", "select user,status,query from sys.queue();"
]
+#select user,status,query from sys.queue();
+% .L1, .L1, .L1 # table_name
+% L1, status, query # name
+% varchar, clob, clob # type
+% 7, 7, 42 # length
+[ "monetdb", "running", "select user,status,query from sys.queue();"
]
+#select user,status,query from sys.queue();
+% .L1, .L1, .L1 # table_name
+% L1, status, query # name
+% varchar, clob, clob # type
+% 7, 7, 42 # length
+[ "monetdb", "running", "select user,status,query from sys.queue();"
]
# 11:43:52 >
# 11:43:52 > "Done."
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
