Changeset: 247f2b5e1d81 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=247f2b5e1d81
Modified Files:
sql/backends/monet5/sql_rdf.h
sql/backends/monet5/sql_rdf_jgraph.c
Branch: rdf
Log Message:
Fix compile error when there is no exception
diffs (45 lines):
diff --git a/sql/backends/monet5/sql_rdf.h b/sql/backends/monet5/sql_rdf.h
--- a/sql/backends/monet5/sql_rdf.h
+++ b/sql/backends/monet5/sql_rdf.h
@@ -70,7 +70,7 @@ extern PsoPropStat *pso_propstat;
#define APPLY_OPTIMIZATION_FOR_OPTIONAL 1 /* Instead of using
left join, we use a project with ifthenelse */
/* on the set of optional
columns */
-#define HANDLING_EXCEPTION 1
+#define HANDLING_EXCEPTION 0
#define RDF_HANDLING_EXCEPTION_MISSINGPROP_OPT 1
diff --git a/sql/backends/monet5/sql_rdf_jgraph.c
b/sql/backends/monet5/sql_rdf_jgraph.c
--- a/sql/backends/monet5/sql_rdf_jgraph.c
+++ b/sql/backends/monet5/sql_rdf_jgraph.c
@@ -3356,19 +3356,28 @@ sql_rel* _group_star_pattern(mvc *c, jgr
exps_print_ext(c, union_rdfscan_exps, 0,
"union_rdfscan_exps: ");
*/
+ #if HANDLING_EXCEPTION
+
rel_rdfscan = build_rdfexception(c, tmptbId[0], jg,
union_rdfscan_exps, nijgroup, ijgroup, nnodes_per_ijgroup, spprops);
printf("RDF exception\n");
_rel_print(c, rel_rdfscan);
rel = rel_setop(c->sa, rel_alltable, rel_rdfscan,
op_union);
- //rel->exps = union_rdfscan_exps;
rel->exps = sp_proj_exps[0];
+ #else
+ rel = rel_alltable;
+ #endif
}
else {
+ #if HANDLING_EXCEPTION
rel_rdfscan = build_rdfexception(c, -1, jg, NULL,
nijgroup, ijgroup, nnodes_per_ijgroup, spprops);
rel = rel_rdfscan;
+ #else
+ printf("There must be a matching table!!!!!\n");
+ assert(0);
+ #endif
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
