Changeset: f4ae6e2a833a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f4ae6e2a833a
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
Branch: Oct2014
Log Message:
correct implementation of scalar identity
diffs (35 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -3141,16 +3141,10 @@ not_unique_oids(bat *ret, const bat *bid
/* row case */
str
-SQLidentity(bat *ret, const bat *bid)
+SQLidentity(oid *ret, const void *i)
{
- BAT *bn, *b;
-
- if ((b = BATdescriptor(*bid)) == NULL) {
- throw(SQL, "batcalc.identity", "Cannot access descriptor");
- }
- bn = VIEWhead(b);
- BBPunfix(b->batCacheid);
- BBPkeepref(*ret = bn->batCacheid);
+ (void)i;
+ *ret = 0;
return MAL_SUCCEED;
}
diff --git a/sql/backends/monet5/sql.h b/sql/backends/monet5/sql.h
--- a/sql/backends/monet5/sql.h
+++ b/sql/backends/monet5/sql.h
@@ -160,7 +160,7 @@ sql5_export str sql_rank_grp(bat *rid, c
sql5_export str sql_rank(bat *rid, const bat *bid);
sql5_export str sql_dense_rank_grp(bat *rid, const bat *bid, const bat *gid,
const bat *gpe);
sql5_export str sql_dense_rank(bat *rid, const bat *bid);
-sql5_export str SQLidentity(bat *rid, const bat *bid);
+sql5_export str SQLidentity(oid *rid, const void *i);
sql5_export str BATSQLidentity(bat *rid, const bat *bid);
sql5_export str PBATSQLidentity(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
