Changeset: a8f24449b478 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a8f24449b478
Modified Files:
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/opt_support.h
sql/backends/monet5/sql_pp_statement.c
sql/backends/monet5/sql_pp_statement.h
Branch: pp_hashjoin
Log Message:
removed unused functions isBlocking and stmt_group_locked
diffs (107 lines):
diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/optimizer/opt_support.c
--- a/monetdb5/optimizer/opt_support.c
+++ b/monetdb5/optimizer/opt_support.c
@@ -375,26 +375,6 @@ isSideEffectFree(MalBlkPtr mb)
}
/*
- * Breaking up a MAL program into pieces for distributed processing requires
- * identification of (partial) blocking instructions. A conservative
- * definition can be used.
- */
-inline int
-isBlocking(InstrPtr p)
-{
- if (blockStart(p) || blockExit(p) || blockCntrl(p))
- return TRUE;
-
- if (getFunctionId(p) == sortRef)
- return TRUE;
-
- if (getModuleId(p) == aggrRef || getModuleId(p) == groupRef
- || getModuleId(p) == sqlcatalogRef)
- return TRUE;
- return FALSE;
-}
-
-/*
* Used in the merge table optimizer. It is built incrementally
* and should be conservative.
*/
diff --git a/monetdb5/optimizer/opt_support.h b/monetdb5/optimizer/opt_support.h
--- a/monetdb5/optimizer/opt_support.h
+++ b/monetdb5/optimizer/opt_support.h
@@ -44,8 +44,6 @@ extern int mayhaveSideEffects(Client cnt
__attribute__((__visibility__("hidden")));
extern int isSideEffectFree(MalBlkPtr mb)
__attribute__((__visibility__("hidden")));
-extern int isBlocking(InstrPtr p)
- __attribute__((__visibility__("hidden")));
extern int isFragmentGroup(InstrPtr q)
__attribute__((__visibility__("hidden")));
extern int isFragmentGroup2(InstrPtr q)
diff --git a/sql/backends/monet5/sql_pp_statement.c
b/sql/backends/monet5/sql_pp_statement.c
--- a/sql/backends/monet5/sql_pp_statement.c
+++ b/sql/backends/monet5/sql_pp_statement.c
@@ -193,50 +193,6 @@ stmt_pp_aggr(backend *be, stmt *op1, stm
}
stmt *
-stmt_group_locked(backend *be, stmt *s, stmt *grp, stmt *ext, stmt *cnt)
-{
- MalBlkPtr mb = be->mb;
- InstrPtr q = NULL;
-
- if (s->nr < 0)
- return NULL;
- if (grp && (grp->nr < 0 || ext->nr < 0 || (cnt && cnt->nr < 0)))
- return NULL;
-
- q = newStmt(mb, groupRef, groupRef);
- if(!q)
- return NULL;
-
- /* output variables extent */
- q = pushReturn(mb, q, newTmpVariable(mb, TYPE_any));
- if (grp)
- q = pushArgument(mb, q, grp->nr);
- q = pushArgument(mb, q, s->nr);
- pushInstruction(mb, q);
- if (q) {
- stmt *ns = stmt_create(be->mvc->sa, st_group);
- if (ns == NULL) {
- freeInstruction(mb, q);
- return NULL;
- }
-
- ns->op1 = s;
-
- if (grp) {
- ns->op2 = grp;
- ns->op3 = ext;
- ns->op4.stval = cnt;
- }
- ns->nrcols = s->nrcols;
- ns->key = 0;
- ns->q = q;
- ns->nr = getDestVar(q);
- return ns;
- }
- return NULL;
-}
-
-stmt *
stmt_group_partitioned(backend *be, stmt *s, stmt *grp, stmt *ext, stmt *cnt)
{
MalBlkPtr mb = be->mb;
diff --git a/sql/backends/monet5/sql_pp_statement.h
b/sql/backends/monet5/sql_pp_statement.h
--- a/sql/backends/monet5/sql_pp_statement.h
+++ b/sql/backends/monet5/sql_pp_statement.h
@@ -39,7 +39,6 @@ extern InstrPtr stmt_sop_new(backend *be
extern stmt *stmt_pp_aggr(backend *be, stmt *op1, stmt *grp, stmt *ext,
sql_subfunc *op, int reduce, int no_nil, int nil_if_empty);
-extern stmt *stmt_group_locked(backend *be, stmt *op1, stmt *grp, stmt *ext,
stmt *cnt);
extern stmt *stmt_group_partitioned(backend *be, stmt *op1, stmt *grp, stmt
*ext, stmt *cnt);
extern stmt *stmt_limit_partitioned(backend *sa, stmt *c, stmt *piv, stmt
*gid, stmt *offset, stmt *limit);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
