Changeset: 6adc0e952a02 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6adc0e952a02
Modified Files:
gdk/gdk_aggr.c
gdk/gdk_orderidx.c
monetdb5/extras/rapi/converters.c.h
sql/backends/monet5/sql_result.c
Branch: Jul2017
Log Message:
ATOMstorage is just for storage, not for semantics.
diffs (84 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -707,7 +707,7 @@ dosum(const void *restrict values, int n
#ifdef HAVE_HGE
case TYPE_hge: {
hge *sums = (hge *) results;
- switch (ATOMstorage(tp1)) {
+ switch (tp1) {
case TYPE_bte:
AGGR_SUM(bte, hge);
break;
@@ -1210,7 +1210,7 @@ doprod(const void *restrict values, oid
#ifdef HAVE_HGE
case TYPE_lng: {
lng *prods = (lng *) results;
- switch (ATOMstorage(tp1)) {
+ switch (tp1) {
case TYPE_bte:
AGGR_PROD(bte, lng, hge);
break;
@@ -1230,7 +1230,7 @@ doprod(const void *restrict values, oid
}
case TYPE_hge: {
hge *prods = (hge *) results;
- switch (ATOMstorage(tp1)) {
+ switch (tp1) {
case TYPE_bte:
AGGR_PROD_HGE(bte);
break;
diff --git a/gdk/gdk_orderidx.c b/gdk/gdk_orderidx.c
--- a/gdk/gdk_orderidx.c
+++ b/gdk/gdk_orderidx.c
@@ -320,7 +320,7 @@ GDKmergeidx(BAT *b, BAT**a, int n_ar)
if (BATcheckorderidx(b))
return GDK_SUCCEED;
- switch (ATOMstorage(b->ttype)) {
+ switch (ATOMbasetype(b->ttype)) {
case TYPE_bte:
case TYPE_sht:
case TYPE_int:
@@ -390,7 +390,7 @@ GDKmergeidx(BAT *b, BAT**a, int n_ar)
q0 = p0 + BATcount(a[0]);
q1 = p1 + BATcount(a[1]);
- switch (ATOMstorage(b->ttype)) {
+ switch (ATOMbasetype(b->ttype)) {
case TYPE_bte: BINARY_MERGE(bte); break;
case TYPE_sht: BINARY_MERGE(sht); break;
case TYPE_int: BINARY_MERGE(int); break;
@@ -432,7 +432,7 @@ GDKmergeidx(BAT *b, BAT**a, int n_ar)
q[i] = p[i] + BATcount(a[i]);
}
- switch (ATOMstorage(b->ttype)) {
+ switch (ATOMbasetype(b->ttype)) {
case TYPE_bte: NWAY_MERGE(bte); break;
case TYPE_sht: NWAY_MERGE(sht); break;
case TYPE_int: NWAY_MERGE(int); break;
diff --git a/monetdb5/extras/rapi/converters.c.h
b/monetdb5/extras/rapi/converters.c.h
--- a/monetdb5/extras/rapi/converters.c.h
+++ b/monetdb5/extras/rapi/converters.c.h
@@ -62,7 +62,7 @@
static SEXP bat_to_sexp(BAT* b) {
SEXP varvalue = NULL;
// TODO: deal with SQL types (DECIMAL/DATE)
- switch (ATOMstorage(getBatType(b->ttype))) {
+ switch (ATOMstorage(b->ttype)) {
case TYPE_void: {
size_t i = 0;
varvalue = PROTECT(NEW_LOGICAL(BATcount(b)));
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -1667,7 +1667,7 @@ mvc_export_table_prot10(backend *b, stre
} else {
int atom_size = ATOMsize(mtype);
if (c->type.type->eclass == EC_DEC) {
- atom_size =
ATOMsize(ATOMstorage(mtype));
+ atom_size = ATOMsize(mtype);
}
if (c->type.type->eclass == EC_TIMESTAMP) {
// convert timestamp values to epoch
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
