Merge lp:~zorba-coders/zorba/bug-996084-reuse-stream into lp:zorba
Proposed by
Matthias Brantner
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Chris Hillery | ||||
Approved revision: | 10826 | ||||
Merged at revision: | 10831 | ||||
Proposed branch: | lp:~zorba-coders/zorba/bug-996084-reuse-stream | ||||
Merge into: | lp:zorba | ||||
Diff against target: |
435 lines (+198/-22) 18 files modified
ChangeLog (+2/-0) modules/com/zorba-xquery/www/modules/converters/base64.xq (+21/-1) src/functions/pregenerated/func_base64.cpp (+13/-0) src/functions/pregenerated/function_enum.h (+1/-0) src/runtime/base64/base64_impl.cpp (+66/-11) src/runtime/spec/base64/base64.xml (+6/-1) src/store/api/item_factory.h (+13/-0) src/store/naive/atomic_items.cpp (+30/-0) src/store/naive/atomic_items.h (+6/-9) src/store/naive/simple_item_factory.cpp (+8/-0) src/store/naive/simple_item_factory.h (+4/-0) test/rbkt/ExpQueryResults/zorba/base64/decode_iso-8859-1.xml.res (+1/-0) test/rbkt/ExpQueryResults/zorba/base64/decode_iso-8859-1_file.xml.res (+1/-0) test/rbkt/ExpQueryResults/zorba/base64/reuse-stream.xml.res (+1/-0) test/rbkt/Queries/zorba/base64/decode_iso-8859-1.xq (+3/-0) test/rbkt/Queries/zorba/base64/decode_iso-8859-1_file.xq (+5/-0) test/rbkt/Queries/zorba/base64/iso-8859-1.txt (+1/-0) test/rbkt/Queries/zorba/base64/reuse-stream.xq (+16/-0) |
||||
To merge this branch: | bzr merge lp:~zorba-coders/zorba/bug-996084-reuse-stream | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Hillery | Approve | ||
Dennis Knochenwefel | Approve | ||
William Candillon | Approve | ||
Matthias Brantner | Approve | ||
Review via email: mp+105025@code.launchpad.net |
This proposal supersedes a proposal from 2012-05-08.
Commit message
- Add the ability to create a StreamableStrin
- Add a base64:decode#2 function that also does transcoding to utf-8
Description of the change
Add the ability to create a StreamableStrin
Added a base64:decode#2 function that also does transcoding to utf-8
To post a comment you must log in.
Two things I'm not totally sure/happy about:
1. The name createSharedStr eamableString( ). Probably createSharingSt reamableString( ) would be more apt, but it doesn't seem clear to me. Maybe I should have just stuck with overloading createStreamabl eString( ). Thoughts?
2. I had to initialize theIstream in the initializer block of the new StreamableStrin gItem constructor, because theIstream is a reference. Therefore, the ZORBA_ASSERT() in that constructor will probably never go off - if the streamable_ dependent isn't streamable, we'll have already thrown an exception in the call to getStream() in the initializer block. I can't see a way around this.