Changeset: 01fd0b13a636 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=01fd0b13a636 Modified Files: monetdb5/modules/mal/Tests/inspect05.stable.out.int128 Branch: leftmart Log Message:
removing conflict, but needs to be synced later on with default diffs (82 lines): diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.int128 b/monetdb5/modules/mal/Tests/inspect05.stable.out.int128 --- a/monetdb5/modules/mal/Tests/inspect05.stable.out.int128 +++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.int128 @@ -47,7 +47,6 @@ end user.main; [ 6@0, "delete", "command", "bat", "(b:bat[:oid,:any_1],src:bat[:oid,:any_1]):bat[:oid,:any_1] ", "BKCdelete_bat_bun;" ] [ 7@0, "delete", "command", "bat", "(b:bat[:oid,:any_1]):bat[:oid,:any_1] ", "BKCdelete_all;" ] [ 8@0, "densebat", "command", "bat", "(b:bat[:oid,:any_1],h:oid):bat[:oid,:any_1] ", "BKCdelete;" ] -<<<<<<< /ufs/lsidir/monetdb/MonetDB/monetdb5/modules/mal/Tests/inspect05.stable.out.int128 [ 9@0, "getAccess", "pattern", "bat", "(bv:bat[:oid,:any_1]):bat[:oid,:oid] ", "OIDXgetorderidx;" ] [ 10@0, "getCapacity", "command", "bat", "(b:bat[:oid,:any_1]):str ", "BKCgetBBPname;" ] [ 11@0, "getColumnType", "command", "bat", "(b:bat[:oid,:any_1]):oid ", "BKCgetSequenceBase;" ] @@ -116,70 +115,6 @@ end user.main; [ 74@0, "setRole", "command", "bat", "(b:bat[:oid,:any_1],s:str):void ", "BKCsetName;" ] [ 75@0, "setTransient", "command", "bat", "(b:bat[:oid,:any_1],mode:str):bat[:oid,:any_1] ", "BKCsetAccess;" ] [ 76@0, "single", "command", "bat", "(b:bat[:oid,:any_1],mode:bit):bat[:oid,:any_1] ", "BKCsetkey;" ] -======= -[ 9@0, "getAccess", "command", "bat", "(b:bat[:oid,:any_1]):str ", "BKCgetBBPname;" ] -[ 10@0, "getCapacity", "command", "bat", "(b:bat[:oid,:any_1]):oid ", "BKCgetSequenceBase;" ] -[ 11@0, "getColumnType", "command", "bat", "(b:bat[:oid,:any_1]):str ", "BKCgetAccess;" ] -[ 12@0, "getName", "command", "bat", "(bid:bat[:oid,:any_1]):str ", "BKCgetRole;" ] -[ 13@0, "getRole", "command", "bat", "(b:bat[:oid,:any_1]):str ", "BKCgetColumnType;" ] -[ 14@0, "getSequenceBase", "command", "bat", "(b:bat[:oid,:any_1]):lng ", "BKCgetCapacity;" ] -[ 15@0, "getSize", "command", "bat", "(b:bat[:oid,:any_1]):lng ", "BKCgetSize;" ] -[ 16@0, "imprints", "command", "bat", "(b:bat[:oid,:hge]):lng ", "CMDBATimprintsize;" ] -[ 17@0, "imprints", "command", "bat", "(b:bat[:oid,:hge]):void ", "CMDBATimprints;" ] -[ 18@0, "imprints", "command", "bat", "(b:bat[:oid,:dbl]):lng ", "CMDBATimprintsize;" ] -[ 19@0, "imprints", "command", "bat", "(b:bat[:oid,:flt]):lng ", "CMDBATimprintsize;" ] -[ 20@0, "imprints", "command", "bat", "(b:bat[:oid,:lng]):lng ", "CMDBATimprintsize;" ] -[ 21@0, "imprints", "command", "bat", "(b:bat[:oid,:int]):lng ", "CMDBATimprintsize;" ] -[ 22@0, "imprints", "command", "bat", "(b:bat[:oid,:sht]):lng ", "CMDBATimprintsize;" ] -[ 23@0, "imprintsize", "command", "bat", "(b:bat[:oid,:bte]):lng ", "CMDBATimprintsize;" ] -[ 24@0, "imprintsize", "command", "bat", "(b:bat[:oid,:dbl]):void ", "CMDBATimprints;" ] -[ 25@0, "imprintsize", "command", "bat", "(b:bat[:oid,:flt]):void ", "CMDBATimprints;" ] -[ 26@0, "imprintsize", "command", "bat", "(b:bat[:oid,:lng]):void ", "CMDBATimprints;" ] -[ 27@0, "imprintsize", "command", "bat", "(b:bat[:oid,:int]):void ", "CMDBATimprints;" ] -[ 28@0, "imprintsize", "command", "bat", "(b:bat[:oid,:sht]):void ", "CMDBATimprints;" ] -[ 29@0, "imprintsize", "command", "bat", "(b:bat[:oid,:bte]):void ", "CMDBATimprints;" ] -[ 30@0, "info", "command", "bat", "(a:bat[:oid,:oid],b:bat[:oid,:oid]):bat[:oid,:oid] ", "BKCintersectcand;" ] -[ 31@0, "intersectcand", "command", "bat", "(b1:bat[:oid,:any_1],b2:bat[:oid,:any_2]):bit ", "BKCisSynced;" ] -[ 32@0, "isPersistent", "command", "bat", "(b:bat[:oid,:any_1]):bit ", "BKCisPersistent;" ] -[ 33@0, "isSorted", "command", "bat", "(b:bat[:oid,:any_1]):bit ", "BKCisTransient;" ] -[ 34@0, "isSortedReverse", "command", "bat", "(b:bat[:oid,:any_1]):bit ", "BKCisSortedReverse;" ] -[ 35@0, "isSynced", "command", "bat", "(b:bat[:oid,:any_1]):bit ", "BKCisSorted;" ] -[ 36@0, "isTransient", "command", "bat", "(b:bat[:oid,:any_1]):bit ", "BKCgetKey;" ] -[ 37@0, "isaKey", "command", "bat", "(b:bat[:oid,:any_1]) (X_2:bat[:oid,:str],X_3:bat[:oid,:str]) ", "BKCinfo;" ] -[ 38@0, "mergecand", "command", "bat", "(a:bat[:oid,:oid],b:bat[:oid,:oid]):bat[:oid,:oid] ", "BKCmergecand;" ] -[ 39@0, "mirror", "command", "bat", "(b:bat[:any_1,:any_2]):bat[:any_1,:any_1] ", "BKCmirror;" ] -[ 40@0, "new", "command", "bat", "(nme:str):bat[:oid,:any_1] ", "CMDBATderivedByName;" ] -[ 41@0, "new", "pattern", "bat", "(b:bat[:oid,:any_1],size:lng):bat[:oid,:any_1] ", "CMDBATnewDerived;" ] -[ 42@0, "new", "pattern", "bat", "(b:bat[:oid,:any_1]):bat[:oid,:any_1] ", "CMDBATnewDerived;" ] -[ 43@0, "new", "pattern", "bat", "(ht:oid,tt:any_1,size:lng):bat[:oid,:any_1] ", "CMDBATnew_persistent;" ] -[ 44@0, "new", "pattern", "bat", "(ht:oid,tt:any_1,size:int):bat[:oid,:any_1] ", "CMDBATnew_persistent;" ] -[ 45@0, "new", "pattern", "bat", "(ht:oid,tt:any_1):bat[:oid,:any_1] ", "CMDBATnew_persistent;" ] -[ 46@0, "new_persistent", "pattern", "bat", "(ht:oid,tt:any_1,size:lng):bat[:oid,:any_1] ", "CMDBATnew;" ] -[ 47@0, "new_persistent", "pattern", "bat", "(ht:oid,tt:any_1,size:int):bat[:oid,:any_1] ", "CMDBATnew;" ] -[ 48@0, "new_persistent", "pattern", "bat", "(ht:oid,tt:any_1):bat[:oid,:any_1] ", "CMDBATnew;" ] -[ 49@0, "partition", "pattern", "bat", "(b:bat[:oid,:any_1],pieces:int,n:int):bat[:oid,:any_1] ", "CMDBATpartition2;" ] -[ 50@0, "partition", "pattern", "bat", "(b:bat[:oid,:any_1]):bat[:oid,:any_1]... ", "CMDBATpartition;" ] -[ 51@0, "replace", "command", "bat", "(b:bat[:oid,:any_1],del:bat[:oid,:oid]):bat[:oid,:oid] ", "BKCreuseBATmap;" ] -[ 52@0, "replace", "command", "bat", "(b:bat[:oid,:any_1],del:bat[:oid,:oid]):bat[:oid,:any_1] ", "BKCreuseBAT;" ] -[ 53@0, "replace", "command", "bat", "(b:bat[:oid,:any_1],rid:bat[:oid,:oid],val:bat[:oid,:any_1],force:bit):bat[:oid,:any_1] ", "BKCbat_inplace_force;" ] -[ 54@0, "replace", "command", "bat", "(b:bat[:oid,:any_1],rid:bat[:oid,:oid],val:bat[:oid,:any_1]):bat[:oid,:any_1] ", "BKCbat_inplace;" ] -[ 55@0, "reuse", "command", "bat", "(b:bat[:oid,:any_1],h:oid,t:any_1,force:bit):bat[:oid,:any_1] ", "BKCbun_inplace_force;" ] -[ 56@0, "reuseMap", "command", "bat", "(b:bat[:oid,:any_1],h:oid,t:any_1):bat[:oid,:any_1] ", "BKCbun_inplace;" ] -[ 57@0, "reverse", "command", "bat", "(b:bat[:any_1,:any_2]):bat[:any_2,:any_1] ", "BKCreverse;" ] -[ 58@0, "save", "pattern", "bat", "(val:any_1):bat[:oid,:any_1] ", "CMDBATsingle;" ] -[ 59@0, "save", "command", "bat", "(b:bat[:oid,:any_1]):bit ", "BKCsetImprints;" ] -[ 60@0, "setAccess", "command", "bat", "(b:bat[:oid,:any_1]):bit ", "BKCsetHash;" ] -[ 61@0, "setColumn", "command", "bat", "(nme:str):bit ", "BKCsave;" ] -[ 62@0, "setColumn", "command", "bat", "(nme:bat[:oid,:any_1]):void ", "BKCsave2;" ] -[ 63@0, "setHash", "command", "bat", "(b:bat[:oid,:any_1]):void ", "BKCsetPersistent;" ] -[ 64@0, "setImprints", "command", "bat", "(b:bat[:oid,:any_1]):void ", "BKCsetTransient;" ] -[ 65@0, "setKey", "command", "bat", "(b:bat[:oid,:any_1],h:str,t:str):void ", "BKCsetColumns;" ] -[ 66@0, "setName", "command", "bat", "(b:bat[:oid,:any_1],t:str):void ", "BKCsetColumn;" ] -[ 67@0, "setPersistent", "command", "bat", "(b:bat[:oid,:any_1],h:str,t:str):void ", "BKCsetRole;" ] -[ 68@0, "setRole", "command", "bat", "(b:bat[:oid,:any_1],s:str):void ", "BKCsetName;" ] -[ 69@0, "setTransient", "command", "bat", "(b:bat[:oid,:any_1],mode:str):bat[:oid,:any_1] ", "BKCsetAccess;" ] -[ 70@0, "single", "command", "bat", "(b:bat[:oid,:any_1],mode:bit):bat[:oid,:any_1] ", "BKCsetkey;" ] ->>>>>>> /tmp/inspect05.stable.out.int128~other.IhkPij # 08:55:30 > # 08:55:30 > Done. _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
