lp:~zorba-coders/zorba/bug-967428

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:zorba at revision 10876

Markos Zaharioudakis: Approve on 2012-06-14

Diff: 2943 lines (+1239/-1121)

28 files modified

ChangeLog (+3/-0)
src/compiler/expression/expr.h (+2/-0)
src/compiler/rewriter/rules/hoist_rules.cpp (+55/-55)
src/compiler/rewriter/rules/index_join_rule.cpp (+8/-8)
test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9197.iter (+34/-34)
test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9198.iter (+34/-34)
test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9199.iter (+34/-34)
test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9206.iter (+38/-38)
test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9207.iter (+34/-34)
test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9210.iter (+38/-38)
test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9211.iter (+38/-38)
test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9212.iter (+38/-38)
test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9389.iter (+38/-38)
test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9391.iter (+38/-38)
test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9392.iter (+52/-52)
test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9399.iter (+38/-38)
test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/9400.iter (+38/-38)
test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/idx4.iter (+74/-78)
test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/idx5.iter (+78/-82)
test/rbkt/ExpCompilerResults/IterPlan/zorba/misc/hoist4.iter (+16/-20)
test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9198.iter (+34/-34)
test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9199.iter (+34/-34)
test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9212.iter (+38/-38)
test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9389.iter (+38/-38)
test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-9392.iter (+52/-52)
test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-idx4.iter (+74/-78)
test/rbkt/ExpCompilerResults/IterPlan/zorba/xray/ppm_10.iter (+107/-111)
test/rbkt/Queries/zorba/hashjoins/idx10.xq (+134/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

10869. By Markos Zaharioudakis on 2012-06-14

merge from trunk

10868. By Markos Zaharioudakis on 2012-06-05

Improved hoist rule: tighter hoisting of expressions (also fixes bug #967428)

10867. By Matthias Brantner on 2012-05-30

added a cmake variable that allows to configure whether external jars are packaged or not (ZORBA_PACKAGE_EXTERNAL_JARS)
 Approved: Matthias Brantner, Chris Hillery

10866. By Matthias Brantner on 2012-05-23

updated change log to reflect bug #1002867 Approved: Paul J. Lucas, Matthias Brantner

10865. By Paul J. Lucas on 2012-05-23

No longer setting the charset of an overridden media type to a default value. Approved: David Graf, Matthias Brantner

10864. By Sorin Marian Nasoi <email address hidden> on 2012-05-22

Fixed bug lp:1001477. Approved: Rodolfo Ochoa, Sorin Marian Nasoi

10863. By Matthias Brantner on 2012-05-22

Update changelog, update module tags for Zorba 2.5. Approved: Matthias Brantner, Chris Hillery

10862. By Chris Hillery on 2012-05-22

Set CMAKE_INSTALL_RPATH_USE_LINK_PATH to TRUE to have correct RPATHs in installed binaries. Add comment about INSTALL_NAME_DIR. Approved: Matthias Brantner, Chris Hillery

10861. By Matthias Brantner on 2012-05-21

push-down of count(probe-index()) into the store Approved: Till Westmann, Matthias Brantner

10860. By Matthias Brantner on 2012-05-21

added stacks and queues to the data lifecycle documentation Approved: William Candillon, Matthias Brantner