Changeset: 6a11e6172e05 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6a11e6172e05
Modified Files:
gdk/gdk_subquery.c
sql/backends/monet5/sql_subquery.c
Branch: default
Log Message:
merged
diffs (126 lines):
diff --git a/gdk/gdk_subquery.c b/gdk/gdk_subquery.c
--- a/gdk/gdk_subquery.c
+++ b/gdk/gdk_subquery.c
@@ -88,10 +88,7 @@ BATall_grp(BAT *l, BAT *g, BAT *e, BAT *
else
gids = (const oid *) Tloc(g, 0);
- switch (l->ttype) {
- case TYPE_bit:
- SQLall_grp_imp(bit);
- break;
+ switch (ATOMbasetype(l->ttype)) {
case TYPE_bte:
SQLall_grp_imp(bte);
break;
@@ -240,10 +237,7 @@ BATnil_grp(BAT *l, BAT *g, BAT *e, BAT *
else
gids = (const oid *) Tloc(g, 0);
- switch (l->ttype) {
- case TYPE_bit:
- SQLnil_grp_imp(bit);
- break;
+ switch (ATOMbasetype(l->ttype)) {
case TYPE_bte:
SQLnil_grp_imp(bte);
break;
@@ -375,10 +369,7 @@ BATanyequal_grp(BAT *l, BAT *r, BAT *g,
else
gids = (const oid *) Tloc(g, 0);
- switch (l->ttype) {
- case TYPE_bit:
- SQLanyequal_or_not_grp_imp(bit, TRUE);
- break;
+ switch (ATOMbasetype(l->ttype)) {
case TYPE_bte:
SQLanyequal_or_not_grp_imp(bte, TRUE);
break;
@@ -491,10 +482,7 @@ BATallnotequal_grp(BAT *l, BAT *r, BAT *
else
gids = (const oid *) Tloc(g, 0);
- switch (l->ttype) {
- case TYPE_bit:
- SQLanyequal_or_not_grp_imp(bit, FALSE);
- break;
+ switch (ATOMbasetype(l->ttype)) {
case TYPE_bte:
SQLanyequal_or_not_grp_imp(bte, FALSE);
break;
@@ -636,10 +624,7 @@ BATanyequal_grp2(BAT *l, BAT *r, BAT *ri
else
gids = (const oid *) Tloc(g, 0);
- switch (l->ttype) {
- case TYPE_bit:
- SQLanyequal_or_not_grp2_imp(bit, TRUE, FALSE);
- break;
+ switch (ATOMbasetype(l->ttype)) {
case TYPE_bte:
SQLanyequal_or_not_grp2_imp(bte, TRUE, FALSE);
break;
@@ -758,10 +743,7 @@ BATallnotequal_grp2(BAT *l, BAT *r, BAT
else
gids = (const oid *) Tloc(g, 0);
- switch (l->ttype) {
- case TYPE_bit:
- SQLanyequal_or_not_grp2_imp(bit, FALSE, TRUE);
- break;
+ switch (ATOMbasetype(l->ttype)) {
case TYPE_bte:
SQLanyequal_or_not_grp2_imp(bte, FALSE, TRUE);
break;
diff --git a/sql/backends/monet5/sql_subquery.c
b/sql/backends/monet5/sql_subquery.c
--- a/sql/backends/monet5/sql_subquery.c
+++ b/sql/backends/monet5/sql_subquery.c
@@ -156,10 +156,7 @@ SQLall(ptr ret, const bat *bid)
oid p = oid_nil;
memcpy(ret, &p, sizeof(oid));
} else {
- switch (b->ttype) {
- case TYPE_bit:
- SQLall_imp(bit);
- break;
+ switch (ATOMbasetype(b->ttype)) {
case TYPE_bte:
SQLall_imp(bte);
break;
@@ -295,10 +292,7 @@ SQLnil(bit *ret, const bat *bid)
if (BATcount(b) > 0) {
BUN o = BUNlast(b);
- switch (b->ttype) {
- case TYPE_bit:
- SQLnil_imp(bit);
- break;
+ switch (ATOMbasetype(b->ttype)) {
case TYPE_bte:
SQLnil_imp(bte);
break;
@@ -630,10 +624,7 @@ SQLanyequal(bit *ret, const bat *bid1, c
if (BATcount(r) > 0) {
BUN o = BUNlast(r);
- switch (l->ttype) {
- case TYPE_bit:
- SQLanyequal_or_not_imp(bit, TRUE);
- break;
+ switch (ATOMbasetype(l->ttype)) {
case TYPE_bte:
SQLanyequal_or_not_imp(bte, TRUE);
break;
@@ -826,10 +817,7 @@ SQLallnotequal(bit *ret, const bat *bid1
if (BATcount(r) > 0) {
BUN o = BUNlast(r);
- switch (l->ttype) {
- case TYPE_bit:
- SQLanyequal_or_not_imp(bit, FALSE);
- break;
+ switch (ATOMbasetype(l->ttype)) {
case TYPE_bte:
SQLanyequal_or_not_imp(bte, FALSE);
break;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
