Changeset: 95ac671be05c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=95ac671be05c
Modified Files:
monetdb5/modules/kernel/arrays.mal
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql_arrays.c
sql/backends/monet5/sql_arrays.h
sql/backends/monet5/sql_arrays.mal
Branch: arrays
Log Message:
cleaning unused code
diffs (152 lines):
diff --git a/monetdb5/modules/kernel/arrays.mal
b/monetdb5/modules/kernel/arrays.mal
--- a/monetdb5/modules/kernel/arrays.mal
+++ b/monetdb5/modules/kernel/arrays.mal
@@ -15,12 +15,12 @@ command algebra.leftfetchjoin(tids:bat[:
address ALGnonDimensionLeftfetchjoin2;
-command algebra.mbrsubselect(dims:ptr, dim:ptr, s:bat[:oid, :oid], c:bat[:oid,
:oid]) :bat[:oid,:oid]
-address ALGmbrsubselect;
-command algebra.mbrsubselect(dims:ptr, dim:ptr, s:bat[:oid, :oid])
:bat[:oid,:oid]
-address ALGmbrsubselect2;
-command algebra.mbrproject(b:bat[:oid,:any], s:bat[:oid, :oid], r:bat[:oid,
:oid]) :bat[:oid,:any]
-address ALGmbrproject;
+#command algebra.mbrsubselect(dims:ptr, dim:ptr, s:bat[:oid, :oid],
c:bat[:oid, :oid]) :bat[:oid,:oid]
+#address ALGmbrsubselect;
+#command algebra.mbrsubselect(dims:ptr, dim:ptr, s:bat[:oid, :oid])
:bat[:oid,:oid]
+#address ALGmbrsubselect2;
+#command algebra.mbrproject(b:bat[:oid,:any], s:bat[:oid, :oid], r:bat[:oid,
:oid]) :bat[:oid,:any]
+#address ALGmbrproject;
#subselection in dimensions
command algebra.subselect(dims:ptr, dim:ptr, low:any, high:any, li:bit,
hi:bit, anti:bit) (:ptr, :bat[:oid,:oid])
@@ -28,12 +28,12 @@ address ALGdimensionSubselect1;
command algebra.subselect(dims:ptr, dim:ptr, candDims:ptr,
candBat:bat[:oid,:oid], low:any, high:any, li:bit, hi:bit, anti:bit) (:ptr,
:bat[:oid, :oid])
address ALGdimensionSubselect2;
-#subselect on non-dimensional column of an array
-#the ptr has the mbr dimensions and the bat{;oid,:oid] the oids that really
qualify (rest of cells in mbr should be null)
-command algebra.subselect(dims:ptr, valsBat:bat[:oid,:any], low:any, high:any,
li:bit, hi:bit, anti:bit) (:ptr, :bat[:oid, :oid])
-address ALGnonDimensionSubselect1;
-command algebra.subselect(dims:ptr, valsBat:bat[:oid,:any], candDims:ptr,
candBat:bat[:oid,:oid], low:any, high:any, li:bit, hi:bit, anti:bit) (:ptr,
:bat[:oid, :oid])
-address ALGnonDimensionSubselect2;
+##subselect on non-dimensional column of an array
+##the ptr has the mbr dimensions and the bat{;oid,:oid] the oids that really
qualify (rest of cells in mbr should be null)
+#command algebra.subselect(dims:ptr, valsBat:bat[:oid,:any], low:any,
high:any, li:bit, hi:bit, anti:bit) (:ptr, :bat[:oid, :oid])
+#address ALGnonDimensionSubselect1;
+#command algebra.subselect(dims:ptr, valsBat:bat[:oid,:any], candDims:ptr,
candBat:bat[:oid,:oid], low:any, high:any, li:bit, hi:bit, anti:bit) (:ptr,
:bat[:oid, :oid])
+#address ALGnonDimensionSubselect2;
command algebra.thetasubselect(dims:ptr, dim:ptr, val:any_1, op:str) (:ptr,
:bat[:oid,:oid])
address ALGdimensionThetasubselect1;
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
@@ -1721,9 +1721,6 @@ mvc_bind(mvc *m, char *sname, char *tnam
b = store_funcs.bind_col(tr, c, access);
- if(isArray(t))
- return mvc_fill_values(c, b, t->cellsNum, NULL);
-
return b;
}
diff --git a/sql/backends/monet5/sql.h b/sql/backends/monet5/sql.h
--- a/sql/backends/monet5/sql.h
+++ b/sql/backends/monet5/sql.h
@@ -49,7 +49,6 @@
#include "sql_qc.h"
#include "sql_env.h"
#include "sql_statement.h"
-#include "sql_arrays.h"
#include "querylog.h"
diff --git a/sql/backends/monet5/sql_arrays.c b/sql/backends/monet5/sql_arrays.c
--- a/sql/backends/monet5/sql_arrays.c
+++ b/sql/backends/monet5/sql_arrays.c
@@ -2,6 +2,7 @@
#include "sql_arrays.h"
#include "sql.h"
+#if 0
//when the column belongs to an array extra values should be added in order to
//have values for all cells int he array
BAT* mvc_fill_values(sql_column *c, BAT *b_in, unsigned int cellsNum, void*
defVal) {
@@ -141,7 +142,6 @@ static BAT* mvc_create_cells_bat(mvc *m,
return mvc_fill_values(c, b, t->cellsNum, defVal);
}
-#if 0
static BAT*
mvc_create_dimension_bat(mvc *m, char *sname, char *tname, char *dname) {
BAT *b = NULL;
@@ -231,9 +231,7 @@ mvc_create_dimension_bat(mvc *m, char *s
return b;
}
-#endif
-#if 0
static BAT* mvc_subselect_dimension_bat(mvc *m, char* sname, char* tname,
char* dname, bat* cand, void* low, void* high, bit li, bit hi, bit anti) {
BAT *b = NULL, *candBAT, *b_tmp;
sql_schema *s = NULL;
@@ -417,7 +415,6 @@ fprintf(stderr, "Final element: %ld\n",
return b;
}
-#endif
str mvc_create_cells_bat_wrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci) {
BAT *b = NULL;
@@ -448,7 +445,6 @@ str mvc_create_cells_bat_wrap(Client cnt
throw(SQL, "sql.create_cells", "unable to find %s(%s)", *tname, *cname);
}
-#if 0
str mvc_get_cells(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci) {
ptr *res = getArgReference_ptr(stk, pci, 0);
BAT *oidsBAT = NULL; //at this point it is empty. It is just initialised
@@ -566,8 +562,8 @@ static ptr get_dims2(ptr* dim_res, sql_t
}
str mvc_bind_array_dimension(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci) {
- ptr* dims_res = getArgReference_ptr(stk, pci, 0);
- ptr* dim_res = getArgReference_ptr(stk, pci, 1);
+ ptr* dim_res = getArgReference_ptr(stk, pci, 0);
+ ptr* dims_res = getArgReference_ptr(stk, pci, 1);
mvc *m = NULL;
str msg;
sql_schema *s = NULL;
diff --git a/sql/backends/monet5/sql_arrays.h b/sql/backends/monet5/sql_arrays.h
--- a/sql/backends/monet5/sql_arrays.h
+++ b/sql/backends/monet5/sql_arrays.h
@@ -27,12 +27,12 @@ sql5_export str mvc_bind_array_column(Cl
sql5_export str mvc_bind_array_dimension(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci);
//sql5_export str mvc_get_cells(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-sql5_export str mvc_dimension_subselect_with_cand_bat_wrap(Client cntxt,
MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+//sql5_export str mvc_dimension_subselect_with_cand_bat_wrap(Client cntxt,
MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
//sql5_export str mvc_dimension_subselect_bat_wrap(Client cntxt, MalBlkPtr mb,
MalStkPtr stk, InstrPtr pci);
//sql5_export str mvc_create_dimension_bat_wrap(Client cntxt, MalBlkPtr mb,
MalStkPtr stk, InstrPtr pci);
//sql5_export str materialiseDimension(bat* res, bat* in);
-sql5_export str mvc_create_cells_bat_wrap(Client cntxt, MalBlkPtr mb,
MalStkPtr stk, InstrPtr pci);
+//sql5_export str mvc_create_cells_bat_wrap(Client cntxt, MalBlkPtr mb,
MalStkPtr stk, InstrPtr pci);
-BAT* mvc_fill_values(sql_column *c, BAT *b_in, unsigned int cellsNum, void*
defVal);
+//BAT* mvc_fill_values(sql_column *c, BAT *b_in, unsigned int cellsNum, void*
defVal);
#endif /* _SQL_ARRAYS_H */
diff --git a/sql/backends/monet5/sql_arrays.mal
b/sql/backends/monet5/sql_arrays.mal
--- a/sql/backends/monet5/sql_arrays.mal
+++ b/sql/backends/monet5/sql_arrays.mal
@@ -9,7 +9,7 @@
pattern sql.bind_array_dimension(mvc:int, schema:str, array:str,
dimension:str) (:ptr, :ptr)
address mvc_bind_array_dimension
-comment "Get the order of the dimension in the array (starting from 1) and a
pointer to all dimensions";
+comment "Get a pointer to the dimension and a pointer to the array (a
structure having the size of all the dimensions)"
pattern sql.bind_array_column(mvc:int, schema:str, array:str, column:str)
(:bat[:oid,:any], :ptr)
address mvc_bind_array_column
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
