Changeset: 994a1fe146eb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=994a1fe146eb
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk.h
gdk/gdk_batop.mx
gdk/gdk_sample.c
java/SQLSTATEs
monetdb5/modules/mal/sample.c
sql/backends/monet5/sql_result.mx
sql/backends/monet5/sql_scenario.c
Branch: jacqueline
Log Message:
Merged from default
diffs (114 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -152,6 +152,7 @@ BAT *BATrestrict(BAT *b, ptr hl, ptr hh,
BAT *BATrevert(BAT *b);
BAT *BATroles(BAT *b, const char *hnme, const char *tnme);
BAT *BATsample(BAT *b, BUN n);
+BAT *BATsample_deprecated(BAT *b, BUN n);
BAT *BATsave(BAT *b);
BAT *BATsdiff(BAT *b, BAT *c);
BAT *BATselect(BAT *b, ptr tl, ptr th);
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -3129,7 +3129,7 @@ gdk_export int ALIGNsetH(BAT *b1, BAT *b
gdk_export void PROPdestroy(PROPrec *p);
gdk_export PROPrec * BATgetprop(BAT *b, int idx);
gdk_export void BATsetprop(BAT *b, int idx, int type, void *v);
-gdk_export BAT *BATsample(BAT *b, BUN n);
+gdk_export BAT *BATsample_deprecated(BAT *b, BUN n);
gdk_export BAT *BAThistogram(BAT *b);
gdk_export int BATtopN(BAT *b, BUN topN); /* used in
monet5/src/modules/kernel/algebra.mx */
@@ -3368,7 +3368,7 @@ gdk_export int BATcalcavg(BAT *b, dbl *a
* @tab BATsample (BAT *b, n)
* @end multitable
*/
-gdk_export BAT *BATsample1(BAT *b, BUN n);
+gdk_export BAT *BATsample(BAT *b, BUN n);
/* generic n-ary multijoin beast, with defines to interpret retval */
#define MULTIJOIN_SORTED(r) ((char*) &r)[0]
diff --git a/gdk/gdk_batop.mx b/gdk/gdk_batop.mx
--- a/gdk/gdk_batop.mx
+++ b/gdk/gdk_batop.mx
@@ -1374,7 +1374,7 @@ BATtopN(BAT *b, BUN topN)
* @- Random Selections
*/
BAT *
-BATsample(BAT *b, BUN size)
+BATsample_deprecated(BAT *b, BUN size)
{
BUN cnt, i, r = 0, n, j;
BUN *choice = NULL, *dst;
diff --git a/gdk/gdk_sample.c b/gdk/gdk_sample.c
--- a/gdk/gdk_sample.c
+++ b/gdk/gdk_sample.c
@@ -47,7 +47,7 @@
*/
BAT *
-BATsample1(BAT *b, BUN n)
+BATsample(BAT *b, BUN n)
{
BAT *bn;
BUN cnt;
diff --git a/java/SQLSTATEs b/java/SQLSTATEs
--- a/java/SQLSTATEs
+++ b/java/SQLSTATEs
@@ -36,6 +36,9 @@ 42M31 user/role already exists
42M32 user/role not found
08M33 connection timeout
0AM34 Java generics not supported
+42M35 sequence not found
+42M36 cannot restart sequence with NULL
+2BM37 dependent objects still exist
TODO:
JDBC 4.1 suggests the following SQLException subclass mapping:
diff --git a/monetdb5/modules/mal/sample.c b/monetdb5/modules/mal/sample.c
--- a/monetdb5/modules/mal/sample.c
+++ b/monetdb5/modules/mal/sample.c
@@ -85,7 +85,7 @@ SAMPLEuniform(bat *r, bat *b, ptr s) {
if ((bb = BATdescriptor(*b)) == NULL) {
throw(MAL, "sample.uniform", INTERNAL_BAT_ACCESS);
}
- br = BATsample1(bb,*(BUN *)s);
+ br = BATsample(bb,*(BUN *)s);
if (br == NULL)
throw(MAL, "sample.uniform", OPERATION_FAILED);
diff --git a/sql/backends/monet5/sql_result.mx
b/sql/backends/monet5/sql_result.mx
--- a/sql/backends/monet5/sql_result.mx
+++ b/sql/backends/monet5/sql_result.mx
@@ -1337,7 +1337,7 @@ mvc_export_head(mvc *m, stream *s, int r
return export_error(order);
/* row count, min(count, reply_size) */
- if (!mvc_send_int(s, (BUN) m->reply_size < count ? m->reply_size :
(int) count))
+ if (!mvc_send_int(s, (m->reply_size >= 0 && (BUN) m->reply_size <
count) ? m->reply_size : (int) count))
return export_error(order);
if (mnstr_write(s, "\n% ", 3, 1) != 1)
@@ -1463,7 +1463,7 @@ mvc_export_result(mvc *m, stream *s, int
return -1;
count = m->reply_size;
- if (count == 0 || count >= BATcount(order)) {
+ if (count <= 0 || count >= BATcount(order)) {
count = BATcount(order);
clean = 1;
}
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -467,7 +467,7 @@ SQLinitClient(Client c)
if (c->state[MAL_SCENARIO_PARSER] == 0) {
m = mvc_create(c->idx, 0, SQLdebug, c->fdin, c->fdout);
global_variables(m, "monetdb", "sys");
- if (isAdministrator(c)) /* console should return everything */
+ if (isAdministrator(c) || strcmp(c->scenario, "msql") == 0) /*
console should return everything */
m->reply_size = -1;
be = (void *) backend_create(m, c);
} else {
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
