Changeset: 873347ebd047 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=873347ebd047
Modified Files:
gdk/gdk_aggr.c
gdk/gdk_string.c
sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.stable.out
Branch: default
Log Message:
merge with default
diffs (71 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -3169,7 +3169,7 @@ BATcalcvariance_sample(dbl *avgp, BAT *b
} while (0)
static dbl
-calccovariance(const void *restrict v1, const void *restrict v2, BUN cnt, int
tp, bool issample, const char *func)
+calccovariance(const void *v1, const void *v2, BUN cnt, int tp, bool issample,
const char *func)
{
BUN n = 0, i;
dbl mean1 = 0, mean2 = 0, m2 = 0, delta1, delta2;
@@ -3246,7 +3246,7 @@ BATcalccorrelation(BAT *b1, BAT *b2)
{
BUN n = 0, i, cnt = BATcount(b1);
dbl mean1 = 0, mean2 = 0, up = 0, down1 = 0, down2 = 0, delta1, delta2,
aux;
- const void *restrict v1 = (const void *) Tloc(b1, 0), *restrict v2 =
(const void *) Tloc(b2, 0);
+ const void *v1 = (const void *) Tloc(b1, 0), *v2 = (const void *)
Tloc(b2, 0);
int tp = b1->ttype;
switch (tp) {
@@ -3517,8 +3517,8 @@ BATgroupvariance_population(BAT *b, BAT
#define AGGR_COVARIANCE(TYPE) \
do { \
- const TYPE *restrict vals1 = (const TYPE *) Tloc(b1, 0);
\
- const TYPE *restrict vals2 = (const TYPE *) Tloc(b2, 0);
\
+ const TYPE *vals1 = (const TYPE *) Tloc(b1, 0); \
+ const TYPE *vals2 = (const TYPE *) Tloc(b2, 0); \
while (ncand > 0) { \
ncand--; \
i = canditer_next(&ci) - b1->hseqbase; \
@@ -3691,8 +3691,8 @@ BATgroupcovariance_population(BAT *b1, B
#define AGGR_CORRELATION(TYPE) \
do { \
- const TYPE *restrict vals1 = (const TYPE *) Tloc(b1, 0);
\
- const TYPE *restrict vals2 = (const TYPE *) Tloc(b2, 0);
\
+ const TYPE *vals1 = (const TYPE *) Tloc(b1, 0); \
+ const TYPE *vals2 = (const TYPE *) Tloc(b2, 0); \
while (ncand > 0) { \
ncand--; \
i = canditer_next(&ci) - b1->hseqbase; \
diff --git a/gdk/gdk_string.c b/gdk/gdk_string.c
--- a/gdk/gdk_string.c
+++ b/gdk/gdk_string.c
@@ -794,8 +794,8 @@ concat_strings(BAT **bnp, ValPtr pt, BAT
{
oid gid;
BUN i, p, nils = 0;
- size_t *lengths = NULL, *lastseplength = NULL, separator_length = 0,
next_length;
- str *astrings = NULL, s, sl;
+ size_t *restrict lengths = NULL, *restrict lastseplength = NULL,
separator_length = 0, next_length;
+ str *restrict astrings = NULL, s, sl;
BATiter bi, bis = (BATiter) {0};
BAT *bn = NULL;
gdk_return rres = GDK_SUCCEED;
diff --git a/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.stable.out
b/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.stable.out
--- a/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.stable.out
+++ b/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.stable.out
@@ -41,8 +41,8 @@ stdout of test 'pyloader3_01` in directo
% sys.functions, sys.functions, sys.functions, sys.functions,
sys.functions, sys.functions, sys.functions, sys.functions # table_name
% name, func, mod, language, type, side_effect, varres,
vararg # name
% varchar, varchar, varchar, int, int, boolean,
boolean, boolean # type
-% 6, 32, 6, 1, 1, 5, 5, 5 # length
-[ "myfunc", "{\n\t_emit.emit({'a':42,'d':1})\n};", "pyapi3", 6,
7, true, true, false ]
+% 6, 32, 5, 1, 1, 5, 5, 5 # length
+[ "myfunc", "{\n\t_emit.emit({'a':42,'d':1})\n};", "pyapi", 6,
7, true, true, false ]
#COPY LOADER INTO mytable FROM myfunc();
#COPY LOADER INTO mytable FROM myfunc3(46, 'asdf', 3.2);
#COPY LOADER INTO mytable FROM myfunc2(45, 'asdf');
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
