Changeset: 91ebf0a4413d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=91ebf0a4413d Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures_gsl.stable.out clients/Tests/MAL-signatures_nocfitsio.stable.out clients/Tests/MAL-signatures_sphinxclient.stable.out clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.64bit.oid32 clients/Tests/SQL-dump_gsl.stable.out clients/Tests/SQL-dump_gsl.stable.out.oid32 clients/Tests/SQL-dump_nogeom.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions_gsl.stable.out sql/test/Tests/systemfunctions_nogeom.stable.out Branch: transaction-replication Log Message:
Merge with default branch diffs (truncated from 431 to 300 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -236,6 +236,14 @@ command aggr.histogram(b:bat[:any_1,:any address ALGhistogram; comment Produce a BAT containing the histogram over the tail values. +command aggr.jsonaggr(val:bat[:oid,:dbl]):str +address JSONgroupStr; +comment Aggregate the double values to array. + +command aggr.jsonaggr(val:bat[:oid,:str]):str +address JSONgroupStr; +comment Aggregate the string values to array. + function aggr.median(b:bat[:oid,:any_1]):any_1; command aggr.median(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:any_1] address AGGRmedian3; @@ -774,6 +782,22 @@ command aggr.quantile(b:bat[:oid,:any_1] address AGGRquantile3; comment Grouped quantile aggregate +command aggr.subjsonaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str] +address JSONsubjsoncand; +comment Grouped aggregation of values with candidates list. + +command aggr.subjsonaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str] +address JSONsubjsoncand; +comment Grouped aggregation of values with candidates list. + +command aggr.subjsonaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str] +address JSONsubjson; +comment Grouped aggregation of values. + +command aggr.subjsonaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str] +address JSONsubjson; +comment Grouped aggregation of values. + command aggr.subquantile(b:bat[:oid,:any_1],q:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:any_1] address AGGRsubquantilecand; comment Grouped median quantile with candidate list @@ -39420,14 +39444,6 @@ command iterator.new(b:bat[:oid,:any_2], address ITRnewChunk; comment Create an iterator with fixed granule size. The result is a view. -command json.aggr(val:bat[:oid,:dbl]):str -address JSONgroupStr; -comment Aggregate the double values to array. - -command json.aggr(val:bat[:oid,:str]):str -address JSONgroupStr; -comment Aggregate the string values to array. - command json.dump(j:json):void address JSONdump; pattern json.fold(k:bat[:oid,:any]):json @@ -39530,22 +39546,6 @@ pattern json.renderarray(val:any...):jso address JSONrenderarray; pattern json.renderobject(val:any...):json address JSONrenderobject; -command json.subaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str] -address JSONsubjsoncand; -comment Grouped aggregation of values with candidates list. - -command json.subaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str] -address JSONsubjsoncand; -comment Grouped aggregation of values with candidates list. - -command json.subaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str] -address JSONsubjson; -comment Grouped aggregation of values. - -command json.subaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str] -address JSONsubjson; -comment Grouped aggregation of values. - command json.suboutput(b:bat[:oid,:any_1],gid:bat[:oid,:oid],ext:bat[:oid,:wrd],flg:bit):bat[:oid,:str] address JSONtextGrouped; comment Pack the values into a json structure diff --git a/clients/Tests/MAL-signatures_gsl.stable.out b/clients/Tests/MAL-signatures_gsl.stable.out --- a/clients/Tests/MAL-signatures_gsl.stable.out +++ b/clients/Tests/MAL-signatures_gsl.stable.out @@ -236,6 +236,14 @@ command aggr.histogram(b:bat[:any_1,:any address ALGhistogram; comment Produce a BAT containing the histogram over the tail values. +command aggr.jsonaggr(val:bat[:oid,:dbl]):str +address JSONgroupStr; +comment Aggregate the double values to array. + +command aggr.jsonaggr(val:bat[:oid,:str]):str +address JSONgroupStr; +comment Aggregate the string values to array. + function aggr.median(b:bat[:oid,:any_1]):any_1; command aggr.median(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:any_1] address AGGRmedian3; @@ -774,6 +782,22 @@ command aggr.quantile(b:bat[:oid,:any_1] address AGGRquantile3; comment Grouped quantile aggregate +command aggr.subjsonaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str] +address JSONsubjsoncand; +comment Grouped aggregation of values with candidates list. + +command aggr.subjsonaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str] +address JSONsubjsoncand; +comment Grouped aggregation of values with candidates list. + +command aggr.subjsonaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str] +address JSONsubjson; +comment Grouped aggregation of values. + +command aggr.subjsonaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str] +address JSONsubjson; +comment Grouped aggregation of values. + command aggr.subquantile(b:bat[:oid,:any_1],q:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:any_1] address AGGRsubquantilecand; comment Grouped median quantile with candidate list @@ -39436,14 +39460,6 @@ command iterator.new(b:bat[:oid,:any_2], address ITRnewChunk; comment Create an iterator with fixed granule size. The result is a view. -command json.aggr(val:bat[:oid,:dbl]):str -address JSONgroupStr; -comment Aggregate the double values to array. - -command json.aggr(val:bat[:oid,:str]):str -address JSONgroupStr; -comment Aggregate the string values to array. - command json.dump(j:json):void address JSONdump; pattern json.fold(k:bat[:oid,:any]):json @@ -39546,22 +39562,6 @@ pattern json.renderarray(val:any...):jso address JSONrenderarray; pattern json.renderobject(val:any...):json address JSONrenderobject; -command json.subaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str] -address JSONsubjsoncand; -comment Grouped aggregation of values with candidates list. - -command json.subaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str] -address JSONsubjsoncand; -comment Grouped aggregation of values with candidates list. - -command json.subaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str] -address JSONsubjson; -comment Grouped aggregation of values. - -command json.subaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str] -address JSONsubjson; -comment Grouped aggregation of values. - command json.suboutput(b:bat[:oid,:any_1],gid:bat[:oid,:oid],ext:bat[:oid,:wrd],flg:bit):bat[:oid,:str] address JSONtextGrouped; comment Pack the values into a json structure 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 @@ -236,6 +236,14 @@ command aggr.histogram(b:bat[:any_1,:any address ALGhistogram; comment Produce a BAT containing the histogram over the tail values. +command aggr.jsonaggr(val:bat[:oid,:dbl]):str +address JSONgroupStr; +comment Aggregate the double values to array. + +command aggr.jsonaggr(val:bat[:oid,:str]):str +address JSONgroupStr; +comment Aggregate the string values to array. + function aggr.median(b:bat[:oid,:any_1]):any_1; command aggr.median(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:any_1] address AGGRmedian3; @@ -774,6 +782,22 @@ command aggr.quantile(b:bat[:oid,:any_1] address AGGRquantile3; comment Grouped quantile aggregate +command aggr.subjsonaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str] +address JSONsubjsoncand; +comment Grouped aggregation of values with candidates list. + +command aggr.subjsonaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str] +address JSONsubjsoncand; +comment Grouped aggregation of values with candidates list. + +command aggr.subjsonaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str] +address JSONsubjson; +comment Grouped aggregation of values. + +command aggr.subjsonaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str] +address JSONsubjson; +comment Grouped aggregation of values. + command aggr.subquantile(b:bat[:oid,:any_1],q:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:any_1] address AGGRsubquantilecand; comment Grouped median quantile with candidate list @@ -39396,14 +39420,6 @@ command iterator.new(b:bat[:oid,:any_2], address ITRnewChunk; comment Create an iterator with fixed granule size. The result is a view. -command json.aggr(val:bat[:oid,:dbl]):str -address JSONgroupStr; -comment Aggregate the double values to array. - -command json.aggr(val:bat[:oid,:str]):str -address JSONgroupStr; -comment Aggregate the string values to array. - command json.dump(j:json):void address JSONdump; pattern json.fold(k:bat[:oid,:any]):json @@ -39506,22 +39522,6 @@ pattern json.renderarray(val:any...):jso address JSONrenderarray; pattern json.renderobject(val:any...):json address JSONrenderobject; -command json.subaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str] -address JSONsubjsoncand; -comment Grouped aggregation of values with candidates list. - -command json.subaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str] -address JSONsubjsoncand; -comment Grouped aggregation of values with candidates list. - -command json.subaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str] -address JSONsubjson; -comment Grouped aggregation of values. - -command json.subaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str] -address JSONsubjson; -comment Grouped aggregation of values. - command json.suboutput(b:bat[:oid,:any_1],gid:bat[:oid,:oid],ext:bat[:oid,:wrd],flg:bit):bat[:oid,:str] address JSONtextGrouped; comment Pack the values into a json structure 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 @@ -236,6 +236,14 @@ command aggr.histogram(b:bat[:any_1,:any address ALGhistogram; comment Produce a BAT containing the histogram over the tail values. +command aggr.jsonaggr(val:bat[:oid,:dbl]):str +address JSONgroupStr; +comment Aggregate the double values to array. + +command aggr.jsonaggr(val:bat[:oid,:str]):str +address JSONgroupStr; +comment Aggregate the string values to array. + function aggr.median(b:bat[:oid,:any_1]):any_1; command aggr.median(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:any_1] address AGGRmedian3; @@ -774,6 +782,22 @@ command aggr.quantile(b:bat[:oid,:any_1] address AGGRquantile3; comment Grouped quantile aggregate +command aggr.subjsonaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str] +address JSONsubjsoncand; +comment Grouped aggregation of values with candidates list. + +command aggr.subjsonaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str] +address JSONsubjsoncand; +comment Grouped aggregation of values with candidates list. + +command aggr.subjsonaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str] +address JSONsubjson; +comment Grouped aggregation of values. + +command aggr.subjsonaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str] +address JSONsubjson; +comment Grouped aggregation of values. + command aggr.subquantile(b:bat[:oid,:any_1],q:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:any_1] address AGGRsubquantilecand; comment Grouped median quantile with candidate list @@ -39420,14 +39444,6 @@ command iterator.new(b:bat[:oid,:any_2], address ITRnewChunk; comment Create an iterator with fixed granule size. The result is a view. -command json.aggr(val:bat[:oid,:dbl]):str -address JSONgroupStr; -comment Aggregate the double values to array. - -command json.aggr(val:bat[:oid,:str]):str -address JSONgroupStr; -comment Aggregate the string values to array. - command json.dump(j:json):void address JSONdump; pattern json.fold(k:bat[:oid,:any]):json @@ -39530,22 +39546,6 @@ pattern json.renderarray(val:any...):jso address JSONrenderarray; pattern json.renderobject(val:any...):json address JSONrenderobject; -command json.subaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str] -address JSONsubjsoncand; -comment Grouped aggregation of values with candidates list. _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
