Changeset: 52cc5d02fc05 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/52cc5d02fc05
Modified Files:
gdk/gdk.h
monetdb5/modules/mal/heapn.c
monetdb5/modules/mal/pipeline.c
monetdb5/modules/mal/pp_hash.c
monetdb5/modules/mal/pp_mat.c
monetdb5/modules/mal/pp_slicer.c
monetdb5/modules/mal/pp_sort.c
sql/backends/monet5/copy.c
sql/backends/monet5/generator/generator.c
sql/backends/monet5/vaults/parquet/parquet.c
Branch: pp_hashjoin
Log Message:
go with full name instead of abbrs
diffs (206 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -336,19 +336,19 @@ gdk_export bool VALisnil(const ValRecord
typedef struct PROPrec PROPrec;
-typedef void (*pl_io_destroy)(void *pl_io);
-typedef int (*pl_io_done)(void *pl_io, int wid, int nr_workers, bool redo);
-typedef int (*pl_io_next)(void *pl_io, int wid);
-typedef void *(*pl_io_next_bat)(void *pl_io, int wid);
+typedef void (*pipeline_io_destroy) (void *pl_io);
+typedef int (*pipeline_io_done) (void *pl_io, int wid, int nr_workers,
bool redo);
+typedef int (*pipeline_io_next) (void *pl_io, int wid);
+typedef void *(*pipeline_io_next_bat) (void *pl_io, int wid);
typedef struct pipeline_io {
- pl_io_destroy destroy;
- pl_io_done done;
- pl_io_next next; /* counter incrementing sources */
- pl_io_next_bat next_bat; /* bat generating sources */
- int type; /* sink/source type */
+ pipeline_io_destroy destroy;
+ pipeline_io_done done;
+ pipeline_io_next next; /* counter incrementing sources */
+ pipeline_io_next_bat next_bat; /* bat generating sources */
+ int type; /* sink/source type */
char *error;
-} pl_source, pl_sink;
+} pipeline_source, pipeline_sink;
#define TSKdestroy(b) if (b->pl_io && b->pl_io->destroy) {
b->pl_io->destroy(b->pl_io); b->pl_io = NULL; }
#define TSKfree(b) TSKdestroy(b)
diff --git a/monetdb5/modules/mal/heapn.c b/monetdb5/modules/mal/heapn.c
--- a/monetdb5/modules/mal/heapn.c
+++ b/monetdb5/modules/mal/heapn.c
@@ -1055,7 +1055,7 @@ _heap_create( int size, bool shared, boo
{
heapn *h = (heapn*)GDKzalloc(sizeof(heapn));
- h->s.destroy = (pl_io_destroy)heap_destroy;
+ h->s.destroy = (pipeline_io_destroy)heap_destroy;
h->s.type = HEAP_SINK;
h->shared = shared;
h->grouped = grouped;
diff --git a/monetdb5/modules/mal/pipeline.c b/monetdb5/modules/mal/pipeline.c
--- a/monetdb5/modules/mal/pipeline.c
+++ b/monetdb5/modules/mal/pipeline.c
@@ -286,8 +286,8 @@ PPcounter(Client cntxt, MalBlkPtr mb, Ma
b->pl_io = (struct pipeline_io*)c;
c->s.type = COUNTER_SINK;
- c->s.destroy = (pl_io_destroy)&counter_free;
- c->s.done = (pl_io_done)&counter_done;
+ c->s.destroy = (pipeline_io_destroy)&counter_free;
+ c->s.done = (pipeline_io_done)&counter_done;
c->current = 0;
c->cur = NULL;
c->nr = nr;
@@ -295,7 +295,7 @@ PPcounter(Client cntxt, MalBlkPtr mb, Ma
if (sync) {
c->sync = true;
c->scnt = 0;
- c->s.done = (pl_io_done)&sync_counter_done;
+ c->s.done = (pipeline_io_done)&sync_counter_done;
}
*rb = b->batCacheid;
BBPkeepref(b);
@@ -499,10 +499,10 @@ PPconcat(Client cntxt, MalBlkPtr mb, Mal
}
b->pl_io = (struct pipeline_io*)pcat;
pcat->s.type = CONCAT_SINK;
- pcat->s.destroy = (pl_io_destroy)&concat_free;
- pcat->s.done = (pl_io_done)&concat_done;
- pcat->s.next = (pl_io_next)&concat_next;
- pcat->s.next_bat = (pl_io_next_bat)&concat_next_bat;
+ pcat->s.destroy = (pipeline_io_destroy)&concat_free;
+ pcat->s.done = (pipeline_io_done)&concat_done;
+ pcat->s.next = (pipeline_io_next)&concat_next;
+ pcat->s.next_bat = (pipeline_io_next_bat)&concat_next_bat;
pcat->current = 0;
pcat->max = nr;
pcat->started = false;
@@ -535,7 +535,7 @@ PPresultset(Client cntxt, MalBlkPtr mb,
throw(SQL, "pipeline.resultset", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
}
b->pl_io = (struct pipeline_io*)prs;
- prs->s.destroy = (pl_io_destroy)&GDKfree;
+ prs->s.destroy = (pipeline_io_destroy)&GDKfree;
MT_lock_init(&prs->l, "resultset");
*rb = b->batCacheid;
BBPkeepref(b);
diff --git a/monetdb5/modules/mal/pp_hash.c b/monetdb5/modules/mal/pp_hash.c
--- a/monetdb5/modules/mal/pp_hash.c
+++ b/monetdb5/modules/mal/pp_hash.c
@@ -95,7 +95,7 @@ _ht_create( int type, size_t size, hash_
if (!type)
type = TYPE_oid;
- h->s.destroy = (pl_io_destroy)&ht_destroy;
+ h->s.destroy = (pipeline_io_destroy)&ht_destroy;
h->s.type = OA_HASH_TABLE_SINK;
if (bits >= GIDBITS)
bits = GIDBITS-1;
diff --git a/monetdb5/modules/mal/pp_mat.c b/monetdb5/modules/mal/pp_mat.c
--- a/monetdb5/modules/mal/pp_mat.c
+++ b/monetdb5/modules/mal/pp_mat.c
@@ -104,7 +104,7 @@ MATnew(Client cntxt, MalBlkPtr mb, MalSt
GDKfree(mat);
throw(MAL, "mat.new", SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
- mat->s.destroy = (pl_io_destroy)&mat_destroy;
+ mat->s.destroy = (pipeline_io_destroy)&mat_destroy;
mat->s.type = MAT_SINK;
BAT *matb = COLnew(0, tt, 1, TRANSIENT);
@@ -167,7 +167,7 @@ PARTnew(Client cntxt, MalBlkPtr mb, MalS
throw(MAL, "part.new", SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
MT_lock_init(&part->l, "partition");
- part->s.destroy = (pl_io_destroy)&part_destroy;
+ part->s.destroy = (pipeline_io_destroy)&part_destroy;
part->s.type = PART_SINK;
BAT *partb = COLnew(0, TYPE_oid, 100000 /* need estimate? */,
TRANSIENT);
diff --git a/monetdb5/modules/mal/pp_slicer.c b/monetdb5/modules/mal/pp_slicer.c
--- a/monetdb5/modules/mal/pp_slicer.c
+++ b/monetdb5/modules/mal/pp_slicer.c
@@ -35,7 +35,7 @@ topn_create(void)
if (!t)
return NULL;
- t->s.destroy = (pl_io_destroy)&topn_destroy;
+ t->s.destroy = (pipeline_io_destroy)&topn_destroy;
t->s.type = TOPN_SINK;
t->start = 0;
t->end = 0;
diff --git a/monetdb5/modules/mal/pp_sort.c b/monetdb5/modules/mal/pp_sort.c
--- a/monetdb5/modules/mal/pp_sort.c
+++ b/monetdb5/modules/mal/pp_sort.c
@@ -747,8 +747,8 @@ SOPnew(Client cntxt, MalBlkPtr mb, MalSt
q->h = NULL;
q->t = NULL;
MT_lock_init(&q->l, "sop");
- q->s.destroy = (pl_io_destroy)&sop_destroy;
- q->s.done = (pl_io_done)&sop_done;
+ q->s.destroy = (pipeline_io_destroy)&sop_destroy;
+ q->s.done = (pipeline_io_done)&sop_done;
q->s.type = SOP_SINK;
BAT *qb = COLnew(0, TYPE_oid, 0 /* need estimate? */, TRANSIENT);
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
@@ -195,8 +195,8 @@ static reader *
reader_new(stream *s, BUN offset, BUN maxcount, BUN sz, str col_sep_str, str
line_sep_str, str quote_str, str null_repr, bool escape_enabled, bool
best_effort)
{
reader *r = (reader*)GDKzalloc(sizeof(reader));
- r->sink.destroy = (pl_io_destroy)&reader_destroy;
- r->sink.done = (pl_io_done)&reader_done;
+ r->sink.destroy = (pipeline_io_destroy)&reader_destroy;
+ r->sink.done = (pipeline_io_done)&reader_done;
r->sink.type = COPY_SINK;
r->s = s;
r->offset = offset;
diff --git a/sql/backends/monet5/generator/generator.c
b/sql/backends/monet5/generator/generator.c
--- a/sql/backends/monet5/generator/generator.c
+++ b/sql/backends/monet5/generator/generator.c
@@ -2167,9 +2167,9 @@ VLTgenerator_new(Client cntxt, MalBlkPtr
g->part_size = be->part_size;
g->cnt = g->cur = 0;
g->s.type = GENERATOR_SOURCE;
- g->s.done = (pl_io_done)generator_done;
- g->s.destroy = (pl_io_destroy)generator_free;
- g->s.next_bat = (pl_io_next_bat)generator_next;
+ g->s.done = (pipeline_io_done)generator_done;
+ g->s.destroy = (pipeline_io_destroy)generator_free;
+ g->s.next_bat = (pipeline_io_next_bat)generator_next;
MT_lock_init(&g->l, "generator");
msg = VLTgenerator_get_limits(g, cntxt, mb, stk, pci);
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
@@ -525,8 +525,8 @@ pqcc_create(pqc_file *pq, pqc_filemetada
{
pqc_creader *r = (pqc_creader*)GDKzalloc(sizeof(pqc_creader));
- r->sink.destroy = (pl_io_destroy)&pqcc_destroy;
- r->sink.done = (pl_io_done)&pqcc_done;
+ r->sink.destroy = (pipeline_io_destroy)&pqcc_destroy;
+ r->sink.done = (pipeline_io_done)&pqcc_done;
r->sink.type = PARQUET_SINK;
r->b = pq;
r->fmd = fmd;
@@ -586,8 +586,8 @@ pqcmc_create(glob_t *glob, lng nrows)
globfree(glob);
return NULL;
}
- r->sink.destroy = (pl_io_destroy)&pqcmc_destroy;
- r->sink.done = (pl_io_done)&pqcmc_done;
+ r->sink.destroy = (pipeline_io_destroy)&pqcmc_destroy;
+ r->sink.done = (pipeline_io_done)&pqcmc_done;
r->sink.type = MPARQUET_SINK;
r->nrworkers = 1;
r->glob = *glob;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
