Changeset: ab6065b7e530 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ab6065b7e530
Modified Files:
sql/scripts/15_querylog.sql
sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/trace.stable.out
sql/test/UserDump/Tests/create.stable.out
Branch: default
Log Message:
Move querylog back to sys schema
diffs (280 lines):
diff --git a/sql/scripts/15_querylog.sql b/sql/scripts/15_querylog.sql
--- a/sql/scripts/15_querylog.sql
+++ b/sql/scripts/15_querylog.sql
@@ -19,9 +19,7 @@
-- The most important one is a global system variable which controls
-- monitoring of all sessions.
-create schema querylog;
-
-create function querylog.catalog()
+create function sys.querylog_catalog()
returns table(
id oid,
owner string,
@@ -47,7 +45,7 @@ external name sql.querylog_catalog;
-- Reducing the space component improves performance/
-- All timing in usec and all storage in bytes.
-create function querylog.calls()
+create function sys.querylog_calls()
returns table(
id oid, -- references query plan
"start" timestamp, -- time the statement was started
@@ -62,19 +60,19 @@ returns table(
)
external name sql.querylog_calls;
-create view querylog.history as
+create view sys.querylog.history as
select qd.*, ql."start",ql."stop", ql.arguments, ql.tuples, ql.run, ql.ship,
ql.cpu, ql.space, ql.io
-from querylog.catalog() qd, querylog.calls() ql
+from sys.querylog_catalog() qd, sys.querylog_calls() ql
where qd.id = ql.id and qd.owner = user;
-- reset history for a particular user
-create procedure querylog.reset()
+create procedure sys.querylog_reset()
external name sql.querylog_reset;
-- manipulate the query logger
-create procedure querylog.init()
+create procedure sys.querylog_init()
external name sql.querylog_init;
-create procedure querylog.init(threshold smallint)
+create procedure sys.querylog_init(threshold smallint)
external name sql.querylog_init_threshold;
-create procedure querylog.done()
+create procedure sys.querylog_done()
external name sql.querylog_done;
diff --git
a/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
b/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
--- a/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
+++ b/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
@@ -114,7 +114,6 @@ Ready.
START TRANSACTION;
CREATE SCHEMA "querylog" AUTHORIZATION "monetdb";
-CREATE SCHEMA "sysmon" AUTHORIZATION "monetdb";
SET SCHEMA "querylog";
create view querylog.history as
select qd.*, ql."start",ql."stop", ql.arguments, ql.tuples, ql.run, ql.ship,
ql.cpu, ql.space, ql.io
diff --git
a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
--- a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
+++ b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
@@ -128,7 +128,7 @@ top N (
% .explain # table_name
% mal # name
% clob # type
-% 74 # length
+% 75 # length
function user.s1_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
@@ -146,7 +146,7 @@ end s1_1;
% .explain # table_name
% mal # name
% clob # type
-% 83 # length
+% 84 # length
function user.s2_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
@@ -170,7 +170,7 @@ end s2_1;
% .explain # table_name
% mal # name
% clob # type
-% 82 # length
+% 83 # length
function user.s3_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
@@ -194,7 +194,7 @@ end s3_1;
% .explain # table_name
% mal # name
% clob # type
-% 91 # length
+% 92 # length
function user.s4_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
@@ -218,7 +218,7 @@ end s4_1;
% .explain # table_name
% mal # name
% clob # type
-% 91 # length
+% 92 # length
function user.s5_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
@@ -242,7 +242,7 @@ end s5_1;
% .explain # table_name
% mal # name
% clob # type
-% 85 # length
+% 86 # length
function user.s6_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
@@ -262,7 +262,7 @@ end s6_1;
% .explain # table_name
% mal # name
% clob # type
-% 94 # length
+% 95 # length
function user.s7_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
@@ -288,7 +288,7 @@ end s7_1;
% .explain # table_name
% mal # name
% clob # type
-% 93 # length
+% 94 # length
function user.s8_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
@@ -321,7 +321,7 @@ end s8_1;
% .explain # table_name
% mal # name
% clob # type
-% 102 # length
+% 103 # length
function user.s9_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
@@ -356,7 +356,7 @@ end s9_1;
% .explain # table_name
% mal # name
% clob # type
-% 102 # length
+% 103 # length
function user.s10_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
diff --git
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
---
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
+++
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
@@ -29,7 +29,7 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 122 # length
+% 123 # length
function user.s0_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
@@ -55,7 +55,7 @@ end s0_1;
% .explain # table_name
% mal # name
% clob # type
-% 126 # length
+% 127 # length
function user.s1_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
@@ -81,7 +81,7 @@ end s1_1;
% .explain # table_name
% mal # name
% clob # type
-% 123 # length
+% 124 # length
function user.s2_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
@@ -107,7 +107,7 @@ end s2_1;
% .explain # table_name
% mal # name
% clob # type
-% 127 # length
+% 128 # length
function user.s3_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
@@ -153,7 +153,7 @@ end s3_1;
% .explain # table_name
% mal # name
% clob # type
-% 126 # length
+% 127 # length
function user.s4_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
@@ -181,7 +181,7 @@ end s4_1;
% .explain # table_name
% mal # name
% clob # type
-% 130 # length
+% 131 # length
function user.s5_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
@@ -209,7 +209,7 @@ end s5_1;
% .explain # table_name
% mal # name
% clob # type
-% 127 # length
+% 128 # length
function user.s6_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
@@ -237,7 +237,7 @@ end s6_1;
% .explain # table_name
% mal # name
% clob # type
-% 131 # length
+% 132 # length
function user.s7_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
diff --git a/sql/test/Tests/systemfunctions.stable.out
b/sql/test/Tests/systemfunctions.stable.out
--- a/sql/test/Tests/systemfunctions.stable.out
+++ b/sql/test/Tests/systemfunctions.stable.out
@@ -310,7 +310,8 @@ Ready.
[ "sys", "overlaps", 2, "geometry", "" ]
[ "sys", "password_hash", 0, "clob", "create function
password_hash (username string) \n\treturns string \n\texternal name
sql.password;" ]
[ "sys", "password_hash", 1, "clob", "" ]
-[ "sys", "pause", 0, "bigint", "-- operations to
manipulate the state of havoc queries\ncreate procedure sys.pause(tag
bigint)\nexternal name sql.sysmon_pause;" ]
+[ "sys", "pause", 0, "int", "-- operations to manipulate
the state of havoc queries\ncreate procedure sys.pause(tag int)\nexternal name
sql.sysmon_pause;" ]
+[ "sys", "pause", 0, "bigint", "create procedure
sys.pause(tag bigint)\nexternal name sql.sysmon_pause;" ]
[ "sys", "point", 0, "point", "create function
point(x double,y double) returns point external name geom.point;" ]
[ "sys", "point", 1, "double", "" ]
[ "sys", "point", 2, "double", "" ]
@@ -332,6 +333,7 @@ Ready.
[ "sys", "relate", 1, "geometry", "" ]
[ "sys", "relate", 2, "geometry", "" ]
[ "sys", "relate", 3, "clob", "" ]
+[ "sys", "resume", 0, "int", "create procedure
sys.resume(tag int)\nexternal name sql.sysmon_resume;" ]
[ "sys", "resume", 0, "bigint", "create procedure
sys.resume(tag bigint)\nexternal name sql.sysmon_resume;" ]
[ "sys", "reuse", 0, "clob", "create procedure reuse(sys
string, tab string)\n\texternal name sql.reuse;" ]
[ "sys", "reuse", 1, "clob", "" ]
@@ -380,6 +382,7 @@ Ready.
[ "sys", "stddev_samp", 1, "time", "" ]
[ "sys", "stddev_samp", 0, "double", "create aggregate
stddev_samp(val timestamp) returns double\n\texternal name \"aggr\".\"stdev\";"
]
[ "sys", "stddev_samp", 1, "timestamp", "" ]
+[ "sys", "stop", 0, "int", "create procedure sys.stop(tag
int)\nexternal name sql.sysmon_stop;" ]
[ "sys", "stop", 0, "bigint", "create procedure sys.stop(tag
bigint)\nexternal name sql.sysmon_stop;" ]
[ "sys", "storage", 0, "table", "-- The contents of
this file are subject to the MonetDB Public License\n-- Version 1.1 (the
\"License\"); you may not use this file except in\n-- compliance with the
License. You may obtain a copy of the License at\n--
http://www.monetdb.org/Legal/MonetDBLicense\n--\n-- Software distributed under
the License is distributed on an \"AS IS\"\n-- basis, WITHOUT WARRANTY OF ANY
KIND, either express or implied. See the\n-- License for the specific language
governing rights and limitations\n-- under the License.\n--\n-- The Original
Code is the MonetDB Database System.\n--\n-- The Initial Developer of the
Original Code is CWI.\n-- Copyright August 2008-2013 MonetDB B.V.\n-- All
Rights Reserved.\n\n\n-- Author M.Kersten\n-- This script gives the database
administrator insight in the actual\n-- footprint of the persistent tables and
the maximum playground used\n-- when indices are introduced upon them.\n-- By
chancing the storagemodelinput table direc
tly, the footprint for\n-- yet to be loaded databases can be assessed.\n\n--
The actual storage footprint of an existing database can be\n-- obtained by the
table procuding function storage()\n-- It represents the actual state of
affairs, i.e. storage on disk\n-- of columns and foreign key indices, and
possible temporary hash indices.\n-- For strings we take a sample to determine
their average length.\n\ncreate function sys.storage()\nreturns table
(\"schema\" string, \"table\" string, \"column\" string, \"type\" string,
location string, \"count\" bigint, typewidth int, columnsize bigint, heapsize
bigint, indices bigint, sorted boolean)\nexternal name sql.storage;" ]
[ "sys", "storagemodel", 0, "table", "create function
sys.storagemodel()\nreturns table (\n\t\"schema\" string,\n\t\"table\"
string,\n\t\"column\" string,\n\t\"type\"
string,\n\t\"count\"\tbigint,\n\tcolumnsize bigint,\n\theapsize
bigint,\n\tindices bigint,\n\tsorted boolean)\nbegin\n\treturn select
i.\"schema\", i.\"table\", i.\"column\", i.\"type\",
i.\"count\",\n\tcolumnsize(i.\"type\", i.count,
i.\"distinct\"),\n\theapsize(i.\"type\", i.\"distinct\",
i.\"atomwidth\"),\n\tindexsize(i.\"reference\",
i.\"count\"),\n\ti.sorted\n\tfrom sys.storagemodelinput i;\nend;" ]
diff --git a/sql/test/Tests/trace.stable.out b/sql/test/Tests/trace.stable.out
--- a/sql/test/Tests/trace.stable.out
+++ b/sql/test/Tests/trace.stable.out
@@ -35,7 +35,7 @@ Ready.
% L1 # name
% wrd # type
% 2 # length
-[ 12 ]
+[ 13 ]
# 11:14:41 >
# 11:14:41 > Done.
diff --git a/sql/test/UserDump/Tests/create.stable.out
b/sql/test/UserDump/Tests/create.stable.out
--- a/sql/test/UserDump/Tests/create.stable.out
+++ b/sql/test/UserDump/Tests/create.stable.out
@@ -28,7 +28,6 @@ START TRANSACTION;
CREATE USER "test" WITH ENCRYPTED PASSWORD
'ee26b0dd4af7e749aa1a8ee3c10ae9923f618980772e473f8819a5d4940e0db27ac185f8a0e1d5f84f88bc887fd67b143732c304cc5fa9ad8e6f57f50028a8ff'
NAME 'Test User' SCHEMA "sys";
CREATE USER "voc" WITH ENCRYPTED PASSWORD
'ea45cf4e124b215a28631ec7ff0bf06e82fc26b2be7a066c9594855690fb5d42438be58d6523132384a1738cb4e5139caa1f970ebdfb422d65834d9a4ef61c0e'
NAME 'VOC Explorer' SCHEMA "sys";
CREATE SCHEMA "querylog" AUTHORIZATION "monetdb";
-CREATE SCHEMA "sysmon" AUTHORIZATION "monetdb";
CREATE SCHEMA "test" AUTHORIZATION "test";
CREATE SCHEMA "voc" AUTHORIZATION "voc";
ALTER USER "test" SET SCHEMA "test";
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
