Changeset: 1e6bb8746dd4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1e6bb8746dd4
Modified Files:
monetdb5/modules/mal/array.mx
sql/backends/monet5/vaults/gdal/gdal.c
sql/backends/monet5/vaults/geotiff/geotiff.c
Branch: SciQL-2
Log Message:
BAT IDs are of type "bat", not of type "int"
diffs (130 lines):
diff --git a/monetdb5/modules/mal/array.mx b/monetdb5/modules/mal/array.mx
--- a/monetdb5/modules/mal/array.mx
+++ b/monetdb5/modules/mal/array.mx
@@ -181,7 +181,7 @@ array_export str ARRAYtiles_max_@1_@2(Cl
array_export str ARRAYtiles_cnt_@1_@2(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci);
@
@= array_defs
-array_export str ARRAYseries_@1(int *ret, @1 *start, @1 *step, @1 *stop, int
*grp, int *series);
+array_export str ARRAYseries_@1(bat *ret, @1 *start, @1 *step, @1 *stop, int
*grp, int *series);
@:array_defs_DimType(@1,bte)@
@:array_defs_DimType(@1,sht)@
@:array_defs_DimType(@1,int)@
@@ -213,7 +213,7 @@ array_export str ARRAYseries_@1(int *ret
#include "mal_interpreter.h"
@= dim_wrapper_impl
str
-ARRAYseries_@1(int *ret, @1 *start, @1 *step, @1 *stop, int *group, int
*series)
+ARRAYseries_@1(bat *ret, @1 *start, @1 *step, @1 *stop, int *group, int
*series)
{
BAT *bn;
@1 i, *o;
@@ -265,7 +265,7 @@ ARRAYseries_@1(int *ret, @1 *start, @1 *
if (!(bn->batDirty&2)) bn = BATsetaccess(bn, BAT_READ); \
*ret = bn->batCacheid;
- BBPkeepref((int)*ret);
+ BBPkeepref(*ret);
return MAL_SUCCEED;
}
@@ -283,8 +283,8 @@ ARRAYfiller_bat(Client cntxt, MalBlkPtr
BAT *bn, *b;
BUN p, q;
BATiter bi;
- int *ret = (int*) getArgReference(stk,pci,0);
- int bid = *(int*) getArgReference(stk,pci,1);
+ bat *ret = (bat*) getArgReference(stk,pci,0);
+ bat bid = *(bat*) getArgReference(stk,pci,1);
void *val = (void*) getArgReference(stk,pci,2);
int type = getArgType(mb,pci,2);
@@ -359,7 +359,7 @@ ARRAYfiller_bat(Client cntxt, MalBlkPtr
str
ARRAYslice(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
- int *ret = (int*) getArgReference(stk,pci,0);
+ bat *ret = (bat*) getArgReference(stk,pci,0);
lng *dim_strt = NULL, *dim_step = NULL, *dim_stop = NULL, *dim_size =
NULL, *dim_rept = NULL,
*slc_strt = NULL, *slc_step = NULL, *slc_stop = NULL, *slc_size
= NULL, *slc_rept = NULL, *slc_indx = NULL;
int i = 0, j = 0, valence = (pci->argc - pci->retc) / 6;
@@ -478,7 +478,7 @@ str
ARRAYfiller(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
BAT *bn;
- int *ret = (int*) getArgReference(stk,pci,0);
+ bat *ret = (bat*) getArgReference(stk,pci,0);
oid i = 0;
lng cnt = *(lng *) getArgReference(stk,pci,1);
void *val = (void*) getArgReference(stk,pci,2);
@@ -562,7 +562,7 @@ str
ARRAYtiles_@4_@1_@8(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
BAT *bVal = NULL, *bRes = NULL, **bDims = NULL, **bOffsets = NULL;
- int *ret = (int*) getArgReference(stk,pci,0), i = 0, ndims = 0;
+ bat *ret = (bat*) getArgReference(stk,pci,0), i = 0, ndims = 0;
bit nils = FALSE;
@1 *bValT = NULL;
@3 *bResT = NULL;
@@ -589,14 +589,14 @@ ARRAYtiles_@4_@1_@8(Client cntxt, MalBlk
AGGR_CLEANUP();
throw(MAL, "array.@4", MAL_MALLOC_FAIL);
}
- if (!(bVal = BATdescriptor(*(int*)getArgReference(stk,pci,1)))) {
+ if (!(bVal = BATdescriptor(*(bat*)getArgReference(stk,pci,1)))) {
AGGR_CLEANUP();
throw(MAL, "array.@4", RUNTIME_OBJECT_MISSING);
}
arrsze = 1;
for (i = 0; i < ndims; i++) {
- bDims[i] = BATdescriptor(*(int*)getArgReference(stk,pci,2+i*3));
- bOffsets[i] =
BATdescriptor(*(int*)getArgReference(stk,pci,2+i*3+1));
+ bDims[i] = BATdescriptor(*(bat*)getArgReference(stk,pci,2+i*3));
+ bOffsets[i] =
BATdescriptor(*(bat*)getArgReference(stk,pci,2+i*3+1));
if (!bDims[i] || !bOffsets[i]) {
AGGR_CLEANUP();
throw(MAL, "array.@4", RUNTIME_OBJECT_MISSING);
diff --git a/sql/backends/monet5/vaults/gdal/gdal.c
b/sql/backends/monet5/vaults/gdal/gdal.c
--- a/sql/backends/monet5/vaults/gdal/gdal.c
+++ b/sql/backends/monet5/vaults/gdal/gdal.c
@@ -133,7 +133,7 @@ finish:
}
static str
-ARRAYseries(int *bid, bte start, bte step, int stop, int group, int series)
+ARRAYseries(bat *bid, bte start, bte step, int stop, int group, int series)
{
if (stop <= (int) GDK_bte_max && group <= (int) GDK_bte_max && series
<= (int) GDK_bte_max) {
bte sta = (bte) start, ste = (bte) step, sto = (bte) stop;
@@ -153,7 +153,8 @@ GDALloadGreyscaleImage(bat *x, bat *y, b
{
GDALDatasetH hDataset;
GDALRasterBandH hBand;
- int bidx = 0, bidy = 0, wid = 0, len = 0;
+ bat bidx = 0, bidy = 0;
+ int wid = 0, len = 0;
BUN pixels = BUN_NONE;
sht bps;
int i, j;
diff --git a/sql/backends/monet5/vaults/geotiff/geotiff.c
b/sql/backends/monet5/vaults/geotiff/geotiff.c
--- a/sql/backends/monet5/vaults/geotiff/geotiff.c
+++ b/sql/backends/monet5/vaults/geotiff/geotiff.c
@@ -142,7 +142,7 @@ finish:
}
static str
-ARRAYseries(int *bid, bte start, bte step, int stop, int group, int series)
+ARRAYseries(bat *bid, bte start, bte step, int stop, int group, int series)
{
if (stop <= (int) GDK_bte_max && group <= (int) GDK_bte_max && series
<= (int) GDK_bte_max) {
bte sta = (bte) start, ste = (bte) step, sto = (bte) stop;
@@ -161,7 +161,8 @@ str
GTIFFloadGreyscaleImage(bat *x, bat *y, bat *intensity, str *fname)
{
TIFF *tif = (TIFF*)0;
- int bidx = 0, bidy = 0, wid = 0, len = 0;
+ bat bidx = 0, bidy = 0;
+ int wid = 0, len = 0;
BUN pixels = BUN_NONE;
sht photoint, bps;
tsize_t i, j;
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
