Changeset: f424aaeec590 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f424aaeec590 Modified Files: clients/Tests/MAL-signatures_nocfitsio.stable.out clients/Tests/MAL-signatures_nogeom.stable.out clients/Tests/MAL-signatures_sphinxclient.stable.out Branch: default Log Message:
Propagated changeset 64ef78abb26d to other MAL-signatures versions. diffs (150 lines): diff --git a/clients/Tests/MAL-signatures_nocfitsio.stable.out b/clients/Tests/MAL-signatures_nocfitsio.stable.out --- a/clients/Tests/MAL-signatures_nocfitsio.stable.out +++ b/clients/Tests/MAL-signatures_nocfitsio.stable.out @@ -39680,9 +39680,13 @@ command json.isvalid(val:str):bit address JSONisvalid; comment Validate the string as a valid JSON document -command json.keys(val:json):str +command json.keys(val:json):bat[:oid,:str] address JSONkeys; -comment Expands the outermost JSON object keys into an array. +comment Expands the outermost JSON object names. + +command json.keyArray(val:json):str +address JSONkeyArray; +comment Expands the outermost JSON object keys into a JSON array. command json.load(nme:str) (kind:bat[:oid,:bte],string:bat[:oid,:str],integer:bat[:oid,:lng],double:bat[:oid,:dbl],array:bat[:oid,:oid],object:bat[:oid,:oid],name:bat[:oid,:str]) address JSONload; @@ -39696,10 +39700,6 @@ command json.nextid(kind:bat[:oid,:bte]) address JSONnextid; comment Returns the next free id for the kind BAT -command json.names(val:json):bat[:oid,:str] -address JSONnames; -comment Expands the outermost JSON object names. - pattern json.nest(k:bat[:oid,:dbl]):json address JSONnest; comment Combine the value list into a single json array object. @@ -39793,6 +39793,10 @@ command json.values(val:json):bat[:oid,: address JSONvalues; comment Expands the outermost JSON values. +command json.valueArray(val:json):str +address JSONvalueArray; +comment Expands the outermost JSON object values into a JSON array. + command json.wrap(elems:bat[:oid,:any]) (kind:bat[:oid,:bte],string:bat[:oid,:str],integer:bat[:oid,:lng],double:bat[:oid,:dbl],array:bat[:oid,:oid],object:bat[:oid,:oid],name:bat[:oid,:str]) address JSONwrap; comment Wrap the given BAT inside a JSON array @@ -40325,7 +40329,7 @@ comment Set the kernel debugging bit-set command mdb.setDebug(flg:str):int address MDBsetDebugStr; -comment Set the kernel debugging bit-set and return its previous value.The recognized options are: threads, memory, properties,io, transactions, modules, algorithms, estimates, xproperties. +comment Set the kernel debugging bit-set and return its previous value.The recognized options are: threads, memory, properties,io, transactions, modules, algorithms, estimates. pattern mdb.setCatch(b:bit):void address MDBsetCatch; diff --git a/clients/Tests/MAL-signatures_nogeom.stable.out b/clients/Tests/MAL-signatures_nogeom.stable.out --- a/clients/Tests/MAL-signatures_nogeom.stable.out +++ b/clients/Tests/MAL-signatures_nogeom.stable.out @@ -39534,9 +39534,13 @@ command json.isvalid(val:str):bit address JSONisvalid; comment Validate the string as a valid JSON document -command json.keys(val:json):str +command json.keys(val:json):bat[:oid,:str] address JSONkeys; -comment Expands the outermost JSON object keys into an array. +comment Expands the outermost JSON object names. + +command json.keyArray(val:json):str +address JSONkeyArray; +comment Expands the outermost JSON object keys into a JSON array. command json.load(nme:str) (kind:bat[:oid,:bte],string:bat[:oid,:str],integer:bat[:oid,:lng],double:bat[:oid,:dbl],array:bat[:oid,:oid],object:bat[:oid,:oid],name:bat[:oid,:str]) address JSONload; @@ -39550,10 +39554,6 @@ command json.nextid(kind:bat[:oid,:bte]) address JSONnextid; comment Returns the next free id for the kind BAT -command json.names(val:json):bat[:oid,:str] -address JSONnames; -comment Expands the outermost JSON object names. - pattern json.nest(k:bat[:oid,:dbl]):json address JSONnest; comment Combine the value list into a single json array object. @@ -39647,6 +39647,10 @@ command json.values(val:json):bat[:oid,: address JSONvalues; comment Expands the outermost JSON values. +command json.valueArray(val:json):str +address JSONvalueArray; +comment Expands the outermost JSON object values into a JSON array. + command json.wrap(elems:bat[:oid,:any]) (kind:bat[:oid,:bte],string:bat[:oid,:str],integer:bat[:oid,:lng],double:bat[:oid,:dbl],array:bat[:oid,:oid],object:bat[:oid,:oid],name:bat[:oid,:str]) address JSONwrap; comment Wrap the given BAT inside a JSON array @@ -40163,7 +40167,7 @@ comment Set the kernel debugging bit-set command mdb.setDebug(flg:str):int address MDBsetDebugStr; -comment Set the kernel debugging bit-set and return its previous value.The recognized options are: threads, memory, properties,io, transactions, modules, algorithms, estimates, xproperties. +comment Set the kernel debugging bit-set and return its previous value.The recognized options are: threads, memory, properties,io, transactions, modules, algorithms, estimates. pattern mdb.setCatch(b:bit):void address MDBsetCatch; diff --git a/clients/Tests/MAL-signatures_sphinxclient.stable.out b/clients/Tests/MAL-signatures_sphinxclient.stable.out --- a/clients/Tests/MAL-signatures_sphinxclient.stable.out +++ b/clients/Tests/MAL-signatures_sphinxclient.stable.out @@ -39704,9 +39704,13 @@ command json.isvalid(val:str):bit address JSONisvalid; comment Validate the string as a valid JSON document -command json.keys(val:json):str +command json.keys(val:json):bat[:oid,:str] address JSONkeys; -comment Expands the outermost JSON object keys into an array. +comment Expands the outermost JSON object names. + +command json.keyArray(val:json):str +address JSONkeyArray; +comment Expands the outermost JSON object keys into a JSON array. command json.load(nme:str) (kind:bat[:oid,:bte],string:bat[:oid,:str],integer:bat[:oid,:lng],double:bat[:oid,:dbl],array:bat[:oid,:oid],object:bat[:oid,:oid],name:bat[:oid,:str]) address JSONload; @@ -39720,10 +39724,6 @@ command json.nextid(kind:bat[:oid,:bte]) address JSONnextid; comment Returns the next free id for the kind BAT -command json.names(val:json):bat[:oid,:str] -address JSONnames; -comment Expands the outermost JSON object names. - pattern json.nest(k:bat[:oid,:dbl]):json address JSONnest; comment Combine the value list into a single json array object. @@ -39817,6 +39817,10 @@ command json.values(val:json):bat[:oid,: address JSONvalues; comment Expands the outermost JSON values. +command json.valueArray(val:json):str +address JSONvalueArray; +comment Expands the outermost JSON object values into a JSON array. + command json.wrap(elems:bat[:oid,:any]) (kind:bat[:oid,:bte],string:bat[:oid,:str],integer:bat[:oid,:lng],double:bat[:oid,:dbl],array:bat[:oid,:oid],object:bat[:oid,:oid],name:bat[:oid,:str]) address JSONwrap; comment Wrap the given BAT inside a JSON array @@ -40349,7 +40353,7 @@ comment Set the kernel debugging bit-set command mdb.setDebug(flg:str):int address MDBsetDebugStr; -comment Set the kernel debugging bit-set and return its previous value.The recognized options are: threads, memory, properties,io, transactions, modules, algorithms, estimates, xproperties. +comment Set the kernel debugging bit-set and return its previous value.The recognized options are: threads, memory, properties,io, transactions, modules, algorithms, estimates. pattern mdb.setCatch(b:bit):void address MDBsetCatch; _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
