Changeset: 5861fe8ce566 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5861fe8ce566
Modified Files:
Branch: default
Log Message:
Merge git master into default
diffs (200 lines):
diff -r 2f3a218a16bb -r 5861fe8ce566 pathfinder/compiler/include/Makefile.ag
--- a/pathfinder/compiler/include/Makefile.ag Thu Jun 17 13:18:22 2010 +0200
+++ b/pathfinder/compiler/include/Makefile.ag Thu Jun 17 13:38:04 2010 +0200
@@ -26,90 +26,90 @@
#
EXTRA_DIST = \
- abssyn.h \
- abssynprint.h \
- alg_cl_mnemonic.h \
- alg_dag.h \
- algebra_cse.h \
- opt_algebra_cse.h \
- algebra.h \
- algebra_mnemonic.h \
- algopt.h \
- array.h \
- bitset.h \
- builtins.h \
+ abssyn.h \
+ abssynprint.h \
+ alg_cl_mnemonic.h \
+ alg_dag.h \
+ algebra_cse.h \
+ opt_algebra_cse.h \
+ algebra.h \
+ algebra_mnemonic.h \
+ algopt.h \
+ array.h \
+ bitset.h \
+ builtins.h \
child_mnemonic.h \
- compile.h \
- compile_interface.h \
- core2alg.h \
- core.h \
- core_mnemonic.h \
- coreopt.h \
- coreprint.h \
- env.h \
- ferry_lib.h \
- fs.h \
- fmt.h \
- func_chk.h \
- functions.h \
- heuristic.h \
- import.h \
+ compile.h \
+ compile_interface.h \
+ core2alg.h \
+ core.h \
+ core_mnemonic.h \
+ coreopt.h \
+ coreprint.h \
+ env.h \
+ fs.h \
+ fmt.h \
+ func_chk.h \
+ functions.h \
+ heuristic.h \
+ import.h \
intro_borders.h \
- la_proxy.h \
- la_thetajoin.h \
- logdebug.h \
- logical.h \
- logical_mnemonic.h \
+ la_proxy.h \
+ la_thetajoin.h \
+ logdebug.h \
+ logical.h \
+ logical_mnemonic.h \
map_names.h \
- mem.h \
- mil_dce.h \
- milgen.h \
- mil.h \
- mil_mnemonic.h \
- mil_opt.h \
- milprint.h \
- milprint_summer.h \
+ mem.h \
+ mil_dce.h \
+ milgen.h \
+ mil.h \
+ mil_mnemonic.h \
+ mil_opt.h \
+ milprint.h \
+ milprint_summer.h \
msa.h \
msa_mnemonic.h \
msaprint.h \
- normalize.h \
- ns.h \
- nsres.h \
- oops.h \
- options.h \
- ordering.h \
- parser.h \
- pathfinder.h \
- pfstrings.h \
+ normalize.h \
+ ns.h \
+ nsres.h \
+ oops.h \
+ options.h \
+ ordering.h \
+ parser.h \
+ pathfinder.h \
+ pfstrings.h \
+ pf_ferry.h \
pf_xq.h \
- physdebug.h \
- physical.h \
- physical_mnemonic.h \
- planner.h \
+ physdebug.h \
+ physical.h \
+ physical_mnemonic.h \
+ planner.h \
plan_bundle.h \
- prettyp.h \
- properties.h \
- qname.h \
- scanner.h \
- scope.h \
- simplify.h \
- string_utils.h \
- subtyping.h \
- timer.h \
- typecheck.h \
- types.h \
- variable.h \
- varscope.h \
- xml2lalg.h \
- xml2lalg_converters.h \
- xml2lalg_xpath_utils.h \
- xquery_fo.h \
- sql.h \
- sql_opt.h \
- sql_mnemonic.h \
- lalg2sql.h \
- lalg2msa.h \
- sqlprint.h \
+ prettyp.h \
+ properties.h \
+ qname.h \
+ scanner.h \
+ scope.h \
+ simplify.h \
+ string_utils.h \
+ subtyping.h \
+ timer.h \
+ typecheck.h \
+ types.h \
+ variable.h \
+ varscope.h \
+ xml2lalg.h \
+ xml2lalg_converters.h \
+ xml2lalg_xpath_utils.h \
+ xquery_fo.h \
+ sql.h \
+ sql_opt.h \
+ sql_mnemonic.h \
+ lalg2sql.h \
+ lalg2msa.h \
+ sqlprint.h \
load_stats.h
headers_pf_ferry = {
diff -r 2f3a218a16bb -r 5861fe8ce566 pathfinder/compiler/pf_ferry.c
--- a/pathfinder/compiler/pf_ferry.c Thu Jun 17 13:18:22 2010 +0200
+++ b/pathfinder/compiler/pf_ferry.c Thu Jun 17 13:38:04 2010 +0200
@@ -115,6 +115,7 @@
PFla_pb_t *lapb = NULL;
XML2LALGContext *ctx;
PFarray_t *output;
+ char *opt_args_local;
/* setup the error buffer (needed for error handling and segfault trap) */
PFerrbuf = err;
@@ -149,13 +150,15 @@
/* Use the default optimization arguments
if no optimizations are available. */
- if (!opt_args)
- opt_args = PFopt_args;
+ if (opt_args)
+ opt_args_local = opt_args;
+ else
+ opt_args_local = PFopt_args;
/* Rewrite/optimize the algebra plans. */
for (unsigned int i = 0; i < PFla_pb_size(lapb); i++)
PFla_pb_op_at (lapb, i)
- = PFalgopt (PFla_pb_op_at (lapb, i), false, NULL, opt_args);
+ = PFalgopt (PFla_pb_op_at (lapb, i), false, NULL, opt_args_local);
/*
* OUTPUT GENERATION
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
