Changeset: c7c2515899de for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c7c2515899de
Modified Files:
sql/backends/monet5/vaults/fits/fits.c
sql/backends/monet5/vaults/shp/shp.c
Branch: default
Log Message:
They should not ignore the access control checks.
diffs (94 lines):
diff --git a/sql/backends/monet5/vaults/fits/fits.c
b/sql/backends/monet5/vaults/fits/fits.c
--- a/sql/backends/monet5/vaults/fits/fits.c
+++ b/sql/backends/monet5/vaults/fits/fits.c
@@ -1026,7 +1026,7 @@ str FITSloadTable(Client cntxt, MalBlkPt
fits_read_col(fptr, tpcode[j - 1], j, i + 1, 1,
rep[j - 1], (void *)nilptr,
(void *)v[i]->data, &anynull,
&status);
v[i]->nitems = nbytes;
- if (BUNappend(tmp, v[i], true) != GDK_SUCCEED) {
+ if (BUNappend(tmp, v[i], false) != GDK_SUCCEED)
{
BBPreclaim(tmp);
msg = createException(MAL,
"fits.loadtable", SQLSTATE(HY001) MAL_MALLOC_FAIL);
GDKfree(tpcode);
@@ -1061,7 +1061,7 @@ str FITSloadTable(Client cntxt, MalBlkPt
tloadtm += GDKms() - tm0;
tm0 = GDKms();
for(k = 0; k < batch ; k++)
- if (BUNappend(tmp, v[k], true) !=
GDK_SUCCEED) {
+ if (BUNappend(tmp, v[k], false) !=
GDK_SUCCEED) {
BBPreclaim(tmp);
msg = createException(MAL,
"fits.loadtable", SQLSTATE(HY001) MAL_MALLOC_FAIL);
goto bailout;
diff --git a/sql/backends/monet5/vaults/shp/shp.c
b/sql/backends/monet5/vaults/shp/shp.c
--- a/sql/backends/monet5/vaults/shp/shp.c
+++ b/sql/backends/monet5/vaults/shp/shp.c
@@ -503,19 +503,19 @@ SHPimportFile(Client cntxt, MalBlkPtr mb
hFieldDefn = OGR_FD_GetFieldDefn( featureDefn, i );
if( OGR_Fld_GetType(hFieldDefn) == OFTInteger ) {
int val = OGR_F_GetFieldAsInteger(feature, i);
- rc = BUNappend(colsBAT[i], &val, true);
+ rc = BUNappend(colsBAT[i], &val, false);
} else if( OGR_Fld_GetType(hFieldDefn) == OFTReal ) {
double val = OGR_F_GetFieldAsDouble(feature, i);
- rc = BUNappend(colsBAT[i], &val, true);
+ rc = BUNappend(colsBAT[i], &val, false);
} else {
- rc = BUNappend(colsBAT[i],
OGR_F_GetFieldAsString(feature, i), true);
+ rc = BUNappend(colsBAT[i],
OGR_F_GetFieldAsString(feature, i), false);
}
if (rc != GDK_SUCCEED) {
msg = createException(MAL, "shp.import",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
goto unfree4;
}
}
- if (BUNappend(colsBAT[colsNum - 2], &gidTemp, true) !=
GDK_SUCCEED) {
+ if (BUNappend(colsBAT[colsNum - 2], &gidTemp, false) !=
GDK_SUCCEED) {
msg = createException(MAL, "shp.import",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
goto unfree4;
}
@@ -529,7 +529,7 @@ SHPimportFile(Client cntxt, MalBlkPtr mb
geomWKB->len = len;
geomWKB->srid = 0; //FIXME: Add the real srid
OGR_G_ExportToWkb(geometry, wkbNDR, (unsigned char
*)geomWKB->data);
- rc = BUNappend(colsBAT[colsNum - 1], geomWKB, true);
+ rc = BUNappend(colsBAT[colsNum - 1], geomWKB, false);
GDKfree(geomWKB);
OGR_F_Destroy(feature);
if (rc != GDK_SUCCEED)
@@ -730,14 +730,14 @@ SHPpartialimport(Client cntxt, MalBlkPtr
hFieldDefn = OGR_FD_GetFieldDefn( featureDefn, i );
if( OGR_Fld_GetType(hFieldDefn) == OFTInteger ) {
int val = OGR_F_GetFieldAsInteger(feature, i);
- rc = BUNappend(colsBAT[i], &val, true);
+ rc = BUNappend(colsBAT[i], &val, false);
} else if( OGR_Fld_GetType(hFieldDefn) == OFTReal ) {
double val = OGR_F_GetFieldAsDouble(feature, i);
- rc = BUNappend(colsBAT[i], &val, true);
+ rc = BUNappend(colsBAT[i], &val, false);
} else if( OGR_Fld_GetType(hFieldDefn) == OFTString ) {
- rc = BUNappend(colsBAT[i],
OGR_F_GetFieldAsString(feature, i), true);
+ rc = BUNappend(colsBAT[i],
OGR_F_GetFieldAsString(feature, i), false);
} else {
- rc = BUNappend(colsBAT[i],
OGR_F_GetFieldAsString(feature, i), true);
+ rc = BUNappend(colsBAT[i],
OGR_F_GetFieldAsString(feature, i), false);
}
if (rc != GDK_SUCCEED) {
msg = createException(MAL, "shp.import",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
@@ -745,7 +745,7 @@ SHPpartialimport(Client cntxt, MalBlkPtr
}
}
- if (BUNappend(colsBAT[colsNum - 2], &gidTemp, true) !=
GDK_SUCCEED) {
+ if (BUNappend(colsBAT[colsNum - 2], &gidTemp, false) !=
GDK_SUCCEED) {
msg = createException(MAL, "shp.import",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
goto bailout;
}
@@ -756,7 +756,7 @@ SHPpartialimport(Client cntxt, MalBlkPtr
geomWKB->len = len;
geomWKB->srid = 0; //TODO: Add the real srid
OGR_G_ExportToWkb(geometry, wkbNDR, (unsigned char
*)geomWKB->data);
- if (BUNappend(colsBAT[colsNum - 1], geomWKB, true) !=
GDK_SUCCEED) {
+ if (BUNappend(colsBAT[colsNum - 1], geomWKB, false) !=
GDK_SUCCEED) {
msg = createException(MAL, "shp.import",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
goto bailout;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
