Changeset: 27dc60cdf299 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=27dc60cdf299 Modified Files: monetdb5/extras/jaql/jaql.c monetdb5/extras/jaql/jaqlscenario.c monetdb5/extras/jaql/jaqltree.h Branch: default Log Message:
printtree: send output to client instead of console
diffs (truncated from 754 to 300 lines):
diff --git a/monetdb5/extras/jaql/jaql.c b/monetdb5/extras/jaql/jaql.c
--- a/monetdb5/extras/jaql/jaql.c
+++ b/monetdb5/extras/jaql/jaql.c
@@ -1137,7 +1137,7 @@ set_func_input_from_pipe(tree *func)
void
-printtree(tree *t, int level, char op)
+printtree(stream *out, tree *t, int level, char op)
{
(void) level; /* indenting not used (yet) */
#define step 4
@@ -1145,294 +1145,294 @@ printtree(tree *t, int level, char op)
switch (t->type) {
case j_output_var:
if (op) {
- printf("j_output_var( %s ) ", t->sval);
+ mnstr_printf(out, "j_output_var( %s )
", t->sval);
} else {
- printf("=> %s ", t->sval);
+ mnstr_printf(out, "=> %s ", t->sval);
}
break;
case j_output:
if (op) {
- printf("j_output() ");
+ mnstr_printf(out, "j_output() ");
} else {
- printf("=> <result> ");
+ mnstr_printf(out, "=> <result> ");
}
break;
case j_json:
if (op) {
- printf("j_json( %s ) ", t->sval);
+ mnstr_printf(out, "j_json( %s ) ",
t->sval);
} else {
- printf("%s ", t->sval);
+ mnstr_printf(out, "%s ", t->sval);
}
break;
case j_json_obj:
if (op) {
- printf("j_json_obj( ");
- printtree(t->tval1, level + step, op);
- printf(") ");
+ mnstr_printf(out, "j_json_obj( ");
+ printtree(out, t->tval1, level + step,
op);
+ mnstr_printf(out, ") ");
} else {
- printf("{ ");
- printtree(t->tval1, level + step, op);
- printf("} ");
+ mnstr_printf(out, "{ ");
+ printtree(out, t->tval1, level + step,
op);
+ mnstr_printf(out, "} ");
}
break;
case j_json_arr:
if (op) {
- printf("j_json_arr( ");
- printtree(t->tval1, level + step, op);
- printf(") ");
+ mnstr_printf(out, "j_json_arr( ");
+ printtree(out, t->tval1, level + step,
op);
+ mnstr_printf(out, ") ");
} else {
- printf("[ ");
- printtree(t->tval1, level + step, op);
- printf("] ");
+ mnstr_printf(out, "[ ");
+ printtree(out, t->tval1, level + step,
op);
+ mnstr_printf(out, "] ");
}
break;
case j_pair:
if (op) {
- printf("j_pair( ");
+ mnstr_printf(out, "j_pair( ");
if (t->sval != NULL) {
- printf("\"%s\", ", t->sval);
+ mnstr_printf(out, "\"%s\", ",
t->sval);
} else {
- printf("<deduced_name>, ");
+ mnstr_printf(out,
"<deduced_name>, ");
}
- printtree(t->tval1, level + step, op);
- printf(") ");
+ printtree(out, t->tval1, level + step,
op);
+ mnstr_printf(out, ") ");
} else {
if (t->sval == NULL) {
- printf("<to be deduced from
expansion> ");
+ mnstr_printf(out, "<to be
deduced from expansion> ");
} else {
- printf("\"%s\": ", t->sval);
+ mnstr_printf(out, "\"%s\": ",
t->sval);
}
- printtree(t->tval1, level + step, op);
+ printtree(out, t->tval1, level + step,
op);
if (t->next != NULL)
- printf(", ");
+ mnstr_printf(out, ", ");
}
break;
case j_filter:
if (op) {
- printf("j_filter( ");
- printtree(t->tval1, level + step, op);
- printf(", ");
- printtree(t->tval2, level + step, op);
- printf(") ");
+ mnstr_printf(out, "j_filter( ");
+ printtree(out, t->tval1, level + step,
op);
+ mnstr_printf(out, ", ");
+ printtree(out, t->tval2, level + step,
op);
+ mnstr_printf(out, ") ");
} else {
- printf("as ");
- printtree(t->tval1, level + step, op);
- printf("-> filter: ");
- printtree(t->tval2, level + step, op);
+ mnstr_printf(out, "as ");
+ printtree(out, t->tval1, level + step,
op);
+ mnstr_printf(out, "-> filter: ");
+ printtree(out, t->tval2, level + step,
op);
}
break;
case j_transform:
if (op) {
- printf("j_transform( ");
- printtree(t->tval1, level + step, op);
- printf(", ");
- printtree(t->tval2, level + step, op);
+ mnstr_printf(out, "j_transform( ");
+ printtree(out, t->tval1, level + step,
op);
+ mnstr_printf(out, ", ");
+ printtree(out, t->tval2, level + step,
op);
} else {
- printf("as ");
- printtree(t->tval1, level + step, op);
- printf("-> transform: ");
- printtree(t->tval2, level + step, op);
+ mnstr_printf(out, "as ");
+ printtree(out, t->tval1, level + step,
op);
+ mnstr_printf(out, "-> transform: ");
+ printtree(out, t->tval2, level + step,
op);
}
t = t->tval3;
while (t != NULL) {
- printf(", ");
- printtree(t, level + step, op);
+ mnstr_printf(out, ", ");
+ printtree(out, t, level + step, op);
t = t->next;
}
if (op)
- printf(") ");
+ mnstr_printf(out, ") ");
break;
case j_expand:
if (op) {
- printf("j_expand( ");
- printtree(t->tval1, level + step, op);
- printf(", ");
- printtree(t->tval2, level + step, op);
- printf(") ");
+ mnstr_printf(out, "j_expand( ");
+ printtree(out, t->tval1, level + step,
op);
+ mnstr_printf(out, ", ");
+ printtree(out, t->tval2, level + step,
op);
+ mnstr_printf(out, ") ");
} else {
- printf("as ");
- printtree(t->tval1, level + step, op);
- printf("-> expand: ");
- printtree(t->tval2, level + step, op);
+ mnstr_printf(out, "as ");
+ printtree(out, t->tval1, level + step,
op);
+ mnstr_printf(out, "-> expand: ");
+ printtree(out, t->tval2, level + step,
op);
}
break;
case j_unroll:
if (op) {
- printf("j_unroll( ");
- printtree(t->tval1, level + step, op);
- printf(", ");
- printtree(t->tval2, level + step, op);
- printf(") ");
+ mnstr_printf(out, "j_unroll( ");
+ printtree(out, t->tval1, level + step,
op);
+ mnstr_printf(out, ", ");
+ printtree(out, t->tval2, level + step,
op);
+ mnstr_printf(out, ") ");
} else {
- printf("as ");
- printtree(t->tval1, level + step, op);
- printf("-> expand unroll: ");
- printtree(t->tval2, level + step, op);
+ mnstr_printf(out, "as ");
+ printtree(out, t->tval1, level + step,
op);
+ mnstr_printf(out, "-> expand unroll: ");
+ printtree(out, t->tval2, level + step,
op);
}
break;
case j_group:
if (op) {
tree *i;
- printf("j_group( ");
+ mnstr_printf(out, "j_group( ");
if (t->tval1 != NULL) {
- printtree(t->tval1, level +
step, op);
+ printtree(out, t->tval1, level
+ step, op);
for (i = t->tval1->next; i !=
NULL; i = i->next) {
- printf(", ");
- printtree(i, level +
step, op);
+ mnstr_printf(out, ", ");
+ printtree(out, i, level
+ step, op);
}
}
- printf("), ");
- printtree(t->tval2, level + step, op);
+ mnstr_printf(out, "), ");
+ printtree(out, t->tval2, level + step,
op);
} else {
tree *i;
if (t->tval1 == NULL || t->tval1->next
== NULL)
- printf("-> ");
- printf("group by: ( ");
+ mnstr_printf(out, "-> ");
+ mnstr_printf(out, "group by: ( ");
if (t->tval1 != NULL) {
- printtree(t->tval1, level +
step, op);
+ printtree(out, t->tval1, level
+ step, op);
for (i = t->tval1->next; i !=
NULL; i = i->next) {
- printf(", ");
- printtree(i, level +
step, op);
+ mnstr_printf(out, ", ");
+ printtree(out, i, level
+ step, op);
}
}
- printf(") into ");
- printtree(t->tval2, level + step, op);
+ mnstr_printf(out, ") into ");
+ printtree(out, t->tval2, level + step,
op);
}
t = t->tval2->next;
while (t != NULL) {
- printf(", ");
- printtree(t, level + step, op);
+ mnstr_printf(out, ", ");
+ printtree(out, t, level + step, op);
t = t->next;
}
if (op)
- printf(") ");
+ mnstr_printf(out, ") ");
break;
case j_join:
if (op) {
tree *i;
- printf("j_join( ");
- printtree(t->tval1, level + step, op);
+ mnstr_printf(out, "j_join( ");
+ printtree(out, t->tval1, level + step,
op);
for (i = t->tval1->next; i != NULL; i =
i->next) {
- printf(", ");
- printtree(i, level + step, op);
+ mnstr_printf(out, ", ");
+ printtree(out, i, level + step,
op);
}
- printf(", ( ");
- printtree(t->tval2, level + step, op);
- printf("), ");
- printtree(t->tval3, level + step, op);
+ mnstr_printf(out, ", ( ");
+ printtree(out, t->tval2, level + step,
op);
+ mnstr_printf(out, "), ");
+ printtree(out, t->tval3, level + step,
op);
} else {
tree *i;
- printf("as ");
- printtree(t->tval1, level + step, op);
+ mnstr_printf(out, "as ");
+ printtree(out, t->tval1, level + step,
op);
for (i = t->tval1->next; i != NULL; i =
i->next) {
- printf(", ");
- printtree(i, level + step, op);
+ mnstr_printf(out, ", ");
+ printtree(out, i, level + step,
op);
}
- printf("-> join: where ( ");
- printtree(t->tval2, level + step, op);
- printf(") into ");
- printtree(t->tval3, level + step, op);
+ mnstr_printf(out, "-> join: where ( ");
+ printtree(out, t->tval2, level + step,
op);
+ mnstr_printf(out, ") into ");
+ printtree(out, t->tval3, level + step,
op);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
