Changeset: 2e97e510543e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2e97e510543e 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/exports.stable.out Branch: default Log Message:
exports, MAL-signatures: approved stable output according to changeset 65b8d96802cc diffs (214 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 @@ -2691,31 +2691,19 @@ command algebra.slice(b:bat[:any_1,:any_ address ALGslice_oid; comment Return the slice based on head oid x till y (exclusive). -command algebra.select(b:bat[:any_2,:void],low:any_2,high:any_2,li:bit,hi:bit):bat[:any_2,:void] -address ALGselectInclusiveHead; -command algebra.select(b:bat[:any_2,:void],low:any_2,high:any_2):bat[:any_2,:void] -address ALGselectHead; -command algebra.select(b:bat[:any_2,:void],low:any_2):bat[:any_2,:void] -address ALGselect1Head; -command algebra.selectH(b:bat[:any_1,:any_2],value:any_1):bat[:any_1,:any_2] -address ALGselect1Head; -command algebra.selectH(b:bat[:any_1,:any_2],low:any_1,high:any_1,li:bit,hi:bit):bat[:any_1,:any_2] -address ALGselectInclusiveHead; -command algebra.selectH(b:bat[:any_1,:any_2],low:any_1,high:any_1):bat[:any_1,:any_2] -address ALGselectHead; -command algebra.selectNotNil(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] +command algebra.selectNotNil(b:bat[:oid,:any_2]):bat[:oid,:any_2] address ALGselectNotNil; comment Select all not-nil values -command algebra.select(b:bat[:any_1,:any_2],value:any_2):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],value:any_2):bat[:oid,:any_2] address ALGselect1; comment Select all BUNs of a BAT with a certain tail value. Selection on NIL is also possible (it should be properly casted, e.g.:int(nil)). -command algebra.select(b:bat[:any_1,:any_2],low:any_2,high:any_2,li:bit,hi:bit):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],low:any_2,high:any_2,li:bit,hi:bit):bat[:oid,:any_2] address ALGselectInclusive; comment Select all BUNs that have tail values: {v| low <{=} v <{=} high}. Boundary inclusion is indicated separately. NIL boundary values have a special meaning. + low == nil means: no lower bound + high == nil means: no upper bound. -command algebra.select(b:bat[:any_1,:any_2],low:any_2,high:any_2):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],low:any_2,high:any_2):bat[:oid,:any_2] address ALGselect; comment Select all BUNs that have tail values: {v| low <= v <= high}. NIL boundary values have a special meaning. + low == nil means: no lower bound + high == nil means: no upper bound. NOTE 1: you should cast the nil to the appropriate type, e.g. int(nil) in order to circumvent type clashes. NOTE 2: as the 'nil' element has no clear place in the ordered domain of values, tuples with 'nil' values are NEVER returned by the range select. @@ -2759,10 +2747,6 @@ command algebra.topN(b:bat[:any_1,:any_2 address ALGtopN; comment Trim all but the top N tuples. -command algebra.thetaselect(b:bat[:any_1,:any_2],val:any_2,op:str):bat[:any_1,:any_2] -address ALGthetaselect; -comment The theta (<=,<,=,>,>=) select() - command algebra.thetasubselect(b:bat[:oid,:any_1],s:bat[:oid,:oid],val:any_1,op:str):bat[:oid,:oid] address ALGthetasubselect2; comment Select all head values of the first input BAT for which the tail value obeys the relation value OP VAL and for which the head value occurs in the tail of the second input BAT. Input is a dense-headed BAT, output is a dense-headed BAT with in the tail the head value of the input BAT for which the relationship holds. The output BAT is sorted on the tail value. 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 @@ -2691,31 +2691,19 @@ command algebra.slice(b:bat[:any_1,:any_ address ALGslice_oid; comment Return the slice based on head oid x till y (exclusive). -command algebra.select(b:bat[:any_2,:void],low:any_2,high:any_2,li:bit,hi:bit):bat[:any_2,:void] -address ALGselectInclusiveHead; -command algebra.select(b:bat[:any_2,:void],low:any_2,high:any_2):bat[:any_2,:void] -address ALGselectHead; -command algebra.select(b:bat[:any_2,:void],low:any_2):bat[:any_2,:void] -address ALGselect1Head; -command algebra.selectH(b:bat[:any_1,:any_2],value:any_1):bat[:any_1,:any_2] -address ALGselect1Head; -command algebra.selectH(b:bat[:any_1,:any_2],low:any_1,high:any_1,li:bit,hi:bit):bat[:any_1,:any_2] -address ALGselectInclusiveHead; -command algebra.selectH(b:bat[:any_1,:any_2],low:any_1,high:any_1):bat[:any_1,:any_2] -address ALGselectHead; -command algebra.selectNotNil(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] +command algebra.selectNotNil(b:bat[:oid,:any_2]):bat[:oid,:any_2] address ALGselectNotNil; comment Select all not-nil values -command algebra.select(b:bat[:any_1,:any_2],value:any_2):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],value:any_2):bat[:oid,:any_2] address ALGselect1; comment Select all BUNs of a BAT with a certain tail value. Selection on NIL is also possible (it should be properly casted, e.g.:int(nil)). -command algebra.select(b:bat[:any_1,:any_2],low:any_2,high:any_2,li:bit,hi:bit):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],low:any_2,high:any_2,li:bit,hi:bit):bat[:oid,:any_2] address ALGselectInclusive; comment Select all BUNs that have tail values: {v| low <{=} v <{=} high}. Boundary inclusion is indicated separately. NIL boundary values have a special meaning. + low == nil means: no lower bound + high == nil means: no upper bound. -command algebra.select(b:bat[:any_1,:any_2],low:any_2,high:any_2):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],low:any_2,high:any_2):bat[:oid,:any_2] address ALGselect; comment Select all BUNs that have tail values: {v| low <= v <= high}. NIL boundary values have a special meaning. + low == nil means: no lower bound + high == nil means: no upper bound. NOTE 1: you should cast the nil to the appropriate type, e.g. int(nil) in order to circumvent type clashes. NOTE 2: as the 'nil' element has no clear place in the ordered domain of values, tuples with 'nil' values are NEVER returned by the range select. @@ -2759,10 +2747,6 @@ command algebra.topN(b:bat[:any_1,:any_2 address ALGtopN; comment Trim all but the top N tuples. -command algebra.thetaselect(b:bat[:any_1,:any_2],val:any_2,op:str):bat[:any_1,:any_2] -address ALGthetaselect; -comment The theta (<=,<,=,>,>=) select() - command algebra.thetasubselect(b:bat[:oid,:any_1],s:bat[:oid,:oid],val:any_1,op:str):bat[:oid,:oid] address ALGthetasubselect2; comment Select all head values of the first input BAT for which the tail value obeys the relation value OP VAL and for which the head value occurs in the tail of the second input BAT. Input is a dense-headed BAT, output is a dense-headed BAT with in the tail the head value of the input BAT for which the relationship holds. The output BAT is sorted on the tail value. 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 @@ -2691,31 +2691,19 @@ command algebra.slice(b:bat[:any_1,:any_ address ALGslice_oid; comment Return the slice based on head oid x till y (exclusive). -command algebra.select(b:bat[:any_2,:void],low:any_2,high:any_2,li:bit,hi:bit):bat[:any_2,:void] -address ALGselectInclusiveHead; -command algebra.select(b:bat[:any_2,:void],low:any_2,high:any_2):bat[:any_2,:void] -address ALGselectHead; -command algebra.select(b:bat[:any_2,:void],low:any_2):bat[:any_2,:void] -address ALGselect1Head; -command algebra.selectH(b:bat[:any_1,:any_2],value:any_1):bat[:any_1,:any_2] -address ALGselect1Head; -command algebra.selectH(b:bat[:any_1,:any_2],low:any_1,high:any_1,li:bit,hi:bit):bat[:any_1,:any_2] -address ALGselectInclusiveHead; -command algebra.selectH(b:bat[:any_1,:any_2],low:any_1,high:any_1):bat[:any_1,:any_2] -address ALGselectHead; -command algebra.selectNotNil(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] +command algebra.selectNotNil(b:bat[:oid,:any_2]):bat[:oid,:any_2] address ALGselectNotNil; comment Select all not-nil values -command algebra.select(b:bat[:any_1,:any_2],value:any_2):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],value:any_2):bat[:oid,:any_2] address ALGselect1; comment Select all BUNs of a BAT with a certain tail value. Selection on NIL is also possible (it should be properly casted, e.g.:int(nil)). -command algebra.select(b:bat[:any_1,:any_2],low:any_2,high:any_2,li:bit,hi:bit):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],low:any_2,high:any_2,li:bit,hi:bit):bat[:oid,:any_2] address ALGselectInclusive; comment Select all BUNs that have tail values: {v| low <{=} v <{=} high}. Boundary inclusion is indicated separately. NIL boundary values have a special meaning. + low == nil means: no lower bound + high == nil means: no upper bound. -command algebra.select(b:bat[:any_1,:any_2],low:any_2,high:any_2):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],low:any_2,high:any_2):bat[:oid,:any_2] address ALGselect; comment Select all BUNs that have tail values: {v| low <= v <= high}. NIL boundary values have a special meaning. + low == nil means: no lower bound + high == nil means: no upper bound. NOTE 1: you should cast the nil to the appropriate type, e.g. int(nil) in order to circumvent type clashes. NOTE 2: as the 'nil' element has no clear place in the ordered domain of values, tuples with 'nil' values are NEVER returned by the range select. @@ -2759,10 +2747,6 @@ command algebra.topN(b:bat[:any_1,:any_2 address ALGtopN; comment Trim all but the top N tuples. -command algebra.thetaselect(b:bat[:any_1,:any_2],val:any_2,op:str):bat[:any_1,:any_2] -address ALGthetaselect; -comment The theta (<=,<,=,>,>=) select() - command algebra.thetasubselect(b:bat[:oid,:any_1],s:bat[:oid,:oid],val:any_1,op:str):bat[:oid,:oid] address ALGthetasubselect2; comment Select all head values of the first input BAT for which the tail value obeys the relation value OP VAL and for which the head value occurs in the tail of the second input BAT. Input is a dense-headed BAT, output is a dense-headed BAT with in the tail the head value of the input BAT for which the relationship holds. The output BAT is sorted on the tail value. 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 @@ -2691,31 +2691,19 @@ command algebra.slice(b:bat[:any_1,:any_ address ALGslice_oid; comment Return the slice based on head oid x till y (exclusive). -command algebra.select(b:bat[:any_2,:void],low:any_2,high:any_2,li:bit,hi:bit):bat[:any_2,:void] -address ALGselectInclusiveHead; -command algebra.select(b:bat[:any_2,:void],low:any_2,high:any_2):bat[:any_2,:void] -address ALGselectHead; -command algebra.select(b:bat[:any_2,:void],low:any_2):bat[:any_2,:void] -address ALGselect1Head; -command algebra.selectH(b:bat[:any_1,:any_2],value:any_1):bat[:any_1,:any_2] -address ALGselect1Head; -command algebra.selectH(b:bat[:any_1,:any_2],low:any_1,high:any_1,li:bit,hi:bit):bat[:any_1,:any_2] -address ALGselectInclusiveHead; -command algebra.selectH(b:bat[:any_1,:any_2],low:any_1,high:any_1):bat[:any_1,:any_2] -address ALGselectHead; -command algebra.selectNotNil(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] +command algebra.selectNotNil(b:bat[:oid,:any_2]):bat[:oid,:any_2] address ALGselectNotNil; comment Select all not-nil values -command algebra.select(b:bat[:any_1,:any_2],value:any_2):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],value:any_2):bat[:oid,:any_2] address ALGselect1; comment Select all BUNs of a BAT with a certain tail value. Selection on NIL is also possible (it should be properly casted, e.g.:int(nil)). -command algebra.select(b:bat[:any_1,:any_2],low:any_2,high:any_2,li:bit,hi:bit):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],low:any_2,high:any_2,li:bit,hi:bit):bat[:oid,:any_2] address ALGselectInclusive; comment Select all BUNs that have tail values: {v| low <{=} v <{=} high}. Boundary inclusion is indicated separately. NIL boundary values have a special meaning. + low == nil means: no lower bound + high == nil means: no upper bound. -command algebra.select(b:bat[:any_1,:any_2],low:any_2,high:any_2):bat[:any_1,:any_2] +command algebra.select(b:bat[:oid,:any_2],low:any_2,high:any_2):bat[:oid,:any_2] address ALGselect; comment Select all BUNs that have tail values: {v| low <= v <= high}. NIL boundary values have a special meaning. + low == nil means: no lower bound + high == nil means: no upper bound. NOTE 1: you should cast the nil to the appropriate type, e.g. int(nil) in order to circumvent type clashes. NOTE 2: as the 'nil' element has no clear place in the ordered domain of values, tuples with 'nil' values are NEVER returned by the range select. @@ -2759,10 +2747,6 @@ command algebra.topN(b:bat[:any_1,:any_2 address ALGtopN; comment Trim all but the top N tuples. -command algebra.thetaselect(b:bat[:any_1,:any_2],val:any_2,op:str):bat[:any_1,:any_2] -address ALGthetaselect; -comment The theta (<=,<,=,>,>=) select() - command algebra.thetasubselect(b:bat[:oid,:any_1],s:bat[:oid,:oid],val:any_1,op:str):bat[:oid,:oid] address ALGthetasubselect2; comment Select all head values of the first input BAT for which the tail value obeys the relation value OP VAL and for which the head value occurs in the tail of the second input BAT. Input is a dense-headed BAT, output is a dense-headed BAT with in the tail the head value of the input BAT for which the relationship holds. The output BAT is sorted on the tail value. diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -782,10 +782,7 @@ str ALGrevert(int *result, int *bid); str ALGsample(int *result, int *bid, int *param); str ALGselect(int *result, int *bid, ptr low, ptr high); str ALGselect1(int *result, int *bid, ptr value); -str ALGselect1Head(int *result, int *bid, ptr value); -str ALGselectHead(int *result, int *bid, ptr low, ptr high); str ALGselectInclusive(int *result, int *bid, ptr low, ptr high, bit *lin, bit *rin); -str ALGselectInclusiveHead(int *result, int *bid, ptr low, ptr high, bit *lin, bit *rin); str ALGselectNotNil(int *result, int *bid); str ALGsemijoin(int *result, int *lid, int *rid); str ALGslice(int *ret, bat *bid, lng *start, lng *end); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list