Changeset: fe730355a617 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/fe730355a617
Modified Files:
sql/backends/monet5/copy.c
sql/backends/monet5/rel_physical.c
sql/backends/monet5/vaults/parquet/parquet.c
sql/backends/monet5/vaults/parquet/pqc_filemetadata.c
sql/backends/monet5/vaults/parquet/pqc_reader.c
Branch: pp_hashjoin
Log Message:
more win32 compilation fixes
diffs (194 lines):
diff --git a/sql/backends/monet5/copy.c b/sql/backends/monet5/copy.c
--- a/sql/backends/monet5/copy.c
+++ b/sql/backends/monet5/copy.c
@@ -575,7 +575,7 @@ COPYsplitlines(Client cntxt, MalBlkPtr m
/* TODO: handle skipping with jumping */
if (!r->error && !r->done && r->offset) {
lng skipped = COPYskiplines(r, p->wid);
- r->offset -= skipped;
+ r->offset -= (BUN)skipped;
//r->linecount += skipped; ??
}
@@ -598,7 +598,7 @@ COPYsplitlines(Client cntxt, MalBlkPtr m
r->linecount += line_count;
state.end = state.start + e;
r->bs->pos[p->wid] = e;
- r->maxcount -= line_count;
+ r->maxcount -= (BUN)line_count;
if (r->maxcount == 0)
r->done = 1;
}
@@ -611,7 +611,7 @@ COPYsplitlines(Client cntxt, MalBlkPtr m
if (r->best_effort) {
errors.rows = BATdescriptor(errors.rows_batid);
errors.rows->tseqbase = 0;
- BATsetcount(errors.rows, line_count);
+ BATsetcount(errors.rows, (BUN)line_count);
}
if (r->bs->eof)
@@ -628,7 +628,7 @@ COPYsplitlines(Client cntxt, MalBlkPtr m
bailout("copy.splitlines", SQLSTATE(HY013) MAL_MALLOC_FAIL);
for (int i = 0; i < ncols; i++) {
- BAT *b = COLnew(0, TYPE_int, line_count, TRANSIENT);
+ BAT *b = COLnew(0, TYPE_int, (BUN)line_count, TRANSIENT);
if (b == NULL)
bailout("copy.splitlines", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
return_bats[i] = b;
@@ -652,7 +652,7 @@ end:
BAT *b = return_bats[i];
bat id = b->batCacheid;
if (msg == MAL_SUCCEED) {
- BATsetcount(b, line_count);
+ BATsetcount(b, (BUN)line_count);
b->tkey = false;
b->tnil = false;
b->tnonil = false;
@@ -698,9 +698,9 @@ COPYnew(Client cntxt, MalBlkPtr mb, MalS
str msg = MAL_SUCCEED;
bat *res = getArgReference_bat(stk, pci, 0);
stream *s = *(stream**)getArgReference(stk, pci, pci->retc);
- BUN offset = *getArgReference_lng(stk, pci, pci->retc + 1);
- BUN maxcount = *getArgReference_lng(stk, pci, pci->retc + 2);
- BUN sz = *getArgReference_lng(stk, pci, pci->retc + 3);
+ BUN offset = (BUN)*getArgReference_lng(stk, pci, pci->retc + 1); /* why
pass lng, if used as BUN ? */
+ BUN maxcount = (BUN)*getArgReference_lng(stk, pci, pci->retc + 2);
+ BUN sz = (BUN)*getArgReference_lng(stk, pci, pci->retc + 3);
str col_sep_str = *getArgReference_str(stk, pci, pci->retc + 4);
str line_sep_str = *getArgReference_str(stk, pci, pci->retc + 5);
str quote_str = *getArgReference_str(stk, pci, pci->retc + 6);
diff --git a/sql/backends/monet5/rel_physical.c
b/sql/backends/monet5/rel_physical.c
--- a/sql/backends/monet5/rel_physical.c
+++ b/sql/backends/monet5/rel_physical.c
@@ -49,11 +49,11 @@ rel_getcount(mvc *sql, sql_rel *rel)
return 1; /* Global GROUP BY always returns 1 row. */
case op_munion:
if (rel->l) {
- BUN cnt = 0;
+ lng cnt = 0;
list *l = rel->l;
for (node *n = l->h; n; n = n->next) {
- BUN ncnt = rel_getcount(sql, n->data);
- if (ncnt != BUN_NONE)
+ lng ncnt = rel_getcount(sql, n->data);
+ if ((BUN)ncnt != BUN_NONE)
cnt += ncnt;
}
return cnt;
diff --git a/sql/backends/monet5/vaults/parquet/parquet.c
b/sql/backends/monet5/vaults/parquet/parquet.c
--- a/sql/backends/monet5/vaults/parquet/parquet.c
+++ b/sql/backends/monet5/vaults/parquet/parquet.c
@@ -603,9 +603,9 @@ pqcmc_create(glob_t *glob, lng nrows)
static str
PARQUETread_large(BAT **R, pqc_creader *r, int colno, Pipeline *p, int wnr)
{
- ssize_t sz = FILE_READER_VECTORSIZE;
+ uint64_t sz = FILE_READER_VECTORSIZE;
- if (r->nrows < sz)
+ if (r->nrows < (int64_t)sz)
sz = r->nrows;
if (!r->c) {
@@ -655,7 +655,7 @@ PARQUETread_large(BAT **R, pqc_creader *
dict = 8;
}
/* prepare heap */
- rb = COLnew2(0, localtype, sz, TRANSIENT, dict);
+ rb = COLnew2(0, localtype, (BUN)sz, TRANSIENT, dict);
if (!rb) {
throw(SQL, "parquet.read", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
}
@@ -681,7 +681,7 @@ PARQUETread_large(BAT **R, pqc_creader *
size_t offset = 0;
if (dict >= 4 && is_string)
offset = h->free;
- ssize_t rsz = 0, tsz = 0;
+ uint64_t rsz = 0, tsz = 0;
if ((rsz = pqc_read_chunk(r->c[pse->ccnr], wnr,
rb->theap->base, ((char*)h->base)+h->free, sz, &offset, &dict)) < 0) {
BBPreclaim(rb);
const char *err = pqc_get_error(r->c[pse->ccnr]);
@@ -708,7 +708,7 @@ PARQUETread_large(BAT **R, pqc_creader *
if (rb->twidth < SIZEOF_VAR_T &&
(rb->twidth <= 2 ? _d -
GDK_VAROFFSET : _d) >= ((size_t) 1 << (8 << rb->tshift))) {
/* doesn't fit in current heap, upgrade
it */
- if (GDKupgradevarheap(rb, _d, 0, tsz)
!= GDK_SUCCEED) {
+ if (GDKupgradevarheap(rb, _d, 0,
(BUN)tsz) != GDK_SUCCEED) {
BBPreclaim(rb);
throw(SQL, "parquet.read",
SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
@@ -738,11 +738,11 @@ PARQUETread_large(BAT **R, pqc_creader *
}
sz = tsz;
} else { /* fixed sized */
- rb = COLnew(0, localtype, sz, TRANSIENT);
+ rb = COLnew(0, localtype, (BUN)sz, TRANSIENT);
if (!rb) {
throw(SQL, "parquet.read", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
}
- ssize_t rsz = 0, tsz = 0;
+ uint64_t rsz = 0, tsz = 0;
if ((rsz = pqc_read_chunk(r->c[pse->ccnr], wnr,
rb->theap->base, NULL, sz, NULL, NULL)) < 0) {
BBPreclaim(rb);
const char *err = pqc_get_error(r->c[pse->ccnr]);
@@ -768,7 +768,7 @@ PARQUETread_large(BAT **R, pqc_creader *
sz = tsz;
}
if (sz) {
- BATsetcount(rb, sz);
+ BATsetcount(rb, (BUN)sz);
BATnegateprops(rb);
}
if (!sz && r->firstcol == colno)
diff --git a/sql/backends/monet5/vaults/parquet/pqc_filemetadata.c
b/sql/backends/monet5/vaults/parquet/pqc_filemetadata.c
--- a/sql/backends/monet5/vaults/parquet/pqc_filemetadata.c
+++ b/sql/backends/monet5/vaults/parquet/pqc_filemetadata.c
@@ -248,7 +248,7 @@ pqc_open( pqc_file **PQ, char *fn)
pqc_destroy(pq);
return -1;
}
- pq->sz = stb.st_size;
+ pq->sz = (size_t)stb.st_size;
pq->buffer = NULL;
pq->bsz = 0;
diff --git a/sql/backends/monet5/vaults/parquet/pqc_reader.c
b/sql/backends/monet5/vaults/parquet/pqc_reader.c
--- a/sql/backends/monet5/vaults/parquet/pqc_reader.c
+++ b/sql/backends/monet5/vaults/parquet/pqc_reader.c
@@ -2053,7 +2053,7 @@ pqc_read_page_chunk( pqc_reader_t *r, pq
*d++ =
(ulng)nanoseconds + julian_day * 86400 * LL_CONSTANT(1000000);
}
} else {
- memcpy(output,
((char*)cr->data)+pos, nrows*(r->pse->size/8));
+ memcpy(output,
((char*)cr->data)+pos, (size_t)(nrows*(r->pse->size/8)));
pos += (r->pse->size/8)*nrows;
#ifdef WORDS_BIGENDIAN
if (nrows && (r->pse->type ==
inttype || r->pse->type == floattype)) {
@@ -2144,7 +2144,7 @@ pqc_read_chunk( pqc_reader_t *r, int wnr
if (cr->bufsize < cr->cc->total_compressed_size) {
if (cr->bufsize)
_DELETE(cr->buffer);
- cr->bufsize = cr->cc->total_compressed_size;
+ cr->bufsize =
(size_t)cr->cc->total_compressed_size;
cr->buffer = NEW_ARRAY(char, cr->bufsize);
}
@@ -2152,14 +2152,14 @@ pqc_read_chunk( pqc_reader_t *r, int wnr
assert (cr->cc->index_page_offset == 0); /* we
currently don't handle parquet indices */
int64_t offset = 0;
if (cr->cc->dictionary_page_offset) { /* load
dictionary */
- if ((offset = pqc_read(cr->pq,
cr->cc->dictionary_page_offset, cr->buffer, cr->cc->total_compressed_size)) < 0)
+ if ((offset = pqc_read(cr->pq,
cr->cc->dictionary_page_offset, cr->buffer,
(size_t)cr->cc->total_compressed_size)) < 0)
return -3;
assert(offset ==
(int64_t)cr->cc->dictionary_page_offset);
if ((pos = (int)pqc_read_dict(r, cr)) < 0)
return -4;
} else { /* read data page */
- if ((offset = pqc_read(cr->pq,
cr->cc->data_page_offset, cr->buffer, cr->cc->total_compressed_size)) < 0)
+ if ((offset = pqc_read(cr->pq,
cr->cc->data_page_offset, cr->buffer, (size_t)cr->cc->total_compressed_size)) <
0)
return -3;
assert(offset ==
(int64_t)cr->cc->data_page_offset);
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
