Changeset: 6877ffc934f1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6877ffc934f1 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out.int128 Branch: default Log Message:
approved output diffs (truncated from 5119 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 @@ -41115,6 +41115,10 @@ command str.substitute(s:str,src:str,dst address STRSubstitute; comment Substitute first occurrence of 'src' by 'dst'. Iff repeated = true this is repeated while 'src' can be found in the result string. In order to prevent recursion and result strings of unlimited size, repeating is only done iff src is not a substring of dst. +command str.splitpart(s:str,needle:str,field:int):str +address STRsplitpart; +comment Split string on delimiter. Returns given field (counting from one.) + command str.search(s:str,c:str):int address STRstrSearch; comment Search for a substring. Returns position, -1 if not found. diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -52058,6 +52058,10 @@ command str.substitute(s:str,src:str,dst address STRSubstitute; comment Substitute first occurrence of 'src' by 'dst'. Iff repeated = true this is repeated while 'src' can be found in the result string. In order to prevent recursion and result strings of unlimited size, repeating is only done iff src is not a substring of dst. +command str.splitpart(s:str,needle:str,field:int):str +address STRsplitpart; +comment Split string on delimiter. Returns given field (counting from one.) + command str.search(s:str,c:str):int address STRstrSearch; comment Search for a substring. Returns position, -1 if not found. diff --git a/clients/Tests/SQL-dump.stable.out.int128 b/clients/Tests/SQL-dump.stable.out.int128 --- a/clients/Tests/SQL-dump.stable.out.int128 +++ b/clients/Tests/SQL-dump.stable.out.int128 @@ -1510,231 +1510,231 @@ 2149 "statement" "varchar" 2048 0 2139 N 2151 "id" "int" 32 0 2150 NULL true 0 NULL 2152 "name" "varchar" 1024 0 2150 NULL true 1 NULL 2153 "nr" "int" 32 0 2150 NULL true 2 NULL -5655 "id" "int" 32 0 5654 NULL true 0 NULL -5656 "name" "varchar" 1024 0 5654 NULL true 1 NULL -5657 "schema_id" "int" 32 0 5654 NULL true 2 NULL -5658 "query" "varchar" 2048 0 5654 NULL true 3 NULL -5659 "type" "smallint" 16 0 5654 NULL true 4 NULL -5660 "system" "boolean" 1 0 5654 NULL true 5 NULL -5661 "commit_action" "smallint" 16 0 5654 NULL true 6 NULL -5662 "access" "smallint" 16 0 5654 NULL true 7 NULL -5663 "temporary" "smallint" 16 0 5654 NULL true 8 NULL -5664 "table_type" "smallint" 16 0 5654 NULL true 9 NULL -5666 "id" "int" 32 0 5665 NULL true 0 NULL -5667 "name" "varchar" 1024 0 5665 NULL true 1 NULL -5668 "type" "varchar" 1024 0 5665 NULL true 2 NULL -5669 "type_digits" "int" 32 0 5665 NULL true 3 NULL -5670 "type_scale" "int" 32 0 5665 NULL true 4 NULL -5671 "table_id" "int" 32 0 5665 NULL true 5 NULL -5672 "default" "varchar" 2048 0 5665 NULL true 6 NULL -5673 "null" "boolean" 1 0 5665 NULL true 7 NULL -5674 "number" "int" 32 0 5665 NULL true 8 NULL -5675 "storage" "varchar" 2048 0 5665 NULL true 9 NULL -5682 "name" "varchar" 1024 0 5681 NULL true 0 NULL -5683 "fullname" "varchar" 2048 0 5681 NULL true 1 NULL -5684 "default_schema" "int" 9 0 5681 NULL true 2 NULL -5688 "name" "varchar" 1024 0 5687 NULL true 0 NULL -5689 "fullname" "varchar" 2024 0 5687 NULL true 1 NULL -5690 "default_schema" "int" 9 0 5687 NULL true 2 NULL -5692 "login_id" "int" 32 0 5691 NULL true 0 NULL -5693 "role_id" "int" 32 0 5691 NULL true 1 NULL -5695 "id" "int" 32 0 5694 NULL true 0 NULL -5696 "name" "varchar" 1024 0 5694 NULL true 1 NULL -5697 "grantor" "int" 32 0 5694 NULL true 2 NULL -5699 "obj_id" "int" 32 0 5698 NULL true 0 NULL -5700 "auth_id" "int" 32 0 5698 NULL true 1 NULL -5701 "privileges" "int" 32 0 5698 NULL true 2 NULL -5702 "grantor" "int" 32 0 5698 NULL true 3 NULL -5703 "grantable" "int" 32 0 5698 NULL true 4 NULL -5912 "id" "oid" 63 0 5920 NULL true 0 NULL -5913 "owner" "clob" 0 0 5920 NULL true 1 NULL -5914 "defined" "timestamp" 7 0 5920 NULL true 2 NULL -5915 "query" "clob" 0 0 5920 NULL true 3 NULL -5916 "pipe" "clob" 0 0 5920 NULL true 4 NULL -5917 "plan" "clob" 0 0 5920 NULL true 5 NULL -5918 "mal" "int" 32 0 5920 NULL true 6 NULL -5919 "optimize" "bigint" 64 0 5920 NULL true 7 NULL -5922 "id" "oid" 63 0 5931 NULL true 0 NULL -5923 "start" "timestamp" 7 0 5931 NULL true 1 NULL -5924 "stop" "timestamp" 7 0 5931 NULL true 2 NULL -5925 "arguments" "clob" 0 0 5931 NULL true 3 NULL -5926 "tuples" "wrd" 64 0 5931 NULL true 4 NULL -5927 "run" "bigint" 64 0 5931 NULL true 5 NULL -5928 "ship" "bigint" 64 0 5931 NULL true 6 NULL -5929 "cpu" "int" 32 0 5931 NULL true 7 NULL -5930 "io" "int" 32 0 5931 NULL true 8 NULL -5933 "id" "oid" 63 0 5949 NULL true 0 NULL -5934 "owner" "clob" 0 0 5949 NULL true 1 NULL -5935 "defined" "timestamp" 7 0 5949 NULL true 2 NULL -5936 "query" "clob" 0 0 5949 NULL true 3 NULL -5937 "pipe" "clob" 0 0 5949 NULL true 4 NULL -5938 "plan" "clob" 0 0 5949 NULL true 5 NULL -5939 "mal" "int" 32 0 5949 NULL true 6 NULL -5940 "optimize" "bigint" 64 0 5949 NULL true 7 NULL -5941 "start" "timestamp" 7 0 5949 NULL true 8 NULL -5942 "stop" "timestamp" 7 0 5949 NULL true 9 NULL -5943 "arguments" "clob" 0 0 5949 NULL true 10 NULL -5944 "tuples" "wrd" 64 0 5949 NULL true 11 NULL -5945 "run" "bigint" 64 0 5949 NULL true 12 NULL -5946 "ship" "bigint" 64 0 5949 NULL true 13 NULL -5947 "cpu" "int" 32 0 5949 NULL true 14 NULL -5948 "io" "int" 32 0 5949 NULL true 15 NULL -5975 "event" "int" 32 0 5988 NULL true 0 NULL -5976 "clk" "varchar" 20 0 5988 NULL true 1 NULL -5977 "pc" "varchar" 50 0 5988 NULL true 2 NULL -5978 "thread" "int" 32 0 5988 NULL true 3 NULL -5979 "ticks" "bigint" 64 0 5988 NULL true 4 NULL -5980 "rrsmb" "bigint" 64 0 5988 NULL true 5 NULL -5981 "vmmb" "bigint" 64 0 5988 NULL true 6 NULL -5982 "reads" "bigint" 64 0 5988 NULL true 7 NULL -5983 "writes" "bigint" 64 0 5988 NULL true 8 NULL -5984 "minflt" "bigint" 64 0 5988 NULL true 9 NULL -5985 "majflt" "bigint" 64 0 5988 NULL true 10 NULL -5986 "nvcsw" "bigint" 64 0 5988 NULL true 11 NULL -5987 "stmt" "clob" 0 0 5988 NULL true 12 NULL -6118 "user" "clob" 0 0 6124 NULL true 0 NULL -6119 "login" "timestamp" 7 0 6124 NULL true 1 NULL -6120 "sessiontimeout" "bigint" 64 0 6124 NULL true 2 NULL -6121 "lastcommand" "timestamp" 7 0 6124 NULL true 3 NULL -6122 "querytimeout" "bigint" 64 0 6124 NULL true 4 NULL -6123 "active" "boolean" 1 0 6124 NULL true 5 NULL -6201 "name" "clob" 0 0 6204 NULL true 0 NULL -6202 "def" "clob" 0 0 6204 NULL true 1 NULL -6203 "status" "clob" 0 0 6204 NULL true 2 NULL -6210 "name" "clob" 0 0 6212 NULL true 0 NULL -6211 "value" "clob" 0 0 6212 NULL true 1 NULL -6242 "qtag" "bigint" 64 0 6250 NULL true 0 NULL -6243 "user" "clob" 0 0 6250 NULL true 1 NULL -6244 "started" "timestamp" 7 0 6250 NULL true 2 NULL -6245 "estimate" "timestamp" 7 0 6250 NULL true 3 NULL -6246 "progress" "int" 32 0 6250 NULL true 4 NULL -6247 "status" "clob" 0 0 6250 NULL true 5 NULL -6248 "tag" "oid" 63 0 6250 NULL true 6 NULL -6249 "query" "clob" 0 0 6250 NULL true 7 NULL -6921 "keyword" "varchar" 40 0 6924 NULL false 0 NULL -6926 "table_type_id" "smallint" 16 0 6932 NULL false 0 NULL -6929 "table_type_name" "varchar" 25 0 6932 NULL false 1 NULL -6934 "dependency_type_id" "smallint" 16 0 6940 NULL false 0 NULL -6937 "dependency_type_name" "varchar" 15 0 6940 NULL false 1 NULL -6955 "file_id" "int" 32 0 6957 NULL true 0 NULL -6956 "location" "char" 256 0 6957 NULL true 1 NULL -6959 "dim_id" "int" 32 0 6963 NULL true 0 NULL -6960 "file_id" "int" 32 0 6963 NULL true 1 NULL -6961 "name" "varchar" 64 0 6963 NULL true 2 NULL -6962 "length" "int" 32 0 6963 NULL true 3 NULL -6965 "var_id" "int" 32 0 6971 NULL true 0 NULL -6966 "file_id" "int" 32 0 6971 NULL true 1 NULL -6967 "name" "varchar" 64 0 6971 NULL true 2 NULL -6968 "vartype" "varchar" 64 0 6971 NULL true 3 NULL -6969 "ndim" "int" 32 0 6971 NULL true 4 NULL -6970 "coord_dim_id" "int" 32 0 6971 NULL true 5 NULL -6973 "var_id" "int" 32 0 6977 NULL true 0 NULL -6974 "dim_id" "int" 32 0 6977 NULL true 1 NULL -6975 "file_id" "int" 32 0 6977 NULL true 2 NULL -6976 "dimpos" "int" 32 0 6977 NULL true 3 NULL -6979 "obj_name" "varchar" 256 0 6985 NULL true 0 NULL -6980 "att_name" "varchar" 256 0 6985 NULL true 1 NULL -6981 "att_type" "varchar" 64 0 6985 NULL true 2 NULL -6982 "value" "clob" 0 0 6985 NULL true 3 NULL -6983 "file_id" "int" 32 0 6985 NULL true 4 NULL -6984 "gr_name" "varchar" 256 0 6985 NULL true 5 NULL -7010 "schema" "clob" 0 0 7024 NULL true 0 NULL -7011 "table" "clob" 0 0 7024 NULL true 1 NULL -7012 "column" "clob" 0 0 7024 NULL true 2 NULL -7013 "type" "clob" 0 0 7024 NULL true 3 NULL -7014 "mode" "clob" 0 0 7024 NULL true 4 NULL -7015 "location" "clob" 0 0 7024 NULL true 5 NULL -7016 "count" "bigint" 64 0 7024 NULL true 6 NULL -7017 "typewidth" "int" 32 0 7024 NULL true 7 NULL -7018 "columnsize" "bigint" 64 0 7024 NULL true 8 NULL -7019 "heapsize" "bigint" 64 0 7024 NULL true 9 NULL -7020 "hashes" "bigint" 64 0 7024 NULL true 10 NULL -7021 "phash" "boolean" 1 0 7024 NULL true 11 NULL -7022 "imprints" "bigint" 64 0 7024 NULL true 12 NULL -7023 "sorted" "boolean" 1 0 7024 NULL true 13 NULL -7026 "schema" "clob" 0 0 7036 NULL true 0 NULL -7027 "table" "clob" 0 0 7036 NULL true 1 NULL -7028 "column" "clob" 0 0 7036 NULL true 2 NULL -7029 "type" "clob" 0 0 7036 NULL true 3 NULL -7030 "typewidth" "int" 32 0 7036 NULL true 4 NULL -7031 "count" "bigint" 64 0 7036 NULL true 5 NULL -7032 "distinct" "bigint" 64 0 7036 NULL true 6 NULL -7033 "atomwidth" "int" 32 0 7036 NULL true 7 NULL -7034 "reference" "boolean" 1 0 7036 NULL true 8 NULL -7035 "sorted" "boolean" 1 0 7036 NULL true 9 NULL -7074 "schema" "clob" 0 0 7084 NULL true 0 NULL -7075 "table" "clob" 0 0 7084 NULL true 1 NULL -7076 "column" "clob" 0 0 7084 NULL true 2 NULL -7077 "type" "clob" 0 0 7084 NULL true 3 NULL -7078 "count" "bigint" 64 0 7084 NULL true 4 NULL -7079 "columnsize" "bigint" 64 0 7084 NULL true 5 NULL -7080 "heapsize" "bigint" 64 0 7084 NULL true 6 NULL -7081 "hashes" "bigint" 64 0 7084 NULL true 7 NULL -7082 "imprints" "bigint" 64 0 7084 NULL true 8 NULL -7083 "sorted" "boolean" 1 0 7084 NULL true 9 NULL -7086 "schema" "clob" 0 0 7094 NULL true 0 NULL -7087 "table" "clob" 0 0 7094 NULL true 1 NULL -7088 "count" "bigint" 64 0 7094 NULL true 2 NULL -7089 "columnsize" "hugeint" 128 0 7094 NULL true 3 NULL -7090 "heapsize" "hugeint" 128 0 7094 NULL true 4 NULL -7091 "hashes" "hugeint" 128 0 7094 NULL true 5 NULL -7092 "imprints" "hugeint" 128 0 7094 NULL true 6 NULL -7093 "auxiliary" "hugeint" 128 0 7094 NULL true 7 NULL -7096 "column_id" "int" 32 0 7107 NULL true 0 NULL -7097 "type" "clob" 0 0 7107 NULL true 1 NULL -7098 "width" "int" 32 0 7107 NULL true 2 NULL -7099 "stamp" "timestamp" 7 0 7107 NULL true 3 NULL -7100 "sample" "bigint" 64 0 7107 NULL true 4 NULL -7101 "count" "bigint" 64 0 7107 NULL true 5 NULL -7102 "unique" "bigint" 64 0 7107 NULL true 6 NULL -7103 "nils" "bigint" 64 0 7107 NULL true 7 NULL -7104 "minval" "clob" 0 0 7107 NULL true 8 NULL -7105 "maxval" "clob" 0 0 7107 NULL true 9 NULL -7106 "sorted" "boolean" 1 0 7107 NULL true 10 NULL -7197 "file_id" "bigint" 64 0 7205 NULL false 0 NULL -7198 "file_location" "clob" 0 0 7205 NULL false 1 NULL -7199 "dbschema" "smallint" 16 0 7205 NULL false 2 NULL -7200 "format_version" "varchar" 7 0 7205 NULL true 3 NULL -7201 "sorting_order" "varchar" 10 0 7205 NULL true 4 NULL -7202 "comments" "clob" 0 0 7205 NULL true 5 NULL -7207 "sn" "clob" 0 0 7218 NULL false 0 NULL -7208 "file_id" "bigint" 64 0 7218 NULL false 1 NULL -7209 "ln" "int" 32 0 7218 NULL true 2 NULL -7210 "as" "int" 32 0 7218 NULL true 3 NULL -7211 "m5" "clob" 0 0 7218 NULL true 4 NULL -7212 "sp" "clob" 0 0 7218 NULL true 5 NULL -7213 "ur" "clob" 0 0 7218 NULL true 6 NULL -7220 "id" "clob" 0 0 7237 NULL false 0 NULL -7221 "file_id" "bigint" 64 0 7237 NULL false 1 NULL -7222 "cn" "clob" 0 0 7237 NULL true 2 NULL -7223 "ds" "clob" 0 0 7237 NULL true 3 NULL -7224 "dt" "timestamp" 7 0 7237 NULL true 4 NULL -7225 "fo" "clob" 0 0 7237 NULL true 5 NULL -7226 "ks" "clob" 0 0 7237 NULL true 6 NULL -7227 "lb" "clob" 0 0 7237 NULL true 7 NULL -7228 "pg" "clob" 0 0 7237 NULL true 8 NULL -7229 "pi" "int" 32 0 7237 NULL true 9 NULL -7230 "pl" "clob" 0 0 7237 NULL true 10 NULL -7231 "pu" "clob" 0 0 7237 NULL true 11 NULL -7232 "sm" "clob" 0 0 7237 NULL true 12 NULL -7239 "id" "clob" 0 0 7249 NULL false 0 NULL -7240 "file_id" "bigint" 64 0 7249 NULL false 1 NULL -7241 "pn" "clob" 0 0 7249 NULL true 2 NULL -7242 "cl" "clob" 0 0 7249 NULL true 3 NULL -7243 "pp" "clob" 0 0 7249 NULL true 4 NULL -7244 "vn" "clob" 0 0 7249 NULL true 5 NULL -7251 "qname" "clob" 0 0 7262 NULL false 0 NULL -7252 "flag" "smallint" 16 0 7262 NULL false 1 NULL -7253 "rname" "clob" 0 0 7262 NULL false 2 NULL -7254 "pos" "int" 32 0 7262 NULL false 3 NULL -7255 "mapq" "smallint" 16 0 7262 NULL false 4 NULL -7256 "cigar" "clob" 0 0 7262 NULL false 5 NULL -7257 "rnext" "clob" 0 0 7262 NULL false 6 NULL -7258 "pnext" "int" 32 0 7262 NULL false 7 NULL -7259 "tlen" "int" 32 0 7262 NULL false 8 NULL -7260 "seq" "clob" 0 0 7262 NULL false 9 NULL -7261 "qual" "clob" 0 0 7262 NULL false 10 NULL -7343 "function_id" "int" 32 0 7344 NULL true 0 NULL +5667 "id" "int" 32 0 5666 NULL true 0 NULL +5668 "name" "varchar" 1024 0 5666 NULL true 1 NULL +5669 "schema_id" "int" 32 0 5666 NULL true 2 NULL +5670 "query" "varchar" 2048 0 5666 NULL true 3 NULL +5671 "type" "smallint" 16 0 5666 NULL true 4 NULL +5672 "system" "boolean" 1 0 5666 NULL true 5 NULL +5673 "commit_action" "smallint" 16 0 5666 NULL true 6 NULL +5674 "access" "smallint" 16 0 5666 NULL true 7 NULL +5675 "temporary" "smallint" 16 0 5666 NULL true 8 NULL +5676 "table_type" "smallint" 16 0 5666 NULL true 9 NULL +5678 "id" "int" 32 0 5677 NULL true 0 NULL +5679 "name" "varchar" 1024 0 5677 NULL true 1 NULL +5680 "type" "varchar" 1024 0 5677 NULL true 2 NULL +5681 "type_digits" "int" 32 0 5677 NULL true 3 NULL +5682 "type_scale" "int" 32 0 5677 NULL true 4 NULL +5683 "table_id" "int" 32 0 5677 NULL true 5 NULL +5684 "default" "varchar" 2048 0 5677 NULL true 6 NULL +5685 "null" "boolean" 1 0 5677 NULL true 7 NULL +5686 "number" "int" 32 0 5677 NULL true 8 NULL +5687 "storage" "varchar" 2048 0 5677 NULL true 9 NULL +5694 "name" "varchar" 1024 0 5693 NULL true 0 NULL +5695 "fullname" "varchar" 2048 0 5693 NULL true 1 NULL +5696 "default_schema" "int" 9 0 5693 NULL true 2 NULL +5700 "name" "varchar" 1024 0 5699 NULL true 0 NULL +5701 "fullname" "varchar" 2024 0 5699 NULL true 1 NULL +5702 "default_schema" "int" 9 0 5699 NULL true 2 NULL +5704 "login_id" "int" 32 0 5703 NULL true 0 NULL +5705 "role_id" "int" 32 0 5703 NULL true 1 NULL +5707 "id" "int" 32 0 5706 NULL true 0 NULL +5708 "name" "varchar" 1024 0 5706 NULL true 1 NULL +5709 "grantor" "int" 32 0 5706 NULL true 2 NULL +5711 "obj_id" "int" 32 0 5710 NULL true 0 NULL +5712 "auth_id" "int" 32 0 5710 NULL true 1 NULL +5713 "privileges" "int" 32 0 5710 NULL true 2 NULL +5714 "grantor" "int" 32 0 5710 NULL true 3 NULL +5715 "grantable" "int" 32 0 5710 NULL true 4 NULL +5924 "id" "oid" 63 0 5932 NULL true 0 NULL +5925 "owner" "clob" 0 0 5932 NULL true 1 NULL +5926 "defined" "timestamp" 7 0 5932 NULL true 2 NULL +5927 "query" "clob" 0 0 5932 NULL true 3 NULL _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
