Merge lp:~zorba-coders/zorba/bug900677 into lp:zorba
Status: | Superseded | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~zorba-coders/zorba/bug900677 | ||||
Merge into: | lp:zorba | ||||
Diff against target: |
970 lines (+702/-42) 22 files modified
ChangeLog (+2/-0) modules/com/zorba-xquery/www/modules/store/static/indexes/dml.xq (+25/-0) src/functions/library.cpp (+2/-0) src/functions/pregenerated/func_index_func.cpp (+63/-0) src/functions/pregenerated/func_index_func.h (+66/-0) src/functions/pregenerated/function_enum.h (+1/-0) src/runtime/indexing/index_func_impl.cpp (+103/-0) src/runtime/indexing/index_util.h (+95/-0) src/runtime/indexing/pregenerated/index_func.cpp (+79/-0) src/runtime/indexing/pregenerated/index_func.h (+97/-0) src/runtime/spec/indexing/index_func.xml (+55/-0) src/runtime/store/maps_impl.cpp (+4/-35) src/runtime/visitors/pregenerated/planiter_visitor.h (+5/-0) src/runtime/visitors/pregenerated/printer_visitor.cpp (+15/-0) src/runtime/visitors/pregenerated/printer_visitor.h (+3/-0) src/store/naive/simple_index_value.cpp (+21/-7) src/store/naive/simple_index_value.h (+5/-0) test/rbkt/ExpQueryResults/zorba/index/keys1.xml.res (+1/-0) test/rbkt/ExpQueryResults/zorba/index/keys2.xml.res (+1/-0) test/rbkt/Queries/zorba/index/keys1.xq (+22/-0) test/rbkt/Queries/zorba/index/keys2.xq (+22/-0) test/rbkt/Queries/zorba/index/keys_mod.xqlib (+15/-0) |
||||
To merge this branch: | bzr merge lp:~zorba-coders/zorba/bug900677 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Markos Zaharioudakis | 2012-01-18 | Pending | |
William Candillon | 2012-01-18 | Pending | |
Review via email:
|
This proposal has been superseded by a proposal from 2012-01-18.
Commit message
Added a keys() function to the index dml module. This fixes bug #900677.
Description of the change
Added a keys() function to the index dml module. This fixes bug #900677.
Zorba Build Bot (zorba-buildbot) wrote : | # |
Zorba Build Bot (zorba-buildbot) wrote : | # |
The attempt to merge lp:~zorba-coders/zorba/bug900677 into lp:zorba failed. Below is the output from the failed tests.
CMake Error at /home/ceej/
Validation queue job bug900677-2012-01-
final status was:
No tests were run - build or configure step must have failed.
Not commiting changes.
Error in read script: /home/ceej/
- 10622. By Matthias Brantner on 2012-01-18
-
Fixed a bug when a key attribute in an index is the empty sequence. Also, improved the
documentation for the idml:keys function. - 10623. By Matthias Brantner on 2012-05-11
-
merge
- 10624. By David Graf on 2012-07-12
-
merged trunk
- 10625. By David Graf on 2012-07-12
-
regenerated stuff
- 10626. By David Graf on 2012-07-12
-
fixed merge bug
- 10627. By David Graf on 2012-07-13
-
commit of work in progress - keys function for general indices does work. Cleanup and more tests needed.
- 10628. By David Graf on 2012-07-13
-
index-keys function test for general index
- 10629. By David Graf on 2012-07-16
-
added some comments
- 10630. By Matthias Brantner on 2012-07-20
-
merge with trunk
- 10631. By Matthias Brantner on 2012-07-20
-
minor cleanup
- 10632. By David Graf on 2012-08-02
-
merged trunk
- 10633. By David Graf on 2012-08-02
-
merged trunk
- 10634. By David Graf on 2012-08-03
-
merged trunk
- 10635. By David Graf on 2012-08-03
-
fixed segfault
Validation queue starting for merge proposal. zorbatest. lambda. nu:8080/ remotequeue/ bug900677- 2012-01- 18T01-02- 56.733Z/ log.html
Log at: http://