Merge lp:~zorba-coders/zorba/2.8-release-prep into lp:zorba

Proposed by Chris Hillery on 2013-01-11
Status: Merged
Approved by: Cezar Andrei on 2013-01-14
Approved revision: 11181
Merged at revision: 11182
Proposed branch: lp:~zorba-coders/zorba/2.8-release-prep
Merge into: lp:zorba
Diff against target: 275 lines (+68/-72)
4 files modified
CMakeLists.txt (+1/-1)
ChangeLog (+38/-43)
NOTICE.txt (+1/-1)
modules/ExternalModules.conf (+28/-27)
To merge this branch: bzr merge lp:~zorba-coders/zorba/2.8-release-prep
Reviewer Review Type Date Requested Status
Cezar Andrei Approve on 2013-01-14
Chris Hillery Approve on 2013-01-11
Review via email: mp+142856@code.launchpad.net

Commit message

Bump version to 2.8! Clean ChangeLog.

To post a comment you must log in.
Chris Hillery (ceejatec) :
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/2.8-release-prep into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job 2.8-release-prep-2013-01-11T10-13-51.255Z is finished.
  The final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job 2.8-release-prep-2013-01-11T10-57-37.119Z is finished. The final status was:

All tests succeeded!

Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve.

11181. By Chris Hillery on 2013-01-14

Merge from trunk.

review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job 2.8-release-prep-2013-01-14T17-08-49.165Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-01-09 04:48:12 +0000
3+++ CMakeLists.txt 2013-01-14 09:49:23 +0000
4@@ -478,7 +478,7 @@
5
6 # zorba versioning
7 SET(ZORBA_MAJOR_NUMBER "2")
8-SET(ZORBA_MINOR_NUMBER "7")
9+SET(ZORBA_MINOR_NUMBER "8")
10 SET(ZORBA_PATCH_NUMBER "0")
11 SET(ZORBA_VERSION ${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
12 MESSAGE(STATUS "Zorba version number: ${ZORBA_VERSION}")
13
14=== modified file 'ChangeLog'
15--- ChangeLog 2013-01-11 17:37:08 +0000
16+++ ChangeLog 2013-01-14 09:49:23 +0000
17@@ -4,27 +4,24 @@
18 version 2.8
19
20 New Features:
21- * (bug #1039284) Implemented jn:json-doc().
22- * http://www.zorba-xquery.com/modules/references to (de)reference
23- XML nodes or JSON objects and arrays that are stored in a collection
24- * (bug #867363) Added http-uri-resolution feature to disable HTTP
25- when resolving URIs.
26- * (bug #867363) Added http-uri-resolution feature to disable HTTP when
27- resolving URIs.
28- * Can now specify jsoniq-strip-top-level-array option to parse-json() to
29- strip the top-level array from JSON streams.
30+ * New external module for interfacing with Couchbase Server.
31+ * New external module for interfacing with SQLite Database.
32+ * New external module for interfacing with Oracle NoSQL Database.
33+ * New external module for interfacing with relational databases via JDBC.
34+ * New external info-extraction module for querying concepts and entities in
35+ natural language text.
36+ * New built-in module to (de)reference XML nodes or JSON objects and
37+ arrays that are stored in a collection
38+ * Implemented JSONiq's json-doc() function.
39+ * http-uri-resolution feature to disable HTTP when resolving URIs.
40+ * Option to specify that parse-json() strips the top-level array.
41+ * Extended cast and castable expression to allow any simple target type
42+ (as specified by XQuery 3.0).
43+ * The XQXQ (XQuery-for-XQuery) module became part of the Zorba core.
44+ * The datetime module became part of the Zorba core.
45 * In the datetime module, added parse-date(), parse-dateTime(), parse-time(),
46 and utc-offset().
47- * New info-extraction module for querying concepts and entities in natural
48- language text.
49- * New external module client for Couchbase Server.
50- * New external module client for SQLite Database.
51- * New external module client for Oracle NoSQL Database.
52- * New info-extraction module for querying concepts and entities in
53- natural language text.
54- * New JDBC module for manipulating SQL relational databases.
55- * Extended cast and castable expression to allow any simple target type
56- (as specified by XQuery 3.0)
57+ * Includes test driver for W3C XQuery 3.0 Test Suite (aka FOTS).
58
59 Optimizations:
60 * Various optimizations in the implementation of the optimizer rules.
61@@ -34,33 +31,31 @@
62 * Fixed iteration over the components of a window clause; this improves static
63 type computation of expressions referencing window vars.
64 * No need to cast xs:untypedAtomic to xs:string in order-by expression.
65- * Convert LET vars whose domain sequence has exactly one item to FOR vars.
66+ * Convert LET variables whose domain sequence has exactly one item to FOR vars.
67
68 Bug Fixes/Other Changes:
69 * Fixed bug #949064 (faulty QName should be printed in the error message)
70 * Fixed bug #1072644 (broken parser error location)
71- * Change XQXQ (XQuery-for-XQuery) module now part of Zorba core
72- * Fixed mustCopyInputNodes() method of no-copy, and jsoniq functions.
73 * Fixed bug #868640 (Node lifetime is shorter than expected due to let
74- variable inlining)
75- * Fixed bug in castable expr when the target type is xs:QName.
76- * Fixed bug in testing if a sequence type is subtype of node(xs:untyped)
77+ variable inlining)
78 * Fixed bugs #1081626 (Segmentation fault in a side-effecting FLWOR),
79- #1079488 (streaming segfault)
80+ #1079488 (streaming segfault)
81 * Fixed bug #1062093 (bug in var reference iterators with an associated
82- position that is negative)
83+ position that is negative)
84 * Fixed bug #1073978 (FOTS: option default ns not supported)
85- * Fixed bug in probing multi-key value-range indexes
86 * Fixed bug #1061222 (bad message for errors in index key type declaration)
87 * Fixed bug #1065175 (preceding::node()[1] returns wrong results)
88 * Fixed bug #1065321 (following:text() doesn't return results in doc order)
89 * Fixed bug #1067706 (wrong const folding in mutually recursive udfs)
90- * Fixed bug #1021492 (while computeing the "sources" of a prolog var, skip
91- any var-setting exprs that appear in non-used (and non-optimized) functions).
92+ * Fixed bug #1021492 (while computing the "sources" of a prolog var, skip
93+ any var-setting exprs that appear in non-used (and non-optimized) functions).
94 * Fixed bug #1070551 (zerr:ZOSE0003 stream read failure)
95 * Fixed bug #992304 (Compiling library modules could load data from wrong
96 source)
97 * Fixed bug #1043294 (XQST0036 not used in XQuery 3.0).
98+ * Fixed bug in castable expr when the target type is xs:QName.
99+ * Fixed bug in testing if a sequence type is subtype of node(xs:untyped)
100+ * Fixed mustCopyInputNodes() method of no-copy, and jsoniq functions.
101 * Fixed bugs related to casting to user-defined types.
102
103
104@@ -78,7 +73,7 @@
105 * Roundtripping of JSON items has been moved from the serializer to encoding functions.
106 * Added uuid to public API.
107 * Best-effort serialization of atomic values in JSON items.
108- * Positional pagination support for index probes
109+ * Positional pagination support for index probes
110 * Recognize the {http://www.zorba-xquery.com/extensions}no-copy pragma to avoid
111 copying nodes before insertion into a collection.
112 * Added createUntypedAtomic to API's ItemFactory.
113@@ -244,7 +239,7 @@
114 * Fixed bug #967864 (var substitution did not update theFreeVars property)
115 * Fixed bug #891650 (context size var not always declared within path expr)
116 * Fixed bug #948879 (--uri-path doesn't work with fetch:content())
117- * Fixed bug in MarkNodeCopyProps rule (static cast to replace_expr without chaing the expr kind first)
118+ * Fixed bug in MarkNodeCopyProps rule (static cast to replace_expr without chaing the expr kind first)
119 * Fixed bug in window iterator (binding the end vars in the output tuple stream)
120 * Fixed bug #866547 (protect index-join rule from general flwor)
121 * Fixed bug #867253 (cdml:delete-nodes should only remove root nodes)
122@@ -270,10 +265,10 @@
123
124 New Features:
125 * Add --compile-plan (-c) and --execute-plan (-e) options to zorba command line.
126- * Add XQuery 3.0 concat operator (http://www.w3.org/TR/xquery-30/#id-string-concat-expr)
127+ * Add XQuery 3.0 concat operator (http://www.w3.org/TR/xquery-30/#id-string-concat-expr)
128 * New URI module providing percent-decoding functions.
129 * The core parse-xml module is now able to parse input files in a streaming mode. A number of new options have also been added.
130- * LibXml2 version 2.7.0 or higher is now required in order to build Zorba.
131+ * LibXml2 version 2.7.0 or higher is now required in order to build Zorba.
132 * Added index management function to the C++ api's StaticCollectionManager.
133 * Added createDayTimeDuration, createYearMonthDuration, createDocumentNode, createCommentNode, createPiNode to api's ItemFactory.
134 * Fixed bug #905050 (setting and getting the context item type via the c++ api).
135@@ -292,7 +287,7 @@
136
137 Optimization:
138 * No-copy optimization: avoids copying nodes during node-constructor expressions.
139- * Added external function annotations %ann:propagates-input-nodes and
140+ * Added external function annotations %ann:propagates-input-nodes and
141 %ann:must-copy-input-nodes to be used by the no-copy optimization.
142 * Caching of results for recursive functions with atomic parameter and return types.
143 * Added %ann:cache and %ann:no-cache to enable or disable caching of results of functions with atomic parameter and return types.
144@@ -328,7 +323,7 @@
145 * Fixed bug #907872 (segfault when returning an input ItemSequence from an external function).
146 * Fixed bug in codegen: do not create a materialize clause if one exists already
147 support.
148- * Fixed bug involving positional var and groupby
149+ * Fixed bug involving positional var and groupby
150 * Fixed bug #867266 (do not hoist updating expressions)
151 * Fixed bug #867022 (added location and params to some XPTY0004 errors)
152 * zerr is not predeclared anymore to be http://www.zorba-xquery.com/errors
153@@ -345,17 +340,17 @@
154 * Fixed bug #951772 (Comment node crashes serialization)
155 * Fixed bug #945241 (StaticCollectionManager::declaredIndexes() and temporary indexes)
156
157-
158+
159 version 2.1
160
161 New Features:
162 * New node-position module. This module allows to obtain a representation of a node position, which
163 can be used to assess structural relationships with other nodes.
164 * New node-reference module. References can be obtained for any node, and
165- different nodes cannot have the same identifier.
166+ different nodes cannot have the same identifier.
167 * Custom Full-text thesaurus using Zorba URI resolver mechanism.
168- * Modified C++ API to add isSequential, getExternalVariables, isBoundContextItem and
169- isBoundExternalVariable Functions
170+ * Modified C++ API to add isSequential, getExternalVariables,
171+ isBoundContextItem and isBoundExternalVariable Functions
172 * Collection allows to retrieve information about the type
173 and the annotations of a static collection.
174 * Implemented the probe-index-range-value for general indexes
175@@ -390,7 +385,7 @@
176 corruption will occur)
177 * Fixed bug # (Should not destroy the parent of a node that is being detached
178 before the detach is done).
179- * Added const qualifier to StaticContext::getAuditEvent()
180+ * Added const qualifier to StaticContext::getAuditEvent()
181 * Fixed bug #3408181 (available-collection() returns undeclared collections)
182 * Fixed bug #859465 (Fatal error if a PUL contains two deactivate IC primitives)
183 * Fixed bug #859467 (Fatal error if a PUL contains two activate Foreign Key primitives)
184@@ -410,7 +405,7 @@
185 * Fixed bug #869024 (segmentation fault with node-reference)
186 * Fixed bug #869025 (segmentation fault with node-reference)
187 * New node-reference module. References can be obtained for any node, and
188- different nodes cannot have the same identifier.
189+ different nodes cannot have the same identifier.
190 * Fixed bug #872697 (segmentation fault with validation of NMTOKENS)
191 * General index cannot be declared as unique if the type of its key is
192 xs:anyAtomicType or xs:untypedAtomic.
193@@ -433,7 +428,7 @@
194 * Fixed bug #862089 (Split binary/xq install directories for modules) by
195 splitting "module path" into separate URI and Library paths
196 * New node-position module. This module allows to obtain a representation of a node position, which
197- can be used to assess structural relationships with other nodes.
198+ can be used to assess structural relationships with other nodes.
199 * Fixed bug #872502 (validation of the JSON module xqdoc fails)
200 * Fixed bug #897619 (testdriver_mt can not run the XQueryX tests)
201 * Fixed bug #867107 (xqdoc dependency to zorba is wrong)
202
203=== modified file 'NOTICE.txt'
204--- NOTICE.txt 2012-10-03 21:51:10 +0000
205+++ NOTICE.txt 2013-01-14 09:49:23 +0000
206@@ -1,5 +1,5 @@
207 -----------
208-Zorba 2.7.0
209+Zorba 2.8.0
210 -----------
211
212 (Note: This file is generated automatically from NOTICE.xml.
213
214=== modified file 'modules/ExternalModules.conf'
215--- modules/ExternalModules.conf 2013-01-10 20:26:23 +0000
216+++ modules/ExternalModules.conf 2013-01-14 09:49:23 +0000
217@@ -26,30 +26,31 @@
218 # "tag" is the VCS tag to check out (optional - defaults to HEAD;
219 # currently only works for bzr, since svn tags are just different URLS)
220
221-archive bzr lp:zorba/archive-module zorba-2.7
222-csv bzr lp:zorba/csv-module zorba-2.7
223-data-cleaning bzr lp:zorba/data-cleaning-module zorba-2.7
224-data-formatting bzr lp:zorba/data-formatting-module zorba-2.7
225-excel bzr lp:zorba/excel-module zorba-2.7
226-info-extraction bzr lp:zorba/info-extraction-module
227-geo bzr lp:zorba/geo-module zorba-2.7
228-geoproj bzr lp:zorba/geoproj-module
229-graphviz bzr lp:zorba/graphviz-module zorba-2.7
230-html bzr lp:zorba/html-module zorba-2.7
231-http-client bzr lp:zorba/http-client-module zorba-2.7
232-image bzr lp:zorba/image-module
233-jdbc bzr lp:zorba/jdbc-module
234-languages bzr lp:zorba/languages-module zorba-2.7
235-oracle-nosql-db bzr lp:zorba/oracle-nosql-db-module
236-oauth bzr lp:zorba/oauth-module zorba-2.7
237-process bzr lp:zorba/process-module zorba-2.7
238-read-pdf bzr lp:zorba/read-pdf-module zorba-2.7
239-security bzr lp:zorba/security-module
240-system bzr lp:zorba/system-module zorba-2.7
241-email bzr lp:zorba/email-module zorba-2.7
242-util-jvm bzr lp:zorba/util-jvm-module zorba-2.7
243-schema-tools bzr lp:zorba/schema-tools-module zorba-2.7
244-stack bzr lp:zorba/stack-module zorba-2.7
245-queue bzr lp:zorba/queue-module zorba-2.7
246-couchbase bzr lp:zorba/couchbase-module
247-sqlite bzr lp:zorba/sqlite-module
248+archive bzr lp:zorba/archive-module zorba-2.8
249+csv bzr lp:zorba/csv-module zorba-2.8
250+data-cleaning bzr lp:zorba/data-cleaning-module zorba-2.8
251+data-formatting bzr lp:zorba/data-formatting-module zorba-2.8
252+excel bzr lp:zorba/excel-module zorba-2.8
253+info-extraction bzr lp:zorba/info-extraction-module zorba-2.8
254+geo bzr lp:zorba/geo-module zorba-2.8
255+geoproj bzr lp:zorba/geoproj-module zorba-2.8
256+graphviz bzr lp:zorba/graphviz-module zorba-2.8
257+html bzr lp:zorba/html-module zorba-2.8
258+http-client bzr lp:zorba/http-client-module zorba-2.8
259+image bzr lp:zorba/image-module zorba-2.8
260+jdbc bzr lp:zorba/jdbc-module zorba-2.8
261+languages bzr lp:zorba/languages-module zorba-2.8
262+oracle-nosql-db bzr lp:zorba/oracle-nosql-db-module zorba-2.8
263+oauth bzr lp:zorba/oauth-module zorba-2.8
264+process bzr lp:zorba/process-module zorba-2.8
265+read-pdf bzr lp:zorba/read-pdf-module zorba-2.8
266+security bzr lp:zorba/security-module zorba-2.8
267+system bzr lp:zorba/system-module zorba-2.8
268+email bzr lp:zorba/email-module zorba-2.8
269+util-jvm bzr lp:zorba/util-jvm-module zorba-2.8
270+schema-tools bzr lp:zorba/schema-tools-module zorba-2.8
271+stack bzr lp:zorba/stack-module zorba-2.8
272+queue bzr lp:zorba/queue-module zorba-2.8
273+couchbase bzr lp:zorba/couchbase-module zorba-2.8
274+sqlite bzr lp:zorba/sqlite-module zorba-2.8
275+

Subscribers

People subscribed via source and target branches