[prev in list] [next in list] [prev in thread] [next in thread]
List: monetdb-checkins
Subject: MonetDB: default - More pcre interface cleanup
From: Martin Kersten <commits () monetdb ! org>
Date: 2014-02-27 10:48:24
Message-ID: hg.aae16159004f.1393498104.6315528441665844383 () monetdb2 ! cwi-incubator ! nl
[Download RAW message or body]
Changeset: aae16159004f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aae16159004f
Modified Files:
clients/Tests/MAL-signatures_gsl.stable.out
clients/Tests/SQL-dump_gsl.stable.out
clients/Tests/exports.stable.out
monetdb5/mal/Tests/tst049.mal
monetdb5/mal/Tests/tst049.stable.out
monetdb5/mal/Tests/tst960.mal
monetdb5/mal/Tests/tst960.stable.out
monetdb5/modules/kernel/batstr.c
monetdb5/modules/kernel/batstr.mal
monetdb5/modules/mal/Tests/All
monetdb5/modules/mal/pcre.mal
monetdb5/optimizer/Tests/inline09.mal
monetdb5/optimizer/Tests/inline09.stable.out
sql/test/leaks/Tests/check1_gsl.stable.out
sql/test/leaks/Tests/check2_gsl.stable.out
sql/test/leaks/Tests/check3_gsl.stable.out
sql/test/leaks/Tests/check4_gsl.stable.out
sql/test/leaks/Tests/check5_gsl.stable.out
Branch: default
Log Message:
More pcre interface cleanup
diffs (truncated from 3719 to 300 lines):
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
@@ -3033,14 +3033,6 @@ command batstr.like(s:bat[:oid,:str],pat
address BATPCRElike2;
command batstr.like(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:bit]
address BATPCRElike;
-command batstr.like_uselect(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:void]
-address STRbatlike_uselect;
-comment Perform SQL like operation against a string bat
-
-command batstr.like_uselect(s:bat[:oid,:str],pat:str):bat[:oid,:void]
-address STRbatlike_uselect2;
-comment Perform SQL like operation against a string bat
-
command batstr.ltrim(s:bat[:oid,:str]):bat[:oid,:str]
address STRbatLtrim;
comment Strip whitespaces from start of a string.
@@ -3061,10 +3053,6 @@ command batstr.nbytes(s:bat[:oid,:str]):
address STRbatBytes;
comment Return the string length in bytes.
-command batstr.replace(s:bat[:oid,:str],pat:str,s2:str):bat[:oid,:str]
-address STRbatreplace;
-comment Insert a string into another
-
command batstr.r_search(s:bat[:oid,:str],c:str):bat[:oid,:int]
address STRbatRstrSearchcst;
comment Reverse search for a substring. Returns position, -1 if not found.
@@ -32094,18 +32082,6 @@ pattern bbp.bind(name:str):bat[:oid,:any
address CMDbbpbind;
comment Locate the BAT using its logical name
-command bbp.compress(b:bat[:oid,:any_2],fnme:str):bat[:oid,:any_2]
-address CMDbbpcompress;
-comment Generate a compressed image of the BAT on a specific file
-
-command bbp.decompress(b:bat[:oid,:any_2],fnme:str):bat[:oid,:any_2]
-address CMDbbpdecompress;
-comment Obtain a temporary decompressed image of a BAT from a specific file
-
-command bbp.expand(b:bat[:oid,:any_2],fnme:str):bat[:oid,:any_2]
-address CMDbbpexpand;
-comment Expand a compressed image of BAT heaps
-
command bbp.getPageSize():int
address CMDgetPageSize;
comment Obtain the memory page size
@@ -32170,10 +32146,6 @@ command bbp.getIndex(b:bat[:oid,:any_2])
address CMDbbpgetIndex;
comment Retrieve the index in the BBP
-command bbp.truncate(b:bat[:oid,:any_2],fnme:str):bat[:oid,:any_2]
-address CMDbbptruncate;
-comment Truncate the heaps if a compressed image exist
-
command blob.blob(s:str):blob
address BLOBblob_fromstr;
command blob.blob(s:blob):blob
@@ -40750,12 +40722,6 @@ comment Duplicate constant removal optim
pattern optimizer.constants():str
address OPTwrapper;
-pattern optimizer.compression(mod:str,fcn:str):str
-address OPTwrapper;
-comment Compression code injection
-
-pattern optimizer.compression():str
-address OPTwrapper;
pattern optimizer.commonTerms(mod:any_1,fcn:any_2):str
address OPTwrapper;
comment Common sub-expression optimizer
@@ -42317,6 +42283,8 @@ command str.prefix(s:str,l:int):str
address STRprefix;
comment Extract the prefix of a given length
+command str.replace(origin:str,pat:str,repl:str,flags:str):str
+address PCREreplace_wrap;
command str.repeat(s2:str,c:int):str
address STRrepeat;
command str.replace(s:str,pat:str,s2:str):str
diff --git a/clients/Tests/SQL-dump_gsl.stable.out \
b/clients/Tests/SQL-dump_gsl.stable.out
--- a/clients/Tests/SQL-dump_gsl.stable.out
+++ b/clients/Tests/SQL-dump_gsl.stable.out
@@ -158,10 +158,6 @@ SYSTEM FUNCTION sys.getprotocol
SYSTEM FUNCTION sys.getquery
SYSTEM FUNCTION sys.getroboturl
SYSTEM FUNCTION sys.getuser
-SYSTEM FUNCTION sys.gzcompress
-SYSTEM FUNCTION sys.gzdecompress
-SYSTEM FUNCTION sys.gzexpand
-SYSTEM FUNCTION sys.gztruncate
SYSTEM FUNCTION sys.hashsize
SYSTEM FUNCTION sys.heapsize
SYSTEM FUNCTION sys.host
@@ -718,34 +714,6 @@ create function getroboturl(theurl url)
external name url."getRobotURL";
create function getuser(theurl url) returns string
external name url."getUser";
--- The contents of this file are subject to the MonetDB Public License
--- Version 1.1 (the "License"); you may not use this file except in
--- compliance with the License. You may obtain a copy of the License at
--- http://www.monetdb.org/Legal/MonetDBLicense
---
--- Software distributed under the License is distributed on an "AS IS"
--- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
--- License for the specific language governing rights and limitations
--- under the License.
---
--- The Original Code is the MonetDB Database System.
---
--- The Initial Developer of the Original Code is CWI.
--- Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
--- Copyright August 2008-2014 MonetDB B.V.
--- All Rights Reserved.
-
--- Perform LZ-compression over a specific table;
-create procedure gzcompress (s string, t string)
- external name sql.gzcompress;
-create procedure gzdecompress (s string, t string)
- external name sql.gzdecompress;
--- Remove the compressed images
-create procedure gzexpand (s string, t string)
- external name sql.gzexpand;
--- Truncate the storage for columns with a compressed image
-create procedure gztruncate (s string, t string)
- external name sql.gztruncate;
create function sys.heapsize(tpe string, i bigint, w int)
returns bigint
begin
@@ -1694,79 +1662,79 @@ 5360 "rbytes" "bigint" 64 0 5364 NULL tr
5361 "wbytes" "bigint" 64 0 5364 NULL true 9 NULL
5362 "type" "clob" 0 0 5364 NULL true 10 NULL
5363 "stmt" "clob" 0 0 5364 NULL true 11 NULL
-5499 "user" "clob" 0 0 5505 NULL true 0 NULL
-5500 "login" "timestamp" 7 0 5505 NULL true 1 NULL
-5501 "sessiontimeout" "bigint" 64 0 5505 NULL true 2 NULL
-5502 "lastcommand" "timestamp" 7 0 5505 NULL true 3 NULL
-5503 "querytimeout" "bigint" 64 0 5505 NULL true 4 NULL
-5504 "active" "boolean" 1 0 5505 NULL true 5 NULL
-5582 "name" "clob" 0 0 5585 NULL true 0 NULL
-5583 "def" "clob" 0 0 5585 NULL true 1 NULL
-5584 "status" "clob" 0 0 5585 NULL true 2 NULL
-5591 "name" "clob" 0 0 5593 NULL true 0 NULL
-5592 "value" "clob" 0 0 5593 NULL true 1 NULL
-5623 "qtag" "bigint" 64 0 5631 NULL true 0 NULL
-5624 "user" "clob" 0 0 5631 NULL true 1 NULL
-5625 "started" "timestamp" 7 0 5631 NULL true 2 NULL
-5626 "estimate" "timestamp" 7 0 5631 NULL true 3 NULL
-5627 "progress" "int" 32 0 5631 NULL true 4 NULL
-5628 "status" "clob" 0 0 5631 NULL true 5 NULL
-5629 "tag" "oid" 63 0 5631 NULL true 6 NULL
-5630 "query" "clob" 0 0 5631 NULL true 7 NULL
-6255 "schema" "clob" 0 0 6267 NULL true 0 NULL
-6256 "table" "clob" 0 0 6267 NULL true 1 NULL
-6257 "column" "clob" 0 0 6267 NULL true 2 NULL
-6258 "type" "clob" 0 0 6267 NULL true 3 NULL
-6259 "location" "clob" 0 0 6267 NULL true 4 NULL
-6260 "count" "bigint" 64 0 6267 NULL true 5 NULL
-6261 "typewidth" "int" 32 0 6267 NULL true 6 NULL
-6262 "columnsize" "bigint" 64 0 6267 NULL true 7 NULL
-6263 "heapsize" "bigint" 64 0 6267 NULL true 8 NULL
-6264 "hashes" "bigint" 64 0 6267 NULL true 9 NULL
-6265 "imprints" "bigint" 64 0 6267 NULL true 10 NULL
-6266 "sorted" "boolean" 1 0 6267 NULL true 11 NULL
-6269 "schema" "clob" 0 0 6279 NULL true 0 NULL
-6270 "table" "clob" 0 0 6279 NULL true 1 NULL
-6271 "column" "clob" 0 0 6279 NULL true 2 NULL
-6272 "type" "clob" 0 0 6279 NULL true 3 NULL
-6273 "typewidth" "int" 32 0 6279 NULL true 4 NULL
-6274 "count" "bigint" 64 0 6279 NULL true 5 NULL
-6275 "distinct" "bigint" 64 0 6279 NULL true 6 NULL
-6276 "atomwidth" "int" 32 0 6279 NULL true 7 NULL
-6277 "reference" "boolean" 1 0 6279 NULL true 8 NULL
-6278 "sorted" "boolean" 1 0 6279 NULL true 9 NULL
-6317 "schema" "clob" 0 0 6327 NULL true 0 NULL
-6318 "table" "clob" 0 0 6327 NULL true 1 NULL
-6319 "column" "clob" 0 0 6327 NULL true 2 NULL
-6320 "type" "clob" 0 0 6327 NULL true 3 NULL
-6321 "count" "bigint" 64 0 6327 NULL true 4 NULL
-6322 "columnsize" "bigint" 64 0 6327 NULL true 5 NULL
-6323 "heapsize" "bigint" 64 0 6327 NULL true 6 NULL
-6324 "hashes" "bigint" 64 0 6327 NULL true 7 NULL
-6325 "imprints" "bigint" 64 0 6327 NULL true 8 NULL
-6326 "sorted" "boolean" 1 0 6327 NULL true 9 NULL
-6329 "schema" "clob" 0 0 6337 NULL true 0 NULL
-6330 "table" "clob" 0 0 6337 NULL true 1 NULL
-6331 "count" "bigint" 64 0 6337 NULL true 2 NULL
-6332 "columnsize" "bigint" 64 0 6337 NULL true 3 NULL
-6333 "heapsize" "bigint" 64 0 6337 NULL true 4 NULL
-6334 "hashes" "bigint" 64 0 6337 NULL true 5 NULL
-6335 "imprints" "bigint" 64 0 6337 NULL true 6 NULL
-6336 "auxillary" "bigint" 53 0 6337 NULL true 7 NULL
-6339 "schema" "clob" 0 0 6352 NULL true 0 NULL
-6340 "table" "clob" 0 0 6352 NULL true 1 NULL
-6341 "column" "clob" 0 0 6352 NULL true 2 NULL
-6342 "type" "clob" 0 0 6352 NULL true 3 NULL
-6343 "width" "int" 32 0 6352 NULL true 4 NULL
-6344 "stamp" "timestamp" 7 0 6352 NULL true 5 NULL
-6345 "sample" "bigint" 64 0 6352 NULL true 6 NULL
-6346 "count" "bigint" 64 0 6352 NULL true 7 NULL
-6347 "unique" "bigint" 64 0 6352 NULL true 8 NULL
-6348 "nils" "bigint" 64 0 6352 NULL true 9 NULL
-6349 "minval" "clob" 0 0 6352 NULL true 10 NULL
-6350 "maxval" "clob" 0 0 6352 NULL true 11 NULL
-6351 "sorted" "boolean" 1 0 6352 NULL true 12 NULL
-6405 "function_id" "int" 32 0 6406 NULL true 0 NULL
+5483 "user" "clob" 0 0 5489 NULL true 0 NULL
+5484 "login" "timestamp" 7 0 5489 NULL true 1 NULL
+5485 "sessiontimeout" "bigint" 64 0 5489 NULL true 2 NULL
+5486 "lastcommand" "timestamp" 7 0 5489 NULL true 3 NULL
+5487 "querytimeout" "bigint" 64 0 5489 NULL true 4 NULL
+5488 "active" "boolean" 1 0 5489 NULL true 5 NULL
+5566 "name" "clob" 0 0 5569 NULL true 0 NULL
+5567 "def" "clob" 0 0 5569 NULL true 1 NULL
+5568 "status" "clob" 0 0 5569 NULL true 2 NULL
+5575 "name" "clob" 0 0 5577 NULL true 0 NULL
+5576 "value" "clob" 0 0 5577 NULL true 1 NULL
+5607 "qtag" "bigint" 64 0 5615 NULL true 0 NULL
+5608 "user" "clob" 0 0 5615 NULL true 1 NULL
+5609 "started" "timestamp" 7 0 5615 NULL true 2 NULL
+5610 "estimate" "timestamp" 7 0 5615 NULL true 3 NULL
+5611 "progress" "int" 32 0 5615 NULL true 4 NULL
+5612 "status" "clob" 0 0 5615 NULL true 5 NULL
+5613 "tag" "oid" 63 0 5615 NULL true 6 NULL
+5614 "query" "clob" 0 0 5615 NULL true 7 NULL
+6239 "schema" "clob" 0 0 6251 NULL true 0 NULL
+6240 "table" "clob" 0 0 6251 NULL true 1 NULL
+6241 "column" "clob" 0 0 6251 NULL true 2 NULL
+6242 "type" "clob" 0 0 6251 NULL true 3 NULL
+6243 "location" "clob" 0 0 6251 NULL true 4 NULL
+6244 "count" "bigint" 64 0 6251 NULL true 5 NULL
+6245 "typewidth" "int" 32 0 6251 NULL true 6 NULL
+6246 "columnsize" "bigint" 64 0 6251 NULL true 7 NULL
+6247 "heapsize" "bigint" 64 0 6251 NULL true 8 NULL
+6248 "hashes" "bigint" 64 0 6251 NULL true 9 NULL
+6249 "imprints" "bigint" 64 0 6251 NULL true 10 NULL
+6250 "sorted" "boolean" 1 0 6251 NULL true 11 NULL
+6253 "schema" "clob" 0 0 6263 NULL true 0 NULL
+6254 "table" "clob" 0 0 6263 NULL true 1 NULL
+6255 "column" "clob" 0 0 6263 NULL true 2 NULL
+6256 "type" "clob" 0 0 6263 NULL true 3 NULL
+6257 "typewidth" "int" 32 0 6263 NULL true 4 NULL
+6258 "count" "bigint" 64 0 6263 NULL true 5 NULL
+6259 "distinct" "bigint" 64 0 6263 NULL true 6 NULL
+6260 "atomwidth" "int" 32 0 6263 NULL true 7 NULL
+6261 "reference" "boolean" 1 0 6263 NULL true 8 NULL
+6262 "sorted" "boolean" 1 0 6263 NULL true 9 NULL
+6301 "schema" "clob" 0 0 6311 NULL true 0 NULL
+6302 "table" "clob" 0 0 6311 NULL true 1 NULL
+6303 "column" "clob" 0 0 6311 NULL true 2 NULL
+6304 "type" "clob" 0 0 6311 NULL true 3 NULL
+6305 "count" "bigint" 64 0 6311 NULL true 4 NULL
+6306 "columnsize" "bigint" 64 0 6311 NULL true 5 NULL
+6307 "heapsize" "bigint" 64 0 6311 NULL true 6 NULL
+6308 "hashes" "bigint" 64 0 6311 NULL true 7 NULL
+6309 "imprints" "bigint" 64 0 6311 NULL true 8 NULL
+6310 "sorted" "boolean" 1 0 6311 NULL true 9 NULL
+6313 "schema" "clob" 0 0 6321 NULL true 0 NULL
+6314 "table" "clob" 0 0 6321 NULL true 1 NULL
+6315 "count" "bigint" 64 0 6321 NULL true 2 NULL
+6316 "columnsize" "bigint" 64 0 6321 NULL true 3 NULL
+6317 "heapsize" "bigint" 64 0 6321 NULL true 4 NULL
+6318 "hashes" "bigint" 64 0 6321 NULL true 5 NULL
+6319 "imprints" "bigint" 64 0 6321 NULL true 6 NULL
+6320 "auxillary" "bigint" 53 0 6321 NULL true 7 NULL
+6323 "schema" "clob" 0 0 6336 NULL true 0 NULL
+6324 "table" "clob" 0 0 6336 NULL true 1 NULL
+6325 "column" "clob" 0 0 6336 NULL true 2 NULL
+6326 "type" "clob" 0 0 6336 NULL true 3 NULL
+6327 "width" "int" 32 0 6336 NULL true 4 NULL
+6328 "stamp" "timestamp" 7 0 6336 NULL true 5 NULL
+6329 "sample" "bigint" 64 0 6336 NULL true 6 NULL
+6330 "count" "bigint" 64 0 6336 NULL true 7 NULL
+6331 "unique" "bigint" 64 0 6336 NULL true 8 NULL
+6332 "nils" "bigint" 64 0 6336 NULL true 9 NULL
+6333 "minval" "clob" 0 0 6336 NULL true 10 NULL
+6334 "maxval" "clob" 0 0 6336 NULL true 11 NULL
+6335 "sorted" "boolean" 1 0 6336 NULL true 12 NULL
+6389 "function_id" "int" 32 0 6390 NULL true 0 NULL
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."_tables" (
@@ -1810,16 +1778,16 @@ 5297 "querylog_catalog" 2000 "-- create
5309 "querylog_calls" 2000 "create view sys.querylog_calls as select * from \
sys.querylog_calls();" 1 true 0 false 5327 "querylog_history" 2000 "create view \
sys.querylog_history as\nselect qd.*, ql.\"start\",ql.\"stop\", ql.arguments, \
ql.tuples, ql.run, ql.ship, ql.cpu, ql.space, ql.io \nfrom sys.querylog_catalog() qd, \
sys.querylog_calls() ql\nwhere qd.id = ql.id and qd.owner = user;" 1 true 0 false \
5364 "tracelog" 2000 "create view sys.tracelog as select * from \
sys.tracelog();" 1 true 0 false
-5505 "sessions" 2000 "create view sys.sessions as select * from \
sys.sessions();" 1 true 0 false
-5585 "optimizers" 2000 "create view sys.optimizers as select * from \
sys.optimizers();" 1 true 0 false
-5593 "environment" 2000 "create view sys.environment as select * from \
sys.environment();" 1 true 0 false
-5631 "queue" 2000 "create view sys.queue as select * from \
sys.queue();" 1 true 0 false
-6267 "storage" 2000 "create view sys.storage as select * from \
sys.storage();" 1 true 0 false
-6279 "storagemodelinput" 2000 NULL 0 true 0 false
-6327 "storagemodel" 2000 "create view sys.storagemodel as select * from \
sys.storagemodel();" 1 true 0 false
-6337 "tablestoragemodel" 2000 "-- A summary of the table storage requirement is is \
available as a table view.\n-- The auxillary column denotes the maximum space if all \
non-sorted columns\n-- would be augmented with a hash (rare situation)\ncreate view \
sys.tablestoragemodel\nas select \"schema\",\"table\",max(count) as \
\"count\",\n\tsum(columnsize) as columnsize,\n\tsum(heapsize) as \
heapsize,\n\tsum(hashes) as hashes,\n\tsum(imprints) as imprints,\n\tsum(case when \
sorted = false then 8 * count else 0 end) as auxillary\nfrom sys.storagemodel() group \
by \"schema\",\"table\";" 1 true 0 false
-6352 "statistics" 2000 NULL 0 true 0 false
-6406 "systemfunctions" 2000 NULL 0 true 0 false
+5489 "sessions" 2000 "create view sys.sessions as select * from \
sys.sessions();" 1 true 0 false +5569 "optimizers" 2000 "create view sys.optimizers \
as select * from sys.optimizers();" 1 true 0 false +5577 "environment" 2000 "create \
view sys.environment as select * from sys.environment();" 1 true 0 false \
_______________________________________________ checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic