Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

[Paul J. Lucas]

1. Fixed assertion failure for ().
2. Fixed state reset bug.
3. Added -n as a synonym for --trailing-nl.

1. Fixed assertion failure for ().
2. Fixed state reset bug.
3. Added -n as a synonym for --trailing-nl.

[lp:~paul-lucas/zorba/pjl-misc]

11460. By Paul J. Lucas on 2014-02-28

New tests.

11461. By Paul J. Lucas on 2014-02-28

Fixed reset bug.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711

Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'bin/zorbacmd_args.cpp'
--- bin/zorbacmd_args.cpp	2014-02-21 14:58:32 +0000
+++ bin/zorbacmd_args.cpp	2014-02-28 01:46:33 +0000
@@ -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 +0000
+++ src/runtime/csv/csv_impl.cpp	2014-02-28 01:46:33 +0000
@@ -534,6 +534,18 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
+void CsvSerializeIteratorState::reset( PlanState &state ) {
+  PlanIteratorState::reset( state );
+  boolean_string_[0] = "false";
+  boolean_string_[1] = "true";
+  header_item_ = nullptr;
+  keys_.clear();
+  null_string_ = "null";
+  quote_ = '"';
+  quote_esc_ = "\"\"";
+  separator_ = ',';
+}
+
 bool CsvSerializeIterator::nextImpl( store::Item_t &result,
                                      PlanState &plan_state ) const {
   char char_opt;
@@ -589,7 +601,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 +614,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 +670,8 @@
     GENV_ITEMFACTORY->createString( result, line );
     STACK_PUSH( true, state );
   } // while
+
+end:
   STACK_END( state );
 }
 

=== modified file 'src/runtime/csv/pregenerated/csv.cpp'
--- src/runtime/csv/pregenerated/csv.cpp	2014-01-31 01:39:38 +0000
+++ src/runtime/csv/pregenerated/csv.cpp	2014-02-28 01:46:33 +0000
@@ -111,10 +111,6 @@
 
 CsvSerializeIteratorState::~CsvSerializeIteratorState() {}
 
-
-void CsvSerializeIteratorState::reset(PlanState& planState) {
-  PlanIteratorState::reset(planState);
-}
 // </CsvSerializeIterator>
 
 

=== modified file 'src/runtime/spec/csv/csv.xml'
--- src/runtime/spec/csv/csv.xml	2013-12-27 15:11:16 +0000
+++ src/runtime/spec/csv/csv.xml	2014-02-28 01:46:33 +0000
@@ -68,7 +68,7 @@
       <zorba:output>xs:string*</zorba:output>
     </zorba:signature>
   </zorba:function>
-  <zorba:state generateInit="use-default">
+  <zorba:state generateInit="use-default" generateReset="false">
     <zorba:member type="zstring" name="boolean_string_[2]"/>
     <zorba:member type="store::Item_t" name="header_item_"/>
     <zorba:member type="std::vector&lt;store::Item_t&gt;" name="keys_"/>

=== added file 'test/rbkt/ExpQueryResults/zorba/csv/csv-serialize-02.xml.res'
--- test/rbkt/ExpQueryResults/zorba/csv/csv-serialize-02.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/csv/csv-serialize-02.xml.res	2014-02-28 01:46:33 +0000
@@ -0,0 +1,3 @@
+1
+2
+3

=== added file 'test/rbkt/ExpQueryResults/zorba/csv/csv-serialize-empty.xml.res'
--- test/rbkt/ExpQueryResults/zorba/csv/csv-serialize-empty.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/csv/csv-serialize-empty.xml.res	2014-02-28 01:46:33 +0000
@@ -0,0 +1,1 @@
+

=== added file 'test/rbkt/Queries/zorba/csv/csv-serialize-02.jq'
--- test/rbkt/Queries/zorba/csv/csv-serialize-02.jq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/csv/csv-serialize-02.jq	2014-02-28 01:46:33 +0000
@@ -0,0 +1,10 @@
+import module namespace csv = "http://zorba.io/modules/json-csv";
+
+let $options := { "serialize-header" : false }
+return string-join(
+  for $i in 1 to 3
+  let $o := { "foo" : $i }
+  return csv:serialize( $o, $options )
+)
+
+(: vim:set et sw=2 ts=2: :)

=== added file 'test/rbkt/Queries/zorba/csv/csv-serialize-02.spec'
--- test/rbkt/Queries/zorba/csv/csv-serialize-02.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/csv/csv-serialize-02.spec	2014-02-28 01:46:33 +0000
@@ -0,0 +1,1 @@
+Serialization: method=text

=== added file 'test/rbkt/Queries/zorba/csv/csv-serialize-empty.jq'
--- test/rbkt/Queries/zorba/csv/csv-serialize-empty.jq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/csv/csv-serialize-empty.jq	2014-02-28 01:46:33 +0000
@@ -0,0 +1,5 @@
+import module namespace csv = "http://zorba.io/modules/json-csv";
+
+csv:serialize( () )
+
+(: vim:set syntax=xquery et sw=2 ts=2: :)