Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/218862 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/218862 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/218862 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
Fixed JSON-to-XML bug.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/218862
Fixed JSON-to-XML bug.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/218862
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'modules/json/json-csv.jq'
--- modules/json/json-csv.jq 2014-03-05 23:36:00 +
+++ modules/json/json-csv.jq 2014-05-08 18:38:36 +
@@ -141,7 +141,6 @@
: character.
: @error csv:INVALID_CSV_VALUE if a value of some key is not castable to
: string.
- : codefield-names/code option is not a string.
: @error csv:MISSING_VALUE if a missing value is detected and the
: codemissing-value/code option is codeerror/code.
: @error csv:EXTRA_VALUE if an extra value is detected and the
=== modified file 'src/runtime/json/snelson.cpp'
--- src/runtime/json/snelson.cpp 2014-03-20 01:59:46 +
+++ src/runtime/json/snelson.cpp 2014-05-08 18:38:36 +
@@ -176,10 +176,9 @@
POP_ITERATOR();
POP_STATE();
POP_ITEM_ELEMENT();
- if ( IN_STATE( in_object ) ) {
+ if ( IN_STATE( in_object ) )
POP_ITEM( xml );
-POP_ITEM( json );
- }
+ POP_ITEM( json );
continue;
}
if ( IN_STATE( in_object ) ) {
@@ -198,7 +197,6 @@
case store::JS_NULL:
ADD_TYPE_ATTRIBUTE( null );
ADD_ITEM_ELEMENT( null );
-POP_ITEM_ELEMENT();
break;
case store::XS_BOOLEAN:
@@ -206,7 +204,6 @@
ADD_ITEM_ELEMENT( boolean );
value_str = value_item-getBooleanValue() ? true : false;
GENV_ITEMFACTORY-createTextNode( junk_item, xml_item, value_str );
-POP_ITEM_ELEMENT();
break;
case store::XS_BYTE:
@@ -229,7 +226,6 @@
ADD_ITEM_ELEMENT( number );
value_str = value_item-getStringValue();
GENV_ITEMFACTORY-createTextNode( junk_item, xml_item, value_str );
-POP_ITEM_ELEMENT();
break;
default:
@@ -237,8 +233,8 @@
ADD_ITEM_ELEMENT( string );
value_str = value_item-getStringValue();
GENV_ITEMFACTORY-createTextNode( junk_item, xml_item, value_str );
-POP_ITEM_ELEMENT();
} // switch
+POP_ITEM_ELEMENT();
break;
case store::Item::ARRAY:
=== added file 'test/rbkt/ExpQueryResults/zorba/json/json-snelson-j2x-object-07.xml.res'
--- test/rbkt/ExpQueryResults/zorba/json/json-snelson-j2x-object-07.xml.res 1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/json/json-snelson-j2x-object-07.xml.res 2014-05-08 18:38:36 +
@@ -0,0 +1,10 @@
+json xmlns=http://john.snelson.org.uk/parsing-json-into-xquery; type=object
+ pair name=a type=object
+pair name=b type=array
+ item type=object
+pair name=c type=null/
+ /item
+/pair
+ /pair
+ pair name=d type=null/
+/json
=== added file 'test/rbkt/Queries/zorba/json/json-snelson-j2x-object-07.xq'
--- test/rbkt/Queries/zorba/json/json-snelson-j2x-object-07.xq 1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/json/json-snelson-j2x-object-07.xq 2014-05-08 18:38:36 +
@@ -0,0 +1,12 @@
+import module namespace jx = http://zorba.io/modules/json-xml;;
+
+let $json :=
+ {
+a : {
+ b : [ { c : null } ]
+},
+d : null
+ }
+return jx:json-to-xml( $json )
+
+(: vim:set et sw=2 ts=2: :)
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/api-var-annot into lp:zorba
BTW: going with Matthias' private comments to me on another matter: until somebody asks for it, we should focus on 28msec's immediate needs. -- https://code.launchpad.net/~zorba-coders/zorba/api-var-annot/+merge/218485 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/api-var-annot into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/api-var-annot/+merge/218485 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/api-var-annot into lp:zorba
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/api-var-annot into
lp:zorba.
Commit message:
Added public introspection API for external variable annotations.
Requested reviews:
Matthias Brantner (matthias-brantner)
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/api-var-annot/+merge/218485
Added public introspection API for external variable annotations.
--
https://code.launchpad.net/~zorba-coders/zorba/api-var-annot/+merge/218485
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/annotation.h'
--- include/zorba/annotation.h 2013-06-12 04:55:14 +
+++ include/zorba/annotation.h 2014-05-06 18:07:18 +
@@ -55,6 +55,9 @@
*/
virtual Item
getLiteral(unsigned int i) const = 0;
+
+protected:
+ Annotation() { }
};
} /* namespace zorba */
=== modified file 'include/zorba/static_context.h'
--- include/zorba/static_context.h 2013-09-16 09:08:27 +
+++ include/zorba/static_context.h 2014-05-06 18:07:18 +
@@ -651,6 +651,18 @@
virtual void
getExternalVariables(Iterator_t aVarsIter) const = 0;
+ /** \brief Gets the Annotations (if any) for the given external variable.
+ *
+ * @param var_name The QName of the variable.
+ * @param result The vector into which to put all of the variable's
+ * annotations.
+ * @return Returns \c true only if the given external variable exists and has
+ * at least one annotation.
+ */
+ virtual bool
+ getExternalVariableAnnotations( Item const var_name,
+ std::vectorAnnotation_t result ) const = 0;
+
/**
* @brief Set the URI lookup path (list of filesystem directories) for this
* static context.
=== modified file 'src/annotations/annotations.h'
--- src/annotations/annotations.h 2014-04-16 18:23:55 +
+++ src/annotations/annotations.h 2014-05-06 18:07:18 +
@@ -189,6 +189,10 @@
size_type size() const { return theAnnotationList.size(); }
+ void swap( AnnotationList a ) {
+theAnnotationList.swap( a.theAnnotationList );
+ }
+
AnnotationInternal* get(size_type index) const;
AnnotationInternal* get(AnnotationInternal::AnnotationId id) const;
=== modified file 'src/api/staticcontextimpl.cpp'
--- src/api/staticcontextimpl.cpp 2013-12-14 00:44:26 +
+++ src/api/staticcontextimpl.cpp 2014-05-06 18:07:18 +
@@ -1797,12 +1797,30 @@
extVars.push_back((*ite)-getName());
}
- Iterator_t vIter = new VectorIterator(extVars, theDiagnosticHandler);
- aVarsIter = vIter;
+ aVarsIter = new VectorIterator(extVars, theDiagnosticHandler);
ZORBA_CATCH
}
+bool StaticContextImpl::
+getExternalVariableAnnotations( Item const api_qname,
+std::vectorAnnotation_t result ) const {
+ store::Item const *const qname = Unmarshaller::getInternalItem( api_qname );
+ VarInfo const *const var_info = theCtx-lookup_var( qname );
+ if ( var_info var_info-isExternal() ) {
+if ( var_expr const *const var_expr = var_info-getVar() ) {
+ AnnotationList const annotation_list = var_expr-get_annotations();
+ AnnotationList::size_type const n = annotation_list.size();
+ result.clear();
+ for ( AnnotationList::size_type i = 0; i n; ++i )
+result.push_back( new AnnotationImpl( annotation_list.get( i ) ) );
+ return !!n;
+}
+ }
+ return false;
+}
+
+
Item
StaticContextImpl::fetch(const String aURI) const
{
=== modified file 'src/api/staticcontextimpl.h'
--- src/api/staticcontextimpl.h 2013-09-26 09:38:51 +
+++ src/api/staticcontextimpl.h 2014-05-06 18:07:18 +
@@ -307,6 +307,10 @@
virtual void
getExternalVariables(Iterator_t aVarsIter) const;
+ virtual bool
+ getExternalVariableAnnotations( Item const,
+ std::vectorAnnotation_t ) const;
+
virtual void
setURIPath(const std::vectorString aURIPath);
=== modified file 'src/compiler/expression/var_expr.h'
--- src/compiler/expression/var_expr.h 2013-09-12 07:54:03 +
+++ src/compiler/expression/var_expr.h 2014-05-06 18:07:18 +
@@ -17,6 +17,7 @@
#ifndef ZORBA_COMPILER_VAR_EXPR
#define ZORBA_COMPILER_VAR_EXPR
+#include annotations/annotations.h
#include compiler/expression/expr_base.h
namespace zorba
@@ -178,6 +179,8 @@
VarInfo * theVarInfo;
+ AnnotationListtheAnnotations;
+
csize theNumRefs;
bool theIsExternal;
@@ -207,6 +210,14 @@
public:
void set_var_info(VarInfo* v);
+ AnnotationList const get_annotations() const {
+return theAnnotations;
+ }
+
+ void swap_annotations( AnnotationList a ) {
+theAnnotations.swap( a );
+ }
+
VarInfo* get_var_info() const { return theVarInfo; }
ulong get_unique_id() const { return theUniqueId; }
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2014-04-16 18:23:55 +
+++ src/compiler/translator
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/api-var-annot into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/api-var-annot into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/api-var-annot/+merge/218485 -- https://code.launchpad.net/~zorba-coders/zorba/api-var-annot/+merge/218485 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/api-var-annot into lp:zorba
Why not allow introspection for non external variables? Does it make sense to restrict it? I personally don't care, but the function getExternalVariables() in StaticContext was already there and there is *not* any getAllVariables() (or some such). Since you can't introspect just the names of non-external variables, I didn't see any point in allowing you to get the annotations for them. -- https://code.launchpad.net/~zorba-coders/zorba/api-var-annot/+merge/218485 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-boost-typedef into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix-boost-typedef/+merge/217976 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-boost-typedef into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-boost-typedef into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-boost-typedef/+merge/217976 -- https://code.launchpad.net/~zorba-coders/zorba/fix-boost-typedef/+merge/217976 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba has been updated. Commit Message changed to: 1. setVariable() now supports casting elements of sequences. 2. Cleaned-up some headers. 3. zorba command now supports converting multiple values for the same variable into a sequence, e.g.: zorba -e x:=1 -e x:=2 -q 'declare variable $x as xs:integer+ external; $x' returns: 1 2 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217539 -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217539 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba has been updated. Description changed to: 1. setVariable() now supports casting elements of sequences. 2. Cleaned-up some headers. 3. zorba command now supports converting multiple values for the same variable into a sequence, e.g.: zorba -e x:=1 -e x:=2 -q 'declare variable $x as xs:integer+ external; $x' returns: 1 2 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217539 -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217539 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba has been updated. Description changed to: 1. setVariable() now supports casting elements of sequences. 2. Cleaned-up some headers. 3. zorba command now supports converting multiple values for the same variable into a sequence, e.g.: zorba -e x:=1 -e x:=2 -q 'declare variable $x as xs:integer+ external; $x' returns: 1 2 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217539 -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217539 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/feature-setvar-typed
into lp:zorba.
Commit message:
Added make_iterator() that's more reasonable than ItemSequence (which should
eventually be deprecated and removed since it's rather pointless).
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217830
Added make_iterator() that's more reasonable than ItemSequence (which should
eventually be deprecated and removed since it's rather pointless).
--
https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217830
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'bin/zorbacmd.cpp'
--- bin/zorbacmd.cpp 2014-04-29 23:20:42 +
+++ bin/zorbacmd.cpp 2014-04-30 21:33:35 +
@@ -39,7 +39,6 @@
#include zorba/store_manager.h
#include zorba/uri_resolvers.h
#include zorba/util/fs_util.h
-#include zorba/vector_item_sequence.h
#include zorba/xquery_exception.h
#include zorba/xquery_functions.h
#include zorba/zorba.h
@@ -281,8 +280,7 @@
break;
++i;
} // while
- VectorItemSequence var_seq( vars );
- dctx-setVariable( var_name, var_seq.getIterator(), true );
+ dctx-setVariable( var_name, make_iterator( vars ), true );
}
}
}
=== modified file 'include/zorba/iterator.h'
--- include/zorba/iterator.h 2014-01-15 02:07:22 +
+++ include/zorba/iterator.h 2014-04-30 21:33:35 +
@@ -16,12 +16,17 @@
#ifndef ZORBA_ITERATOR_API_H
#define ZORBA_ITERATOR_API_H
-#include zorba/config.h
+// standard
+#include cassert
+
+// Zorba
#include zorba/api_shared_types.h
-#include zorba/item_sequence.h
+#include zorba/internal/type_traits.h
namespace zorba {
+///
+
/**
* \brief Interface for an Iterator over a sequence of items.
*
@@ -96,7 +101,64 @@
skip(int64_t count);
};
-
-} /* namespace zorba */
+///
+
+/**
+ * Creates an \c Iterator over some container type of \c Item, e.g.,
+ * codevectorlt;Itemgt;/code.
+ *
+ * @param container The container to create the \c Iterator over.
+ * @param copy If \c false, \a container is swapped with an internal one thus
+ * clearing \a container; if \c true, a copy of \a container is made instead.
+ * @return Returns a new \c Iterator over \a container.
+ */
+templateclass ContainerType
+typename std::enable_if
+ std::is_sametypename ContainerType::value_type,Item::value,Iterator_t::type
+make_iterator( ContainerType container, bool copy = false ) {
+
+ struct iterator_impl : Iterator {
+iterator_impl( ContainerType container, bool copy ) : open_( false ) {
+ if ( copy )
+container_ = container;
+ else
+container_.swap( container );
+}
+
+void close() {
+ assert( open_ );
+ open_ = false;
+}
+
+bool isOpen() const {
+ return open_;
+}
+
+bool next( Item result ) {
+ assert( open_ );
+ if ( pos_ == container_.end() )
+return false;
+ result = *pos_;
+ ++pos_;
+ return true;
+}
+
+void open() {
+ assert( !open_ );
+ pos_ = container_.begin();
+ open_ = true;
+}
+
+ContainerType container_;
+bool open_;
+typename ContainerType::const_iterator pos_;
+ };
+
+ return Iterator_t( new iterator_impl( container, copy ) );
+};
+
+///
+
+} // namespace zorba
#endif
/* vim:set et sw=2 ts=2: */
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217830 -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217830 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217830 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed--email into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--email/+merge/217844 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed--jdbc into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--jdbc/+merge/217845 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed--email into lp:zorba/email-module
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/feature-setvar-typed--email into lp:zorba/email-module. Commit message: Fixed #include. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--email/+merge/217846 Fixed #include. -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--email/+merge/217846 Your team Zorba Coders is subscribed to branch lp:zorba/email-module. === modified file 'src/com/zorba-xquery/www/modules/email/imap.xq.src/imap_function.cpp' --- src/com/zorba-xquery/www/modules/email/imap.xq.src/imap_function.cpp 2013-07-30 19:05:41 + +++ src/com/zorba-xquery/www/modules/email/imap.xq.src/imap_function.cpp 2014-04-30 23:09:07 + @@ -24,6 +24,7 @@ #include zorba/diagnostic_list.h #include zorba/iterator.h +#include zorba/item_sequence.h #include zorba/user_exception.h #include zorba/util/base64_util.h #include zorba/zorba.h === modified file 'src/com/zorba-xquery/www/modules/email/smtp.xq.src/smtp_function.cpp' --- src/com/zorba-xquery/www/modules/email/smtp.xq.src/smtp_function.cpp 2011-09-30 14:44:37 + +++ src/com/zorba-xquery/www/modules/email/smtp.xq.src/smtp_function.cpp 2014-04-30 23:09:07 + @@ -16,6 +16,7 @@ #include zorba/zorba.h #include zorba/iterator.h +#include zorba/item_sequence.h #include zorba/user_exception.h #include zorba/xquery_functions.h #include zorba/store_consts.h -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed--email into lp:zorba/email-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--email/+merge/217846 Your team Zorba Coders is subscribed to branch lp:zorba/email-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed--email into lp:zorba/email-module
The proposal to merge lp:~zorba-coders/zorba/feature-setvar-typed--email into lp:zorba/email-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--email/+merge/217846 -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--email/+merge/217846 Your team Zorba Coders is subscribed to branch lp:zorba/email-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed--jdbc into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/feature-setvar-typed--jdbc into lp:zorba/jdbc-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--jdbc/+merge/217847 -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--jdbc/+merge/217847 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed--jdbc into lp:zorba/jdbc-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--jdbc/+merge/217847 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed--jdbc into lp:zorba/jdbc-module
Paul J. Lucas has proposed merging
lp:~zorba-coders/zorba/feature-setvar-typed--jdbc into lp:zorba/jdbc-module.
Commit message:
Fixed #include.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--jdbc/+merge/217847
Fixed #include.
--
https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--jdbc/+merge/217847
Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module.
=== modified file 'include/jsonitemsequence.h'
--- include/jsonitemsequence.h 2012-12-22 14:35:53 +
+++ include/jsonitemsequence.h 2014-04-30 23:09:32 +
@@ -19,8 +19,11 @@
#include map
#include string
+#include jni.h
+
#include zorba/zorba.h
-#include jni.h
+#include zorba/iterator.h
+#include zorba/item_sequence.h
namespace zorba
{
@@ -77,4 +80,4 @@
}}; // namespace zorba, jdbc
-#endif
\ No newline at end of file
+#endif
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba has been updated. Description changed to: Added make_iterator() that's more reasonable than ItemSequence (which should eventually be deprecated and removed since it's rather pointless). https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--email/+merge/217846 https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--jdbc/+merge/217847 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217830 -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217830 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed--graphviz into lp:zorba/graphviz-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--graphviz/+merge/217861 Your team Zorba Coders is subscribed to branch lp:zorba/graphviz-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed--graphviz into lp:zorba/graphviz-module
The proposal to merge lp:~zorba-coders/zorba/feature-setvar-typed--graphviz into lp:zorba/graphviz-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--graphviz/+merge/217861 -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--graphviz/+merge/217861 Your team Zorba Coders is subscribed to branch lp:zorba/graphviz-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba has been updated. Description changed to: Added make_iterator() that's more reasonable than ItemSequence (which should eventually be deprecated and removed since it's rather pointless). https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--email/+merge/217846 https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--jdbc/+merge/217847 https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--graphviz/+merge/217861 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217830 -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217830 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed--graphviz into lp:zorba/graphviz-module
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/feature-setvar-typed--graphviz into lp:zorba/graphviz-module. Commit message: Fixed header. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--graphviz/+merge/217861 Fixed header. -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed--graphviz/+merge/217861 Your team Zorba Coders is subscribed to branch lp:zorba/graphviz-module. === modified file 'src/com/zorba-xquery/www/modules/image/graphviz.xq.src/graphviz.h' --- src/com/zorba-xquery/www/modules/image/graphviz.xq.src/graphviz.h 2012-06-05 13:24:57 + +++ src/com/zorba-xquery/www/modules/image/graphviz.xq.src/graphviz.h 2014-05-01 01:58:51 + @@ -17,9 +17,12 @@ #ifndef ZORBA_GRAPHVIZMODULE_GRAPHVIZ_H #define ZORBA_GRAPHVIZMODULE_GRAPHVIZ_H +// standard #include map +// Zorba #include zorba/iterator.h +#include zorba/item_sequence.h #include zorba/zorba.h #include zorba/function.h #include zorba/external_module.h -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba has been updated. Commit Message changed to: 1. setVariable() now supports casting elements of sequences. 2. Cleaned-up some headers. 3. zorba command now supports converting multiple values for the same variable into a sequence, e.g.: zorba -e x:=1 -e x:=2 -q 'declare variable $x as xs:integer+ external;' returns: 1 2 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217539 -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217539 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba has been updated. Description changed to: 1. setVariable() now supports casting elements of sequences. 2. Cleaned-up some headers. 3. zorba command now supports converting multiple values for the same variable into a sequence, e.g.: zorba -e x:=1 -e x:=2 -q 'declare variable $x as xs:integer+ external;' returns: 1 2 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217539 -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217539 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/feature-setvar-typed
into lp:zorba.
Commit message:
1. setVariable() now supports casting elements of sequences.
2. zorba command now supports converting multiple values for the same variable
into a sequence, e.g.:
zorba -e x:=1 -e x:=2 -q 'declare variable $x as xs:integer+ external;'
returns:
1 2
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217539
1. setVariable() now supports casting elements of sequences.
2. zorba command now supports converting multiple values for the same variable
into a sequence, e.g.:
zorba -e x:=1 -e x:=2 -q 'declare variable $x as xs:integer+ external;'
returns:
1 2
--
https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217539
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'bin/zorbacmd.cpp'
--- bin/zorbacmd.cpp 2014-04-25 22:46:44 +
+++ bin/zorbacmd.cpp 2014-04-29 01:37:07 +
@@ -15,9 +15,11 @@
*/
// standard
+#include algorithm
#include cassert
#include fstream
#include iostream
+#include memory
#include sstream
#include string
#include vector
@@ -68,6 +70,63 @@
///
+class VarSeqIterator : public Iterator {
+public:
+ void push_back( Item const item ) {
+items_.push_back( item );
+ }
+
+ // inherited
+ voidclose();
+ int64_t count();
+ boolisOpen() const;
+ boolnext( Item );
+ voidopen();
+ voidreset();
+ boolskip( int64_t );
+
+private:
+ typedef vectorItem items_type;
+ items_type items_;
+ bool is_open_;
+ items_type::size_type pos_;
+};
+
+void VarSeqIterator::close() {
+ is_open_ = false;
+}
+
+int64_t VarSeqIterator::count() {
+ return items_.size();
+}
+
+bool VarSeqIterator::isOpen() const {
+ return is_open_;
+}
+
+bool VarSeqIterator::next( Item result ) {
+ if ( pos_ items_.size() ) {
+result = items_[ pos_++ ];
+return true;
+ }
+ return false;
+}
+
+void VarSeqIterator::open() {
+ pos_ = 0;
+ is_open_ = true;
+}
+
+void VarSeqIterator::reset() {
+ pos_ = 0;
+}
+
+bool VarSeqIterator::skip( int64_t count ) {
+ return (pos_ += count) items_.size();
+}
+
+///
+
static const char copyright[] =
Copyright 2006-2014 The FLWOR Foundation.\n
License: Apache License 2.0: http://www.apache.org/licenses/LICENSE-2.0;
@@ -228,7 +287,7 @@
}
bool populateDynamicContext( Zorba *zorba, DynamicContext *dctx ) {
- ZorbaCmdProperties const zc_props = ZorbaCmdProperties::instance();
+ ZorbaCmdProperties zc_props = ZorbaCmdProperties::instance();
XmlDataManager_t xmlMgr;
if ( !zc_props.ctx_item_.empty() ) {
@@ -238,9 +297,23 @@
dctx-setContextItem( doc );
}
- external_vars::const_iterator i = zc_props.external_vars_.begin();
- external_vars::const_iterator const end = zc_props.external_vars_.end();
- for ( ; i != end; ++i ) {
+ // sort vars: x:=1 y:=foo x:=2 -- x:=1 x:=2 y:=foo
+ stable_sort( zc_props.external_vars_.begin(), zc_props.external_vars_.end() );
+
+ external_vars::const_iterator i;
+ external_vars::const_iterator const end( zc_props.external_vars_.end() );
+
+ //
+ // Count how many of each variable there are to know whether there are
+ // multiple values for the same variable. If there are, we have to create an
+ // Iterator for them later.
+ //
+ typedef mapString,int var_count_type;
+ var_count_type var_count;
+ for ( i = zc_props.external_vars_.begin(); i != end; ++i )
+++var_count[ i-var_name ];
+
+ for ( i = zc_props.external_vars_.begin(); i != end; ++i ) {
try {
if ( i-inline_file ) {
ifstream is( i-var_value.c_str() );
@@ -249,8 +322,26 @@
Item doc( xmlMgr-parseXML( is ) );
dctx-setVariable( i-var_name, doc );
} else {
-Item item( zorba-getItemFactory()-createString( i-var_value ) );
-dctx-setVariable( i-var_name, item, true );
+int count = var_count[ i-var_name ];
+if ( count == 1 ) {
+ // easy case: only a single value
+ Item item( zorba-getItemFactory()-createString( i-var_value ) );
+ dctx-setVariable( i-var_name, item, true );
+} else {
+ // hard case: multiple values -- construct an Iterator
+ auto_ptrVarSeqIterator var_seq_iter( new VarSeqIterator );
+ String const var_name( i-var_name );
+ while ( true ) {
+Item item( zorba-getItemFactory()-createString( i-var_value ) );
+var_seq_iter-push_back( item );
+if ( !--count )
+ break;
+++i;
+ } // while
+ Iterator_t iter( var_seq_iter.get() );
+ var_seq_iter.release();
+ dctx-setVariable( var_name, iter, true );
+}
}
}
catch
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217539 -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217539 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217539 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba has been updated. Description changed to: 1. Added the ability to do casting when setting the value of an external variable. 2. The zorba command now always requests casting. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217313 -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217313 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba has been updated. Commit Message changed to: 1. Added the ability to do casting when setting the value of an external variable. 2. The zorba command now always requests casting. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217313 -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217313 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217313 -- https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217313 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba. Commit message: Added missing #include cassert all over. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/216803 Added missing #include cassert all over. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/216803 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'src/api/item_seq_chainer.h' --- src/api/item_seq_chainer.h 2013-08-01 11:59:51 + +++ src/api/item_seq_chainer.h 2014-04-23 00:41:51 + @@ -19,7 +19,7 @@ #include vector #include set -#include assert.h +#include cassert #include zorba/config.h #include zorba/item_sequence.h === modified file 'src/runtime/base/narybase.h' --- src/runtime/base/narybase.h 2014-02-12 02:25:45 + +++ src/runtime/base/narybase.h 2014-04-23 00:41:51 + @@ -17,6 +17,7 @@ #ifndef ZORBA_RUNTIME_NARY_ITERATOR #define ZORBA_RUNTIME_NARY_ITERATOR +#include cassert #include vector #include common/shared_types.h === modified file 'src/runtime/base/unarybase.h' --- src/runtime/base/unarybase.h 2014-02-12 02:25:45 + +++ src/runtime/base/unarybase.h 2014-04-23 00:41:51 + @@ -17,6 +17,8 @@ #ifndef ZORBA_RUNTIME_UNARY_ITERATOR #define ZORBA_RUNTIME_UNARY_ITERATOR +#include cassert + #include common/shared_types.h #include runtime/base/plan_iterator.h === modified file 'src/runtime/util/handle_hashmap_item_value.h' --- src/runtime/util/handle_hashmap_item_value.h 2013-02-07 17:24:36 + +++ src/runtime/util/handle_hashmap_item_value.h 2014-04-23 00:41:51 + @@ -16,6 +16,8 @@ #ifndef ZORBA_STORE_HANDLE_HAHSET_ITEM_VALUE_H #define ZORBA_STORE_HANDLE_HAHSET_ITEM_VALUE_H +#include cassert + #include zorbautils/hashmap.h #include runtime/booleans/BooleanImpl.h #include runtime/api/runtimecb.h === modified file 'src/store/naive/atomic_items.h' --- src/store/naive/atomic_items.h 2013-06-26 10:59:37 + +++ src/store/naive/atomic_items.h 2014-04-23 00:41:51 + @@ -17,11 +17,12 @@ #ifndef ZORBA_STORE_ATOMIC_ITEMS_H #define ZORBA_STORE_ATOMIC_ITEMS_H -#include zorba/config.h +#include cassert #include iostream #include vector #include cstring +#include zorba/config.h #include zorba/streams.h #ifndef ZORBA_NO_FULL_TEXT #include zorba/tokenizer.h === modified file 'src/store/naive/node_items.h' --- src/store/naive/node_items.h 2013-06-29 08:38:53 + +++ src/store/naive/node_items.h 2014-04-23 00:41:51 + @@ -17,6 +17,7 @@ #ifndef ZORBA_SIMPLE_STORE_NODE_ITEMS #define ZORBA_SIMPLE_STORE_NODE_ITEMS +#include cassert #include stack #include vector === modified file 'src/store/naive/node_iterators.h' --- src/store/naive/node_iterators.h 2013-06-15 02:57:08 + +++ src/store/naive/node_iterators.h 2014-04-23 00:41:51 + @@ -16,6 +16,7 @@ #ifndef ZORBA_SIMPLE_STORE_NODE_ITERATORS #define ZORBA_SIMPLE_STORE_NODE_ITERATORS +#include cassert #include set #include vector === modified file 'src/store/naive/ordpath.h' --- src/store/naive/ordpath.h 2013-02-26 04:12:43 + +++ src/store/naive/ordpath.h 2014-04-23 00:41:51 + @@ -17,6 +17,7 @@ #ifndef ZORBA_STORE_ORDPATH_H #define ZORBA_STORE_ORDPATH_H +#include cassert #include vector #include zorba/config.h === modified file 'src/store/naive/simple_index_general.h' --- src/store/naive/simple_index_general.h 2013-02-07 17:24:36 + +++ src/store/naive/simple_index_general.h 2014-04-23 00:41:51 + @@ -16,6 +16,7 @@ #ifndef ZORBA_SIMPLE_STORE_INDEX_HASH_GENERAL #define ZORBA_SIMPLE_STORE_INDEX_HASH_GENERAL +#include cassert #include map #include simple_index.h === modified file 'src/store/naive/text_node_content.h' --- src/store/naive/text_node_content.h 2013-02-07 17:24:36 + +++ src/store/naive/text_node_content.h 2014-04-23 00:41:51 + @@ -17,6 +17,7 @@ #ifndef ZORBA_SIMPLE_STORE_TEXT_NODE_CONTENT #define ZORBA_SIMPLE_STORE_TEXT_NODE_CONTENT +#include cassert #include cstring /* for memset(3) */ #include shared_types.h === modified file 'src/system/globalenv.h' --- src/system/globalenv.h 2013-12-25 03:43:06 + +++ src/system/globalenv.h 2014-04-23 00:41:51 + @@ -17,6 +17,8 @@ #ifndef ZORBA_GLOBALENV_H #define ZORBA_GLOBALENV_H +#include cassert + #include zorba/config.h #include zorba/internal/unique_ptr.h === modified file 'src/types/typeimpl.h' --- src/types/typeimpl.h 2013-09-23 09:11:02 + +++ src/types/typeimpl.h 2014-04-23 00:41:51 + @@ -17,6 +17,8 @@ #ifndef ZORBA_TYPEIMPL_H #define ZORBA_TYPEIMPL_H +#include cassert + #include common/shared_types.h #include types/node_test.h === modified file 'src/util/string/default_rep.h' --- src/util/string/default_rep.h 2013-08-02 18:56:15 + +++ src/util/string/default_rep.h 2014-04-23 00:41:51 + @@ -17,6 +17,7 @@ #ifndef ZORBA_RSTRING_DEFAULT_REP_H #define ZORBA_RSTRING_DEFAULT_REP_H +#include
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/216803 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/216803 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/216803 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
Fixed CSV quote-parsing bug.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/215776
Fixed CSV quote-parsing bug.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/215776
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/util/csv_parser.cpp'
--- src/util/csv_parser.cpp 2014-03-06 19:06:43 +
+++ src/util/csv_parser.cpp 2014-04-14 23:00:32 +
@@ -20,10 +20,22 @@
// local
#include csv_parser.h
+using namespace std;
+
namespace zorba {
///
+inline bool peek( istream is, char c ) {
+ char const temp = is.peek();
+ bool const peeked = is.good();
+ if ( peeked )
+c = temp;
+ return peeked;
+}
+
+///
+
bool csv_parser::next_value( zstring *value, bool *eol, bool *quoted ) const {
ztd::string_appenderzstring,128 appender( value );
char c;
@@ -35,7 +47,9 @@
while ( is_-get( c ) ) {
if ( in_quote ) {
if ( quote_esc_ == quote_ ) { //
-if ( c == quote_ (c = is_-peek(), is_-good()) ) {
+if ( c == quote_ ) {
+ if ( !peek( *is_, c ) )
+break;
if ( c != quote_ ) {
in_quote = false;
continue;
@@ -61,7 +75,7 @@
}
switch ( c ) {
case '\r':
- if ( ((c = is_-peek()), is_-good()) c == '\n' )
+ if ( peek( *is_, c ) c == '\n' )
is_-get();
// no break;
case '\n':
=== added file 'test/rbkt/ExpQueryResults/zorba/csv/csv-parse-02.xml.res'
--- test/rbkt/ExpQueryResults/zorba/csv/csv-parse-02.xml.res 1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/csv/csv-parse-02.xml.res 2014-04-14 23:00:32 +
@@ -0,0 +1,4 @@
+{
+ key_1 : value_1,
+ key_2 : value_2
+}
=== added file 'test/rbkt/Queries/zorba/csv/csv-parse-02.jq'
--- test/rbkt/Queries/zorba/csv/csv-parse-02.jq 1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/csv/csv-parse-02.jq 2014-04-14 23:00:32 +
@@ -0,0 +1,9 @@
+xquery version 1.0;
+
+import module namespace csv = http://zorba.io/modules/json-csv;;
+
+let $csvString2 := key_1,key_2
+value_1,value_2
+return csv:parse( $csvString2 )
+
+(: vim:set et sw=2 ts=2: :)
=== added file 'test/rbkt/Queries/zorba/csv/csv-parse-02.spec'
--- test/rbkt/Queries/zorba/csv/csv-parse-02.spec 1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/csv/csv-parse-02.spec 2014-04-14 23:00:32 +
@@ -0,0 +1,1 @@
+Serialization: indent=yes
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/215776 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/215776 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/215776 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/213942 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Description changed to: 1. Fixed user-reported core-dump for JSON-to-XML conversion. 2. Now also using getNameAsString() in PlanIterator. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211848 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211848 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Commit Message changed to: 1. Fixed user-reported core-dump for JSON-to-XML conversion. 2. Now also using getNameAsString() in PlanIterator. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211848 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211848 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211150 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The parser changes are the unintentional consequences of the recent orthogonal parser changes on the no_commas branch. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211150 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/no_commas into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/no_commas/+merge/210707 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/no_commas into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/no_commas into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/no_commas/+merge/210707 -- https://code.launchpad.net/~zorba-coders/zorba/no_commas/+merge/210707 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/210509 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/210509 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/210509 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/csv/csv_impl.cpp'
--- src/runtime/csv/csv_impl.cpp 2014-03-01 01:57:00 +
+++ src/runtime/csv/csv_impl.cpp 2014-03-06 19:08:12 +
@@ -365,7 +365,7 @@
store::Item_t item;
vectorstore::Item_t keys_copy, values;
setunsigned keys_omit;
- zstring value;
+ zstring *value;
bool eol, quoted, swap_keys = false;
CsvParseIteratorState *state;
@@ -381,7 +381,8 @@
set_options( item, state );
}
- while ( state-csv_.next_value( value, eol, quoted ) ) {
+ while ( state-csv_.next_value( state-value_, eol, quoted ) ) {
+value = state-value_;
if ( state-keys_.size() values.size() == state-keys_.size()
state-extra_name_.empty() ) {
//
@@ -390,13 +391,13 @@
//
throw XQUERY_EXCEPTION(
csv::EXTRA_VALUE,
-ERROR_PARAMS( value, state-line_no_ ),
+ERROR_PARAMS( *value, state-line_no_ ),
ERROR_LOC( loc )
);
}
item = nullptr;
-if ( value.empty() ) {
+if ( value-empty() ) {
if ( state-keys_.empty() ) {
//
// Header field names can never be empty.
@@ -408,7 +409,7 @@
);
}
if ( quoted )
-GENV_ITEMFACTORY-createString( item, value );
+GENV_ITEMFACTORY-createString( item, *value );
else
switch ( state-missing_ ) {
case missing::error:
@@ -421,15 +422,15 @@
break;
}
} else if ( state-cast_unquoted_ !quoted !state-keys_.empty() ) {
- if ( value == T || value == Y )
+ if ( *value == T || *value == Y )
GENV_ITEMFACTORY-createBoolean( item, true );
- else if ( value == F || value == N )
+ else if ( *value == F || *value == N )
GENV_ITEMFACTORY-createBoolean( item, false );
else {
json::token t;
-switch ( parse_json( value, t ) ) {
+switch ( parse_json( *value, t ) ) {
case json::boolean:
-GENV_ITEMFACTORY-createBoolean( item, value[0] == 't' );
+GENV_ITEMFACTORY-createBoolean( item, (*value)[0] == 't' );
break;
case json::null:
GENV_ITEMFACTORY-createJSONNull( item );
@@ -437,24 +438,24 @@
case json::number:
switch ( t.get_numeric_type() ) {
case json::token::integer:
-GENV_ITEMFACTORY-createInteger( item, xs_integer( value ) );
+GENV_ITEMFACTORY-createInteger( item, xs_integer( *value ) );
break;
case json::token::decimal:
-GENV_ITEMFACTORY-createDecimal( item, xs_decimal( value ) );
+GENV_ITEMFACTORY-createDecimal( item, xs_decimal( *value ) );
break;
case json::token::floating_point:
-GENV_ITEMFACTORY-createDouble( item, xs_double( value ) );
+GENV_ITEMFACTORY-createDouble( item, xs_double( *value ) );
break;
default:
ZORBA_ASSERT( false );
}
break;
default:
-GENV_ITEMFACTORY-createString( item, value );
+GENV_ITEMFACTORY-createString( item, *value );
} // switch
} // else
} else {
- GENV_ITEMFACTORY-createString( item, value );
+ GENV_ITEMFACTORY-createString( item, *value );
}
if ( !item.isNull() )
=== modified file 'src/runtime/csv/pregenerated/csv.h'
--- src/runtime/csv/pregenerated/csv.h 2014-01-31 21:47:54 +
+++ src/runtime/csv/pregenerated/csv.h 2014-03-06 19:08:12 +
@@ -57,6 +57,7 @@
missing::type missing_; //
bool skip_called_; //
zstring string_; //
+ zstring value_; //
CsvParseIteratorState();
=== modified file 'src/runtime/spec/csv/csv.xml'
--- src/runtime/spec/csv/csv.xml 2014-02-28 01:46:12 +
+++ src/runtime/spec/csv/csv.xml 2014-03-06 19:08:12 +
@@ -39,6 +39,7 @@
zorba:member type=missing::type name=missing_ defaultValue=missing::null/
zorba:member type=bool name=skip_called_ defaultValue=false/
zorba:member type=zstring name=string_/
+zorba:member type=zstring name=value_/
/zorba:state
zorba:method name=count const=true return=bool
zorba:param name=result type=store::Item_tamp;/
=== modified file 'src/store/naive/simple_item_factory.cpp'
--- src/store/naive/simple_item_factory.cpp 2013-09-17 21:12:49 +
+++ src/store/naive/simple_item_factory.cpp 2014-03-06 19:08:12 +
@@ -2366,19 +2366,20 @@
const std::vectorstore::Item_t names,
const std::vectorstore::Item_t values)
{
+ assert( names.size() == values.size() );
+
result = new
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
1. In a couple of cases, now reusing the same zstring so the cost of growing the string is not paid per value. 2. Added a string_appender class that chunks the appending of single characters onto the end of strings to reduce the number of times zstring::append() is called. 3. Improved creating of JSON objects by using iterators rather than operator[]. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Description changed to: 1. In a couple of cases, now reusing the same zstring so the cost of growing the string is not paid per value. 2. Added a string_appender class that chunks the appending of single characters onto the end of strings to reduce the number of times zstring::append() is called. 3. Improved creating of JSON objects by using iterators rather than operator[]. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Commit Message changed to: 1. In a couple of cases, now reusing the same zstring so the cost of growing the string is not paid per value. 2. Added a string_appender class that chunks the appending of single characters onto the end of strings to reduce the number of times zstring::append() is called. 3. Improved creating of JSON objects by using iterators rather than operator[]. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209825 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
Maintaining more state to avoid construction/allocation/destruction of
istringstream.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209825
Maintaining more state to avoid construction/allocation/destruction of
istringstream.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209825
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/api/mem_streambuf.cpp'
--- src/api/mem_streambuf.cpp 2013-12-27 15:11:16 +
+++ src/api/mem_streambuf.cpp 2014-03-07 02:12:46 +
@@ -17,7 +17,6 @@
#include stdafx.h
#include cstring /* for memcpy(3) */
-#include zorba/internal/cxx_util.h
#include zorba/util/mem_streambuf.h
#include diagnostics/assert.h
=== modified file 'src/runtime/csv/csv_impl.cpp'
--- src/runtime/csv/csv_impl.cpp 2014-03-06 19:06:43 +
+++ src/runtime/csv/csv_impl.cpp 2014-03-07 02:12:46 +
@@ -157,11 +157,10 @@
return false;
}
-static json::type parse_json( zstring const s, json::token *ptoken ) {
- mem_streambuf buf( (char*)s.data(), s.size() );
- istringstream iss;
- iss.ios::rdbuf( buf );
- json::lexer lex( iss );
+static json::type parse_json( zstring const s, csv_parse_json_state state,
+ json::token *ptoken ) {
+ state.set_data( s.data(), s.size() );
+ json::lexer lex( state.iss_ );
if ( !lex.next( ptoken, false ) )
return json::none;
json::token::type const tt = ptoken-get_type();
@@ -221,9 +220,9 @@
state-csv_.set_stream( item-getStream() );
else {
item-getStringValue2( state-string_ );
-state-mem_streambuf_.set( state-string_.data(), state-string_.size() );
-state-iss_.ios::rdbuf( state-mem_streambuf_ );
-state-csv_.set_stream( state-iss_ );
+state-input_buf_.set( state-string_.data(), state-string_.size() );
+state-input_iss_.ios::rdbuf( state-input_buf_ );
+state-csv_.set_stream( state-input_iss_ );
}
}
@@ -428,7 +427,7 @@
GENV_ITEMFACTORY-createBoolean( item, false );
else {
json::token t;
-switch ( parse_json( *value, t ) ) {
+switch ( parse_json( *value, state-parse_json_state_, t ) ) {
case json::boolean:
GENV_ITEMFACTORY-createBoolean( item, (*value)[0] == 't' );
break;
=== modified file 'src/runtime/csv/csv_util.h'
--- src/runtime/csv/csv_util.h 2013-08-23 00:43:04 +
+++ src/runtime/csv/csv_util.h 2014-03-07 02:12:46 +
@@ -17,10 +17,32 @@
#ifndef ZORBA_CSV_UTIL_H
#define ZORBA_CSV_UTIL_H
+// standard
+#include sstream
+
+// Zorba
+#include zorba/util/mem_streambuf.h
+
namespace zorba {
///
+struct csv_parse_json_state {
+ std::istringstream iss_;
+
+ csv_parse_json_state() {
+iss_.std::ios::rdbuf( buf_ );
+ }
+
+ void set_data( char const *s, size_t size ) {
+buf_.set( const_castchar*( s ), size );
+iss_.seekg( 0 );
+ }
+
+private:
+ mem_streambuf buf_;
+};
+
namespace missing {
enum type {
null,
=== modified file 'src/runtime/csv/pregenerated/csv.h'
--- src/runtime/csv/pregenerated/csv.h 2014-03-06 19:06:43 +
+++ src/runtime/csv/pregenerated/csv.h 2014-03-07 02:12:46 +
@@ -50,11 +50,12 @@
bool cast_unquoted_; //
csv_parser csv_; //
zstring extra_name_; //
- std::istringstream iss_; //
+ mem_streambuf input_buf_; //
+ std::istringstream input_iss_; //
std::vectorstore::Item_t keys_; //
unsigned line_no_; //
- mem_streambuf mem_streambuf_; //
missing::type missing_; //
+ csv_parse_json_state parse_json_state_; //
bool skip_called_; //
zstring string_; //
zstring value_; //
=== modified file 'src/runtime/spec/csv/csv.xml'
--- src/runtime/spec/csv/csv.xml 2014-03-06 19:06:43 +
+++ src/runtime/spec/csv/csv.xml 2014-03-07 02:12:46 +
@@ -32,11 +32,12 @@
zorba:member type=bool name=cast_unquoted_ defaultValue=true/
zorba:member type=csv_parser name=csv_/
zorba:member type=zstring name=extra_name_/
-zorba:member type=std::istringstream name=iss_/
+zorba:member type=mem_streambuf name=input_buf_/
+zorba:member type=std::istringstream name=input_iss_/
zorba:member type=std::vectorlt;store::Item_tgt; name=keys_/
zorba:member type=unsigned name=line_no_ defaultValue=1/
-zorba:member type=mem_streambuf name=mem_streambuf_/
zorba:member type=missing::type name=missing_ defaultValue=missing::null/
+zorba:member type=csv_parse_json_state name=parse_json_state_/
zorba:member type=bool name=skip_called_ defaultValue=false/
zorba:member type=zstring name=string_/
zorba:member type=zstring name=value_/
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209825 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209825 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
More help message clean-up.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559
More help message clean-up.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'bin/zorbacmd_args.cpp'
--- bin/zorbacmd_args.cpp 2014-03-04 03:22:16 +
+++ bin/zorbacmd_args.cpp 2014-03-05 23:41:53 +
@@ -78,30 +78,30 @@
// b //
-HELP_OPT( --base-uri )
+HELP_OPT( --base-uri uri )
Set the base URI property of the static context.\n\n
-HELP_OPT( --boundary-space )
- Set the boundary-space policy ('strip' or 'preserve') in the static context.\n\n
+HELP_OPT( --boundary-space {strip|preserve} )
+ Set the boundary-space policy in the static context.\n\n
HELP_OPT( --byte-order-mark )
Set the byte-order-mark for the serializer.\n\n
// c //
-HELP_OPT( --classpath )
- JVM classpath to be used by modules using Java implementations\n\n
+HELP_OPT( --classpath path )
+ Set the JVM classpath to be used by modules using Java implementations.\n\n
HELP_OPT( --compile-only )
Only compile (don't execute).\n\n
-HELP_OPT( --compile-plan, )
+HELP_OPT( --compile-plan )
Do not execute the query; just compile it and save the execution plan in the file specified with the -o option.\n\n
-HELP_OPT( --construction-mode )
- Set the construction mode ('strip' or 'preserve') in the static context.\n\n
+HELP_OPT( --construction-mode {strip|preserve} )
+ Set the construction mode in the static context.\n\n
-HELP_OPT( --context-item )
+HELP_OPT( --context-item item )
Set the context item to the XML document in a given file.\n\n
// d //
@@ -111,21 +111,21 @@
Launch the Zorba debugger server and connect to a DBGP-enabled debugger client.\n\n
#endif /* ZORBA_WITH_DEBUGGER */
-HELP_OPT( --debug-file )
+HELP_OPT( --debug-file file )
Sets the file to write developer debugging information to.\n\n
-HELP_OPT( --debug-stream stream )
+HELP_OPT( --debug-stream {1|cout|stdout|2|cerr|stderr} )
Sets the stream to write developer debugging information to.\n\n
#ifdef ZORBA_WITH_DEBUGGER
-HELP_OPT( --debug-host, -h )
- The host where the DBGP-enabled debugger client listens for connections. Defaults to: 127.0.0.1\n\n
+HELP_OPT( --debug-host, -h host )
+ The host where the DBGP-enabled debugger client listens for connections; default: 127.0.0.1.\n\n
-HELP_OPT( --debug-port, -p )
- The port on which the DBGP-enabled debugger client listens for connections. Defaults to: 28028\n\n
+HELP_OPT( --debug-port, -p port )
+ The port on which the DBGP-enabled debugger client listens for connections; defaults: 28028.\n\n
#endif /* ZORBA_WITH_DEBUGGER */
-HELP_OPT( --default-collation )
+HELP_OPT( --default-collation collation )
Add the given collation and set the value of the default collation in the static context to the given collation.\n\n
HELP_OPT( --disable-http-resolution )
@@ -139,8 +139,8 @@
HELP_OPT( --execute-plan )
Do not compile the query; instead load the execution plan from the file specified by the -f -q options (or by any file specified without any other argument), and execute the loaded plan.\n\n
-HELP_OPT( --external-variable, -e )
- Provide the value for a variable given a file (name=file) or a value (name:=value)\n\n
+HELP_OPT( --external-variable, -e name{=file|:=value} )
+ Set the value for an externsl variable.\n\n
// f //
@@ -149,7 +149,7 @@
// h //
-HELP_OPT( --help, -h )
+HELP_OPT( --help )
Print this help message.\n\n
// i //
@@ -163,8 +163,8 @@
HELP_OPT( --inline-udf )
Inline user-defined functions.\n\n
-HELP_OPT( --iterator-tree format )
- Print the iterator tree in in one of DOT, JSON, or XML formats.\n\n
+HELP_OPT( --iterator-tree {dot|json|xml} )
+ Print the iterator tree in the given format.\n\n
// j //
@@ -176,7 +176,7 @@
HELP_OPT( --lib-module, -l )
Query compiler option to treat the query as a library module. If this is set --compile-only option is also set to true.\n\n
-HELP_OPT( --lib-path )
+HELP_OPT( --lib
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-profile into lp:zorba
The Needs Fixing was fixed on the pjl-misc branch. -- https://code.launchpad.net/~zorba-coders/zorba/feature-profile/+merge/208042 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
Fixed help message.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208935
Fixed help message.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208935
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'bin/zorbacmd_args.cpp'
--- bin/zorbacmd_args.cpp 2014-02-28 00:31:04 +
+++ bin/zorbacmd_args.cpp 2014-03-01 15:35:13 +
@@ -808,7 +808,7 @@
if ( !error )
error = check_args();
if ( error ) {
-cout Error: error \nUse -h for help. endl;
+cout Error: error \nUse --help for help. endl;
exit( 1 );
}
return argv - argv_orig;
=== modified file 'test/iterplans/apitest_args.cpp'
--- test/iterplans/apitest_args.cpp 2014-02-21 14:58:32 +
+++ test/iterplans/apitest_args.cpp 2014-03-01 15:35:13 +
@@ -548,7 +548,7 @@
if ( !error )
error = check_args();
if ( error ) {
-cout Error: error \nUse -h for help. endl;
+cout Error: error \nUse --help for help. endl;
exit( 1 );
}
return argv - argv_orig;
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208935 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208935 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208935 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208907 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208907 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208907 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Commit Message changed to: Discovered a bug where strings like street addresses, e.g., 870 Market Street, will cause an exception to be thrown due to the mis-guessing about what kind of JSON token a string really is. Fixed. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208907 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208907 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Description changed to: Discovered a bug where strings like street addresses, e.g., 870 Market Street, will cause an exception to be thrown due to the mis-guessing about what kind of JSON token a string really is. Fixed. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208907 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208907 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
1. Fixed assertion failure for ().
2. Added -n as a synonym for --trailing-nl.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711
1. Fixed assertion failure for ().
2. Added -n as a synonym for --trailing-nl.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'bin/zorbacmd_args.cpp'
--- bin/zorbacmd_args.cpp 2014-02-21 14:58:32 +
+++ bin/zorbacmd_args.cpp 2014-02-28 00:38:00 +
@@ -322,7 +322,7 @@
Trace the translator.\n\n
#endif /* NDEBUG */
-HELP_OPT( --trailing-nl )
+HELP_OPT( --trailing-nl, -n )
Print a trailing newline after the result of the query.\n\n
// u //
@@ -771,7 +771,7 @@
else if ( IS_LONG_OPT( --trace-translator ) )
z_props.setTraceTranslator( true );
#endif /* NDEBUG */
-else if ( IS_LONG_OPT( --trailing-nl ) )
+else if ( IS_OPT( --trailing-nl, -n ) )
zc_props.trailing_nl_ = true;
// u //
=== modified file 'src/runtime/csv/csv_impl.cpp'
--- src/runtime/csv/csv_impl.cpp 2014-01-20 16:52:44 +
+++ src/runtime/csv/csv_impl.cpp 2014-02-28 00:38:00 +
@@ -589,7 +589,8 @@
while ( i-next( item ) )
state-keys_.push_back( item );
i-close();
-}
+} else
+ goto end; // empty sequence: we're done
}
if ( do_header ) {
@@ -601,9 +602,11 @@
separator = true;
line += (*key)-getStringValue();
}
-line += \r\n;
-GENV_ITEMFACTORY-createString( result, line );
-STACK_PUSH( true, state );
+if ( !line.empty() ) {
+ line += \r\n;
+ GENV_ITEMFACTORY-createString( result, line );
+ STACK_PUSH( true, state );
+}
}
if ( !state-header_item_.isNull() ) {
@@ -655,6 +658,8 @@
GENV_ITEMFACTORY-createString( result, line );
STACK_PUSH( true, state );
} // while
+
+end:
STACK_END( state );
}
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Description changed to: 1. Fixed assertion failure for (). 2. Fixed state reset bug. 2. Added -n as a synonym for --trailing-nl. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Commit Message changed to: 1. Fixed assertion failure for (). 2. Fixed state reset bug. 3. Added -n as a synonym for --trailing-nl. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Commit Message changed to: 1. Fixed assertion failure for (). 2. Fixed state reset bug. 2. Added -n as a synonym for --trailing-nl. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Description changed to: 1. Fixed assertion failure for (). 2. Fixed state reset bug. 3. Added -n as a synonym for --trailing-nl. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-profile into lp:zorba
The timers would only be updated and checked if the query is in profile mode, right? Yes. -- https://code.launchpad.net/~zorba-coders/zorba/feature-profile/+merge/208042 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-profile into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-profile/+merge/208042 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-profile into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-profile into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-profile/+merge/208042 -- https://code.launchpad.net/~zorba-coders/zorba/feature-profile/+merge/208042 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-profile into lp:zorba
What about showing elapsed time which seems more useful if making calls to the outside world (e.g. http). Do you mean in addition to CPU time? Or instead of CPU time? If in addition to, then there are 2 Timer objects that have to be updated and checked making calls to produceNext() just a tiny bit slower. -- https://code.launchpad.net/~zorba-coders/zorba/feature-profile/+merge/208042 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Commit Message changed to: Fixed attribute names with spaces. FYI: this wasn't my code. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208048 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208048 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba. Commit message: Fixed attribute names with spaces. FYI: this wasn't my code. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208048 Fixed attribute names with spaces. FYI: this wasn't my code. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208048 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208048 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208048 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208048 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
JSON doesn't support a sequence of objects. This would need to become an array. Same for XML, where we would need introduce an artificial root element. The problem with that is that the local code has no way to know whether it's the last time it will ever be called to emit either a closing XML element or a ']' for JSON. Any ideas? -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207355 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Added a work-around. See if you like it. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207355 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
Removed double-tree printing.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207332
Removed double-tree printing.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207332
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'bin/zorbacmd.cpp'
--- bin/zorbacmd.cpp 2014-02-10 01:15:42 +
+++ bin/zorbacmd.cpp 2014-02-20 00:55:20 +
@@ -227,12 +227,14 @@
return true;
}
-bool populateDynamicContext( Zorba *zorba, XmlDataManager *xmlMgr,
- DynamicContext *dctx ) {
+bool populateDynamicContext( Zorba *zorba, DynamicContext *dctx ) {
ZorbaCmdProperties const zc_props = ZorbaCmdProperties::instance();
+ XmlDataManager_t xmlMgr;
if ( !zc_props.ctx_item_.empty() ) {
ifstream is( zc_props.ctx_item_.c_str() );
+if ( !xmlMgr )
+ xmlMgr = zorba-getXmlDataManager();
Item doc( xmlMgr-parseXML( is ) );
dctx-setContextItem( doc );
}
@@ -243,6 +245,8 @@
try {
if ( i-inline_file ) {
ifstream is( i-var_value.c_str() );
+ if ( !xmlMgr )
+xmlMgr = zorba-getXmlDataManager();
Item doc( xmlMgr-parseXML( is ) );
dctx-setVariable( i-var_name, doc );
} else {
@@ -321,7 +325,7 @@
#endif /* ZORBA_WITH_FILE_ACCESS */
}
-static int compileAndExecute( Zorba *zorba, XmlDataManager *xmlDataMgr,
+static int compileAndExecute( Zorba *zorba,
StaticContext_t sctx,
string const qfilepath,
istream qstream,
@@ -383,6 +387,7 @@
XQuery_t query;
DiagnosticHandler diagnosticHandler;
+ XmlDataManager_t xmlDataMgr;
for ( unsigned long exec = 0; exec lNumExecutions; ++exec ) {
if ( zc_props.timing_ )
@@ -467,7 +472,7 @@
// Populate the dynamic context
try {
DynamicContext *const dctx = query-getDynamicContext();
- if ( !populateDynamicContext( zorba, xmlDataMgr, dctx ) ) {
+ if ( !populateDynamicContext( zorba, dctx ) ) {
print_help();
return 21;
}
@@ -517,7 +522,8 @@
//
if ( zc_props.timing_ ) {
timers.startTimer( Timers::unload, exec );
-
+ if ( !xmlDataMgr )
+xmlDataMgr = zorba-getXmlDataManager();
DocumentManager *const docMgr = xmlDataMgr-getDocumentManager();
ItemSequence_t docsSeq = docMgr-availableDocuments();
Iterator_t i( docsSeq-getIterator() );
@@ -639,8 +645,6 @@
void *const store = StoreManager::getStore();
Zorba *const zorba = Zorba::getInstance( store );
- XmlDataManager_t xmlDataMgr = zorba-getXmlDataManager();
-
#ifdef DO_AUDIT
audit::Provider* lAuditProvider = zorba-getAuditProvider();
@@ -783,7 +787,6 @@
Timers queryTiming( zc_props.multiple_ );
int status = compileAndExecute(zorba,
- xmlDataMgr,
sctx,
path,
*qstream,
@@ -828,11 +831,8 @@
hints.opt_level = ZORBA_OPT_LEVEL_O0;
query-compile( *lXQ.get(), hints );
-if (!populateDynamicContext(zorba, xmlDataMgr,
-query-getDynamicContext()))
-{
+if (!populateDynamicContext(zorba, query-getDynamicContext()))
return 9;
-}
Zorba_SerializerOptions ser_opts( zc_props.serialization_params_ );
set_serializer_opts( ser_opts );
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207332 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207332 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207332 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207355 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207355 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207355 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207073 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207073 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Description changed to: 1. Applied 28io JSON iterator tree patch. 2. Added new --plan-format option. 3. Misc clean-up. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207073 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207073 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207073 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Commit Message changed to: 1. Applied 28io JSON iterator tree patch. 2. Added new --plan-format option. 3. Misc clean-up. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207073 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207073 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Is the removal of setPrintIteratorTree backwards incompatible? No. None of those functions existed before except the JVM ones. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207073 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
zorba -q '1+1' --iterator-tree doesn't work but the help says there was a default. Fixed. (The mention of a default was wrong.) -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207073 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
