Changeset: 2abb2b61e27e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2abb2b61e27e
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql_time.c
Branch: Jul2021
Log Message:
More quick descriptors
diffs (62 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
@@ -4952,9 +4952,9 @@ SQLunionfunc(Client cntxt, MalBlkPtr mb,
if (!ret) {
/* insert into result */
- if (!(fres =
BATdescriptor(env->stk[q->argv[0]].val.bval)))
+ if (!(fres =
BBPquickdesc(env->stk[q->argv[0]].val.bval))) {
ret =
createException(MAL, "sql.unionfunc", SQLSTATE(HY005) "Cannot access column
descriptor");
- else {
+ } else {
BAT *p =
BATconstant(fres->hseqbase, res[0]->ttype, (ptr)BUNtail(bi[0], cur),
BATcount(fres), TRANSIENT);
if (p) {
@@ -4964,7 +4964,6 @@ SQLunionfunc(Client cntxt, MalBlkPtr mb,
} else {
ret =
createException(MAL, "sql.unionfunc", GDK_EXCEPTION);
}
-
BBPunfix(fres->batCacheid);
}
i=1;
for (ii = 0; i < pci->retc &&
!ret; i++) {
diff --git a/sql/backends/monet5/sql_time.c b/sql/backends/monet5/sql_time.c
--- a/sql/backends/monet5/sql_time.c
+++ b/sql/backends/monet5/sql_time.c
@@ -259,10 +259,9 @@ nil_2time_daytime(Client cntxt, MalBlkPt
(void) cntxt;
if (isaBatType(getArgType(mb, pci, 1))) {
daytime d = daytime_nil;
- if (!(b = BATdescriptor(*getArgReference_bat(stk, pci, 1))))
+ if (!(b = BBPquickdesc(*getArgReference_bat(stk, pci, 1))))
throw(SQL, "batcalc.nil_2time_daytime", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
res = BATconstant(b->hseqbase, TYPE_daytime, &d, BATcount(b),
TRANSIENT);
- BBPunfix(b->batCacheid);
if (!res)
throw(SQL, "batcalc.nil_2time_daytime", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
r = getArgReference_bat(stk, pci, 0);
@@ -750,10 +749,9 @@ nil_2time_timestamp(Client cntxt, MalBlk
(void) cntxt;
if (isaBatType(getArgType(mb, pci, 1))) {
timestamp d = timestamp_nil;
- if (!(b = BATdescriptor(*getArgReference_bat(stk, pci, 1))))
+ if (!(b = BBPquickdesc(*getArgReference_bat(stk, pci, 1))))
throw(SQL, "batcalc.nil_2time_timestamp",
SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
res = BATconstant(b->hseqbase, TYPE_timestamp, &d, BATcount(b),
TRANSIENT);
- BBPunfix(b->batCacheid);
if (!res)
throw(SQL, "batcalc.nil_2time_timestamp",
SQLSTATE(HY013) MAL_MALLOC_FAIL);
r = getArgReference_bat(stk, pci, 0);
@@ -1540,10 +1538,9 @@ nil_2_date(Client cntxt, MalBlkPtr mb, M
(void) cntxt;
if (isaBatType(getArgType(mb, pci, 1))) {
date d = date_nil;
- if (!(b = BATdescriptor(*getArgReference_bat(stk, pci, 1))))
+ if (!(b = BBPquickdesc(*getArgReference_bat(stk, pci, 1))))
throw(SQL, "batcalc.nil_2_date", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
res = BATconstant(b->hseqbase, TYPE_date, &d, BATcount(b),
TRANSIENT);
- BBPunfix(b->batCacheid);
if (!res)
throw(SQL, "batcalc.nil_2_date", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
r = getArgReference_bat(stk, pci, 0);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
