Changeset: a0a05cdbb1bd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a0a05cdbb1bd
Modified Files:
sql/scripts/29_array.sql
sql/server/rel_select.c
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
Branch: sciql
Log Message:
support tiling also on 3-dim arrays
diffs (truncated from 373 to 300 lines):
diff --git a/sql/scripts/29_array.sql b/sql/scripts/29_array.sql
--- a/sql/scripts/29_array.sql
+++ b/sql/scripts/29_array.sql
@@ -86,3 +86,17 @@ create function array_sum(val bigint,
create function array_sum(val real, dim1 int, offsets1 int, size1 int,
dim2 int, offsets2 int, size2 int) returns double external name "array".sum;
create function array_sum(val double, dim1 int, offsets1 int, size1 int,
dim2 int, offsets2 int, size2 int) returns double external name "array".sum;
+create function array_avg(val tinyint, dim1 int, offsets1 int, size1 int,
dim2 int, offsets2 int, size2 int, dim3 int, offsets3 int, size3 int) returns
double external name "array".avg;
+create function array_avg(val smallint, dim1 int, offsets1 int, size1 int,
dim2 int, offsets2 int, size2 int, dim3 int, offsets3 int, size3 int) returns
double external name "array".avg;
+create function array_avg(val int, dim1 int, offsets1 int, size1 int,
dim2 int, offsets2 int, size2 int, dim3 int, offsets3 int, size3 int) returns
double external name "array".avg;
+create function array_avg(val bigint, dim1 int, offsets1 int, size1 int,
dim2 int, offsets2 int, size2 int, dim3 int, offsets3 int, size3 int) returns
double external name "array".avg;
+create function array_avg(val real, dim1 int, offsets1 int, size1 int,
dim2 int, offsets2 int, size2 int, dim3 int, offsets3 int, size3 int) returns
double external name "array".avg;
+create function array_avg(val double, dim1 int, offsets1 int, size1 int,
dim2 int, offsets2 int, size2 int, dim3 int, offsets3 int, size3 int) returns
double external name "array".avg;
+
+create function array_sum(val tinyint, dim1 int, offsets1 int, size1 int,
dim2 int, offsets2 int, size2 int, dim3 int, offsets3 int, size3 int) returns
bigint external name "array".sum;
+create function array_sum(val smallint, dim1 int, offsets1 int, size1 int,
dim2 int, offsets2 int, size2 int, dim3 int, offsets3 int, size3 int) returns
bigint external name "array".sum;
+create function array_sum(val int, dim1 int, offsets1 int, size1 int,
dim2 int, offsets2 int, size2 int, dim3 int, offsets3 int, size3 int) returns
bigint external name "array".sum;
+create function array_sum(val bigint, dim1 int, offsets1 int, size1 int,
dim2 int, offsets2 int, size2 int, dim3 int, offsets3 int, size3 int) returns
bigint external name "array".sum;
+create function array_sum(val real, dim1 int, offsets1 int, size1 int,
dim2 int, offsets2 int, size2 int, dim3 int, offsets3 int, size3 int) returns
double external name "array".sum;
+create function array_sum(val double, dim1 int, offsets1 int, size1 int,
dim2 int, offsets2 int, size2 int, dim3 int, offsets3 int, size3 int) returns
double external name "array".sum;
+
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -1866,7 +1866,7 @@ check_tiling_dimension(mvc *sql, char *d
return 1;
}
-#define ARRAY_TILING_MAX_DIMS 2
+#define ARRAY_TILING_MAX_DIMS 3
static list *
rel_arraytiling(mvc *sql, sql_rel **rel, symbol *tile_def, int f)
diff --git a/sql/test/leaks/Tests/check0.stable.out
b/sql/test/leaks/Tests/check0.stable.out
--- a/sql/test/leaks/Tests/check0.stable.out
+++ b/sql/test/leaks/Tests/check0.stable.out
@@ -51,28 +51,28 @@ Ready.
[ "int", "int", 16 ]
[ "int", "lng", 2 ]
[ "int", "str", 149 ]
-[ "oid", "bit", 1203 ]
-[ "oid", "bit", 1203 ]
+[ "oid", "bit", 1215 ]
+[ "oid", "bit", 1215 ]
[ "oid", "int", 19 ]
[ "oid", "int", 19 ]
-[ "oid", "int", 1203 ]
-[ "oid", "int", 1203 ]
-[ "oid", "int", 1203 ]
-[ "oid", "int", 1203 ]
-[ "oid", "int", 3439 ]
-[ "oid", "int", 3439 ]
-[ "oid", "int", 3439 ]
-[ "oid", "int", 3439 ]
-[ "oid", "int", 3439 ]
+[ "oid", "int", 1215 ]
+[ "oid", "int", 1215 ]
+[ "oid", "int", 1215 ]
+[ "oid", "int", 1215 ]
+[ "oid", "int", 3571 ]
+[ "oid", "int", 3571 ]
+[ "oid", "int", 3571 ]
+[ "oid", "int", 3571 ]
+[ "oid", "int", 3571 ]
[ "oid", "lng", 19 ]
[ "oid", "str", 1 ]
[ "oid", "str", 1 ]
[ "oid", "str", 19 ]
-[ "oid", "str", 1203 ]
-[ "oid", "str", 1203 ]
-[ "oid", "str", 1203 ]
-[ "oid", "str", 3439 ]
-[ "oid", "str", 3439 ]
+[ "oid", "str", 1215 ]
+[ "oid", "str", 1215 ]
+[ "oid", "str", 1215 ]
+[ "oid", "str", 3571 ]
+[ "oid", "str", 3571 ]
#select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
% .L1, .bbp # table_name
% L1, L2 # name
diff --git a/sql/test/leaks/Tests/check1.stable.out
b/sql/test/leaks/Tests/check1.stable.out
--- a/sql/test/leaks/Tests/check1.stable.out
+++ b/sql/test/leaks/Tests/check1.stable.out
@@ -36,8 +36,8 @@ Ready.
[ "oid", "bit", 87 ]
[ "oid", "bit", 87 ]
[ "oid", "bit", 379 ]
-[ "oid", "bit", 1203 ]
-[ "oid", "bit", 1203 ]
+[ "oid", "bit", 1215 ]
+[ "oid", "bit", 1215 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -86,15 +86,15 @@ Ready.
[ "oid", "int", 379 ]
[ "oid", "int", 379 ]
[ "oid", "int", 379 ]
-[ "oid", "int", 1203 ]
-[ "oid", "int", 1203 ]
-[ "oid", "int", 1203 ]
-[ "oid", "int", 1203 ]
-[ "oid", "int", 3439 ]
-[ "oid", "int", 3439 ]
-[ "oid", "int", 3439 ]
-[ "oid", "int", 3439 ]
-[ "oid", "int", 3439 ]
+[ "oid", "int", 1215 ]
+[ "oid", "int", 1215 ]
+[ "oid", "int", 1215 ]
+[ "oid", "int", 1215 ]
+[ "oid", "int", 3571 ]
+[ "oid", "int", 3571 ]
+[ "oid", "int", 3571 ]
+[ "oid", "int", 3571 ]
+[ "oid", "int", 3571 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -173,11 +173,11 @@ Ready.
[ "oid", "str", 379 ]
[ "oid", "str", 379 ]
[ "oid", "str", 379 ]
-[ "oid", "str", 1203 ]
-[ "oid", "str", 1203 ]
-[ "oid", "str", 1203 ]
-[ "oid", "str", 3439 ]
-[ "oid", "str", 3439 ]
+[ "oid", "str", 1215 ]
+[ "oid", "str", 1215 ]
+[ "oid", "str", 1215 ]
+[ "oid", "str", 3571 ]
+[ "oid", "str", 3571 ]
[ "oid", "timestamp", 0 ]
[ "oid", "timestamp", 0 ]
[ "oid", "wrd", 0 ]
diff --git a/sql/test/leaks/Tests/check2.stable.out
b/sql/test/leaks/Tests/check2.stable.out
--- a/sql/test/leaks/Tests/check2.stable.out
+++ b/sql/test/leaks/Tests/check2.stable.out
@@ -36,8 +36,8 @@ Ready.
[ "oid", "bit", 87 ]
[ "oid", "bit", 87 ]
[ "oid", "bit", 379 ]
-[ "oid", "bit", 1203 ]
-[ "oid", "bit", 1203 ]
+[ "oid", "bit", 1215 ]
+[ "oid", "bit", 1215 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -86,15 +86,15 @@ Ready.
[ "oid", "int", 379 ]
[ "oid", "int", 379 ]
[ "oid", "int", 379 ]
-[ "oid", "int", 1203 ]
-[ "oid", "int", 1203 ]
-[ "oid", "int", 1203 ]
-[ "oid", "int", 1203 ]
-[ "oid", "int", 3439 ]
-[ "oid", "int", 3439 ]
-[ "oid", "int", 3439 ]
-[ "oid", "int", 3439 ]
-[ "oid", "int", 3439 ]
+[ "oid", "int", 1215 ]
+[ "oid", "int", 1215 ]
+[ "oid", "int", 1215 ]
+[ "oid", "int", 1215 ]
+[ "oid", "int", 3571 ]
+[ "oid", "int", 3571 ]
+[ "oid", "int", 3571 ]
+[ "oid", "int", 3571 ]
+[ "oid", "int", 3571 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -173,11 +173,11 @@ Ready.
[ "oid", "str", 379 ]
[ "oid", "str", 379 ]
[ "oid", "str", 379 ]
-[ "oid", "str", 1203 ]
-[ "oid", "str", 1203 ]
-[ "oid", "str", 1203 ]
-[ "oid", "str", 3439 ]
-[ "oid", "str", 3439 ]
+[ "oid", "str", 1215 ]
+[ "oid", "str", 1215 ]
+[ "oid", "str", 1215 ]
+[ "oid", "str", 3571 ]
+[ "oid", "str", 3571 ]
[ "oid", "timestamp", 0 ]
[ "oid", "timestamp", 0 ]
[ "oid", "wrd", 0 ]
diff --git a/sql/test/leaks/Tests/check3.stable.out
b/sql/test/leaks/Tests/check3.stable.out
--- a/sql/test/leaks/Tests/check3.stable.out
+++ b/sql/test/leaks/Tests/check3.stable.out
@@ -36,8 +36,8 @@ Ready.
[ "oid", "bit", 88 ]
[ "oid", "bit", 88 ]
[ "oid", "bit", 381 ]
-[ "oid", "bit", 1203 ]
-[ "oid", "bit", 1203 ]
+[ "oid", "bit", 1215 ]
+[ "oid", "bit", 1215 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -86,15 +86,15 @@ Ready.
[ "oid", "int", 381 ]
[ "oid", "int", 381 ]
[ "oid", "int", 381 ]
-[ "oid", "int", 1203 ]
-[ "oid", "int", 1203 ]
-[ "oid", "int", 1203 ]
-[ "oid", "int", 1203 ]
-[ "oid", "int", 3439 ]
-[ "oid", "int", 3439 ]
-[ "oid", "int", 3439 ]
-[ "oid", "int", 3439 ]
-[ "oid", "int", 3439 ]
+[ "oid", "int", 1215 ]
+[ "oid", "int", 1215 ]
+[ "oid", "int", 1215 ]
+[ "oid", "int", 1215 ]
+[ "oid", "int", 3571 ]
+[ "oid", "int", 3571 ]
+[ "oid", "int", 3571 ]
+[ "oid", "int", 3571 ]
+[ "oid", "int", 3571 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -173,11 +173,11 @@ Ready.
[ "oid", "str", 381 ]
[ "oid", "str", 381 ]
[ "oid", "str", 381 ]
-[ "oid", "str", 1203 ]
-[ "oid", "str", 1203 ]
-[ "oid", "str", 1203 ]
-[ "oid", "str", 3439 ]
-[ "oid", "str", 3439 ]
+[ "oid", "str", 1215 ]
+[ "oid", "str", 1215 ]
+[ "oid", "str", 1215 ]
+[ "oid", "str", 3571 ]
+[ "oid", "str", 3571 ]
[ "oid", "timestamp", 0 ]
[ "oid", "timestamp", 0 ]
[ "oid", "wrd", 0 ]
diff --git a/sql/test/leaks/Tests/check4.stable.out
b/sql/test/leaks/Tests/check4.stable.out
--- a/sql/test/leaks/Tests/check4.stable.out
+++ b/sql/test/leaks/Tests/check4.stable.out
@@ -36,8 +36,8 @@ Ready.
[ "oid", "bit", 89 ]
[ "oid", "bit", 89 ]
[ "oid", "bit", 383 ]
-[ "oid", "bit", 1203 ]
-[ "oid", "bit", 1203 ]
+[ "oid", "bit", 1215 ]
+[ "oid", "bit", 1215 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -86,15 +86,15 @@ Ready.
[ "oid", "int", 383 ]
[ "oid", "int", 383 ]
[ "oid", "int", 383 ]
-[ "oid", "int", 1203 ]
-[ "oid", "int", 1203 ]
-[ "oid", "int", 1203 ]
-[ "oid", "int", 1203 ]
-[ "oid", "int", 3439 ]
-[ "oid", "int", 3439 ]
-[ "oid", "int", 3439 ]
-[ "oid", "int", 3439 ]
-[ "oid", "int", 3439 ]
+[ "oid", "int", 1215 ]
+[ "oid", "int", 1215 ]
+[ "oid", "int", 1215 ]
+[ "oid", "int", 1215 ]
+[ "oid", "int", 3571 ]
+[ "oid", "int", 3571 ]
+[ "oid", "int", 3571 ]
+[ "oid", "int", 3571 ]
+[ "oid", "int", 3571 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -173,11 +173,11 @@ Ready.
[ "oid", "str", 383 ]
[ "oid", "str", 383 ]
[ "oid", "str", 383 ]
-[ "oid", "str", 1203 ]
-[ "oid", "str", 1203 ]
-[ "oid", "str", 1203 ]
-[ "oid", "str", 3439 ]
-[ "oid", "str", 3439 ]
+[ "oid", "str", 1215 ]
+[ "oid", "str", 1215 ]
+[ "oid", "str", 1215 ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
