MonetDB: arrays - fixed some bugs in functions scope

[Foteini Alvanaki]

Changeset: 60c548735628 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=60c548735628
Modified Files:
        monetdb5/modules/kernel/algebra.mal
        sql/backends/monet5/Makefile.ag
        sql/backends/monet5/sql_gencode.c
Branch: arrays
Log Message:

fixed some bugs in functions scope


diffs (55 lines):

diff --git a/monetdb5/modules/kernel/algebra.mal 
b/monetdb5/modules/kernel/algebra.mal
--- a/monetdb5/modules/kernel/algebra.mal
+++ b/monetdb5/modules/kernel/algebra.mal
@@ -443,7 +443,3 @@ comment "Gives the variance of all tail 
 command variancep(b:bat[:oid,:any_2]) :dbl
 address ALGvariancep
 comment "Gives the variance of all tail values";
-
-
-include algebra_arrays;
-
diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag
+++ b/sql/backends/monet5/Makefile.ag
@@ -46,7 +46,7 @@ lib__sql = {
                sql_cast_impl_up_to_int.h \
                sql_round.c sql_round_impl.h sql_bat2time.c \
                sql_fround.c sql_fround_impl.h \
-               sql_arrays.c sql_arrays.c
+               sql_arrays.c sql_arrays.h
        LIBS = ../../server/libsqlserver \
                   ../../storage/libstore \
                   ../../storage/bat/libbatstore \
@@ -97,7 +97,7 @@ headers_mal = {
        DIR = libdir/monetdb5
        SOURCES = sql_aggr_bte.mal  sql_aggr_flt.mal sql_aggr_dbl.mal  
sql_aggr_int.mal  sql_aggr_lng.mal \
                sql_aggr_sht.mal  sql_aggr_wrd.mal  sql_decimal.mal  
sql_inspect.mal \
-               sql_rank.mal sql.mal 
+               sql_rank.mal sql.mal sql_arrays.mal 
 }
 
 headers_mal_hge = {
diff --git a/sql/backends/monet5/sql_gencode.c 
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -2651,14 +2651,17 @@ static int
                        q = newStmt1(mb, sqlRef, "get_cells");
                        if (q == NULL)
                                return -1;
-//                     setVarType(mb, getArg(q, 0), newBatType(ht, tt));
-//                     setVarUDFtype(mb, getArg(q, 0));
+                       setVarType(mb, getArg(q, 0), TYPE_ptr);
+                       setVarUDFtype(mb, getArg(q, 0));
+                       q = pushReturn(mb, q, newTmpVariable(mb, 
newBatType(TYPE_oid, TYPE_oid)));
                        q = pushArgument(mb, q, sql->mvc_var);
                        q = pushSchema(mb, q, t);
                        q = pushStr(mb, q, t->base.name);
                        if (q == NULL)
                                return -1;
                        s->nr = getDestVar(q);
+                       /* rename second result */
+                       renameVariable(mb, getArg(q, 1), "X_%d", s->nr);
                } break;
                case st_dimension: {
 #if 0
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list