Changeset: 08135ec80628 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=08135ec80628
Modified Files:
clients/odbc/driver/ODBCError.c
configure.ag
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/url.c
monetdb5/modules/kernel/alarm.c
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/mmath.c
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/factories.c
monetdb5/modules/mal/language.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mdb.c
sql/ChangeLog.Aug2018
sql/backends/monet5/UDF/pyapi/conversion.c
sql/backends/monet5/sql.c
sql/backends/monet5/vaults/bam/bam_export.c
sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.stable.err
sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.stable.out
Branch: default
Log Message:
Merge with Aug2018 branch.
diffs (truncated from 447 to 300 lines):
diff --git a/clients/odbc/driver/ODBCError.c b/clients/odbc/driver/ODBCError.c
--- a/clients/odbc/driver/ODBCError.c
+++ b/clients/odbc/driver/ODBCError.c
@@ -83,6 +83,7 @@ static struct SQLStateMsg {
{"08004", "Server rejected the connection"},
{"08007", "Connection failure during transaction"},
{"08S01", "Communication link failure"},
+ {"0A000", "Feature not supported"},
{"21S01", "Insert value list does not match column list"},
{"21S02", "Degree of derived table does not match column list"},
{"22001", "String data, right truncated"},
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -750,7 +750,7 @@ AC_SUBST([X_CFLAGS])
AS_CASE([$CC_ver], [icc-*], [
AS_IF([test -f /usr/include/math.h && ! grep -q _LIB_VERSION_TYPE
/usr/include/math.h],
[AC_DEFINE([INTEL_MATH_H_HACK], 1,
- [Define if using Intel compiler with icompatible system
math.h])])])
+ [Define if using Intel compiler with incompatible
system math.h])])])
AC_MSG_CHECKING([for ld -Bsymbolic-functions option])
save_LDFLAGS="$LDFLAGS"
diff --git a/monetdb5/modules/atoms/batxml.c b/monetdb5/modules/atoms/batxml.c
--- a/monetdb5/modules/atoms/batxml.c
+++ b/monetdb5/modules/atoms/batxml.c
@@ -499,7 +499,7 @@ BATXMLoptions(bat *ret, const char * con
snprintf(buf, size, "nil");
else {
/*if(strcmp(*options,"niloncontent")==0) */
- err = PROGRAM_NYI;
+ err = SQLSTATE(0A000) PROGRAM_NYI;
goto bunins_failed;
}
@@ -1443,7 +1443,7 @@ BATXMLxquery(bat *ret, const bat *bid, c
(void) bid;
(void) expr;
/* use external library to solve this */
- throw(MAL, "xml.xquery", PROGRAM_NYI);
+ throw(MAL, "xml.xquery", SQLSTATE(0A000) PROGRAM_NYI);
}
#else
diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/modules/atoms/json.c
--- a/monetdb5/modules/atoms/json.c
+++ b/monetdb5/modules/atoms/json.c
@@ -1996,7 +1996,7 @@ JSONtextString(str *ret, bat *bid)
{
(void) ret;
(void) bid;
- throw(MAL, "json.text", PROGRAM_NYI);
+ throw(MAL, "json.text", SQLSTATE(0A000) PROGRAM_NYI);
}
@@ -2008,7 +2008,7 @@ JSONtextGrouped(bat *ret, bat *bid, bat
(void) gid;
(void) ext;
(void) flg;
- throw(MAL, "json.text", PROGRAM_NYI);
+ throw(MAL, "json.text", SQLSTATE(0A000) PROGRAM_NYI);
}
str
diff --git a/monetdb5/modules/atoms/url.c b/monetdb5/modules/atoms/url.c
--- a/monetdb5/modules/atoms/url.c
+++ b/monetdb5/modules/atoms/url.c
@@ -390,51 +390,10 @@ URLgetBasename(str *retval, url *val)
str
URLgetContent(str *retval, url *Str1)
{
- stream *f;
- str retbuf = NULL;
- str oldbuf = NULL;
- char *buf[8096];
- ssize_t len;
- size_t rlen;
-
- if ((f = open_urlstream(*Str1)) == NULL)
- throw(MAL, "url.getContent", "failed to open urlstream");
-
- if (mnstr_errnr(f) != 0) {
- str err = createException(MAL, "url.getContent",
- "opening stream failed: %s", mnstr_error(f));
- close_stream(f);
- *retval = NULL;
- return err;
- }
+ (void) retval;
+ (void) Str1;
- rlen = 0;
- while ((len = mnstr_read(f, buf, 1, sizeof(buf))) > 0) {
- if (retbuf != NULL) {
- oldbuf = retbuf;
- retbuf = GDKrealloc(retbuf, rlen + len + 1);
- } else {
- retbuf = GDKmalloc(len + 1);
- }
- if (retbuf == NULL) {
- if (oldbuf != NULL)
- GDKfree(oldbuf);
- close_stream(f);
- throw(MAL, "url.getContent", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
- }
- oldbuf = NULL;
- (void)memcpy(retbuf + rlen, buf, len);
- rlen += len;
- }
- close_stream(f);
- if (len < 0) {
- GDKfree(retbuf);
- throw(MAL, "url.getContent", "read error");
- }
- retbuf[rlen] = '\0';
-
- *retval = retbuf;
- return MAL_SUCCEED;
+ throw(MAL, "url.getContent", SQLSTATE(0A000) "Feature not supported");
}
/* COMMAND "getContext": Extract the path context from the URL
diff --git a/monetdb5/modules/kernel/alarm.c b/monetdb5/modules/kernel/alarm.c
--- a/monetdb5/modules/kernel/alarm.c
+++ b/monetdb5/modules/kernel/alarm.c
@@ -158,7 +158,7 @@ ALARMsetalarm(void *res, int *secs, str
(void) res;
(void) secs;
(void) action; /* foolc compiler */
- throw(MAL, "alarm.setalarm", PROGRAM_NYI);
+ throw(MAL, "alarm.setalarm", SQLSTATE(0A000) PROGRAM_NYI);
}
str
@@ -166,7 +166,7 @@ ALARMtimers(bat *res, bat *actions)
{
(void) res; /* fool compiler */
(void) actions; /* fool compiler */
- throw(MAL, "alarm.timers", PROGRAM_NYI);
+ throw(MAL, "alarm.timers", SQLSTATE(0A000) PROGRAM_NYI);
}
str
diff --git a/monetdb5/modules/kernel/batmmath.c
b/monetdb5/modules/kernel/batmmath.c
--- a/monetdb5/modules/kernel/batmmath.c
+++ b/monetdb5/modules/kernel/batmmath.c
@@ -352,14 +352,14 @@ str CMDscience_cst_bat_##FUNC##_##TYPE(b
scienceFcnImpl(Operator,dbl,) \
scienceFcnImpl(Operator,flt,f)
-#define scienceNotImpl(FUNC)
\
-str CMDscience_bat_flt_##FUNC(bat *ret, const bat *bid) \
-{
\
- throw(MAL, "batmmath." #FUNC, PROGRAM_NYI); \
-}
\
-str CMDscience_bat_dbl_##FUNC(bat *ret, const bat *bid) \
-{
\
- throw(MAL, "batmmath." #FUNC, PROGRAM_NYI); \
+#define scienceNotImpl(FUNC)
\
+str CMDscience_bat_flt_##FUNC(bat *ret, const bat *bid)
\
+{
\
+ throw(MAL, "batmmath." #FUNC, SQLSTATE(0A000) PROGRAM_NYI); \
+}
\
+str CMDscience_bat_dbl_##FUNC(bat *ret, const bat *bid)
\
+{
\
+ throw(MAL, "batmmath." #FUNC, SQLSTATE(0A000) PROGRAM_NYI); \
}
scienceImpl(asin)
diff --git a/monetdb5/modules/kernel/mmath.c b/monetdb5/modules/kernel/mmath.c
--- a/monetdb5/modules/kernel/mmath.c
+++ b/monetdb5/modules/kernel/mmath.c
@@ -100,16 +100,16 @@ MATHbinary##NAME##TYPE(TYPE *res, const
return MAL_SUCCEED;
\
}
-#define unopM5NOT(NAME, FUNC) \
-str
\
-MATHunary##NAME##dbl(dbl *res , const dbl *a) \
-{
\
- throw(MAL, "mmath." #FUNC, PROGRAM_NYI); \
-}
\
-str
\
-MATHunary##NAME##flt(flt *res , const flt *a) \
-{
\
- throw(MAL, "mmath." #FUNC, PROGRAM_NYI); \
+#define unopM5NOT(NAME, FUNC)
\
+str
\
+MATHunary##NAME##dbl(dbl *res , const dbl *a)
\
+{
\
+ throw(MAL, "mmath." #FUNC, SQLSTATE(0A000) PROGRAM_NYI); \
+}
\
+str
\
+MATHunary##NAME##flt(flt *res , const flt *a)
\
+{
\
+ throw(MAL, "mmath." #FUNC, SQLSTATE(0A000) PROGRAM_NYI); \
}
#define binopM5(NAME, FUNC) \
diff --git a/monetdb5/modules/mal/batcalc.c b/monetdb5/modules/mal/batcalc.c
--- a/monetdb5/modules/mal/batcalc.c
+++ b/monetdb5/modules/mal/batcalc.c
@@ -477,12 +477,12 @@ CMDbatBINARY0(MalStkPtr stk, InstrPtr pc
BBPunfix(b->batCacheid);
if (s)
BBPunfix(s->batCacheid);
- throw(MAL, malfunc, PROGRAM_NYI);
+ throw(MAL, malfunc, SQLSTATE(0A000) PROGRAM_NYI);
} else {
bn = (*batfunc1)(b, &stk->stk[getArg(pci, 2)], s);
}
} else if (batfunc2 == NULL) {
- throw(MAL, malfunc, PROGRAM_NYI);
+ throw(MAL, malfunc, SQLSTATE(0A000) PROGRAM_NYI);
} else {
assert(tp1 != TYPE_bat && !isaBatType(tp1));
assert(tp2 == TYPE_bat || isaBatType(tp2));
diff --git a/monetdb5/modules/mal/clients.c b/monetdb5/modules/mal/clients.c
--- a/monetdb5/modules/mal/clients.c
+++ b/monetdb5/modules/mal/clients.c
@@ -384,7 +384,7 @@ str CLTmd5sum(str *ret, str *pw) {
#else
(void) ret;
(void) pw;
- throw(MAL, "clients.md5sum", PROGRAM_NYI);
+ throw(MAL, "clients.md5sum", SQLSTATE(0A000) PROGRAM_NYI);
#endif
}
@@ -399,7 +399,7 @@ str CLTsha1sum(str *ret, str *pw) {
#else
(void) ret;
(void) pw;
- throw(MAL, "clients.sha1sum", PROGRAM_NYI);
+ throw(MAL, "clients.sha1sum", SQLSTATE(0A000) PROGRAM_NYI);
#endif
}
@@ -414,7 +414,7 @@ str CLTripemd160sum(str *ret, str *pw) {
#else
(void) ret;
(void) pw;
- throw(MAL, "clients.ripemd160sum", PROGRAM_NYI);
+ throw(MAL, "clients.ripemd160sum", SQLSTATE(0A000) PROGRAM_NYI);
#endif
}
diff --git a/monetdb5/modules/mal/factories.c b/monetdb5/modules/mal/factories.c
--- a/monetdb5/modules/mal/factories.c
+++ b/monetdb5/modules/mal/factories.c
@@ -19,35 +19,35 @@ FCTgetPlants(bat *ret, bat *ret2)
{
(void) ret;
(void) ret2;
- throw(MAL, "factories.getPlants", PROGRAM_NYI);
+ throw(MAL, "factories.getPlants", SQLSTATE(0A000) PROGRAM_NYI);
}
str
FCTgetCaller(int *ret)
{
(void) ret;
- throw(MAL, "factories.getCaller", PROGRAM_NYI);
+ throw(MAL, "factories.getCaller", SQLSTATE(0A000) PROGRAM_NYI);
}
str
FCTgetOwners(bat *ret)
{
(void) ret;
- throw(MAL, "factories.getOwner", PROGRAM_NYI);
+ throw(MAL, "factories.getOwner", SQLSTATE(0A000) PROGRAM_NYI);
}
str
FCTgetArrival(bat *ret)
{
(void) ret;
- throw(MAL, "factories.getArrival", PROGRAM_NYI);
+ throw(MAL, "factories.getArrival", SQLSTATE(0A000) PROGRAM_NYI);
}
str
FCTgetDeparture(bat *ret)
{
(void) ret;
- throw(MAL, "factories.getDeparture", PROGRAM_NYI);
+ throw(MAL, "factories.getDeparture", SQLSTATE(0A000) PROGRAM_NYI);
}
str
diff --git a/monetdb5/modules/mal/language.c b/monetdb5/modules/mal/language.c
--- a/monetdb5/modules/mal/language.c
+++ b/monetdb5/modules/mal/language.c
@@ -97,7 +97,7 @@ MALassertTriple(Client cntxt, MalBlkPtr
(void) mb;
(void) stk;
(void) p;
- throw(MAL, "mal.assert", PROGRAM_NYI);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
