Log Message:
-----------
Database size functions are all in /contrib/dbsize
Modified Files:
--------------
pgadmin-tools/support:
Makefile (r1.1.1.1 -> r1.2)
README.admin (r1.1.1.1 -> r1.2)
admin.sql.in (r1.4 -> r1.5)
Removed Files:
-------------
pgadmin-tools/support:
size.c
--- support/size.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * size.c
- * object size functions
- *
- * Copyright (c) 2004, PostgreSQL Global Development Group
- *
- * Author: Andreas Pflug <[EMAIL PROTECTED]>
- *
- * IDENTIFICATION
- * $PostgreSQL: $
- *
- */
-
-
-#include "postgres.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "access/heapam.h"
-#include "storage/fd.h"
-#include "utils/syscache.h"
-#include "catalog/pg_tablespace.h"
-#include "miscadmin.h"
-
-extern DLLIMPORT char *DataDir;
-
-Datum pg_tablespace_size(PG_FUNCTION_ARGS);
-Datum pg_database_size(PG_FUNCTION_ARGS);
-Datum pg_relation_size(PG_FUNCTION_ARGS);
-Datum pg_size_pretty(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(pg_tablespace_size);
-PG_FUNCTION_INFO_V1(pg_database_size);
-PG_FUNCTION_INFO_V1(pg_relation_size);
-PG_FUNCTION_INFO_V1(pg_size_pretty);
-
-static int64
-db_dir_size(char *path)
-{
- int64 dirsize=0;
- struct dirent *direntry;
- DIR *dirdesc;
- char filename[MAXPGPATH];
-
- dirdesc=AllocateDir(path);
-
- if (!dirdesc)
- return 0;
-
- while ((direntry = readdir(dirdesc)) != 0)
- {
- struct stat fst;
-
- if (!strcmp(direntry->d_name, ".") || !strcmp(direntry->d_name, ".."))
- continue;
-
- snprintf(filename, MAXPGPATH, "%s/%s", path, direntry->d_name);
-
- if (stat(filename, &fst) < 0)
- ereport(ERROR,
- (errcode_for_file_access(),
- errmsg("could not stat \"%s\": %m",
filename)));
- dirsize += fst.st_size;
- }
-
- FreeDir(dirdesc);
- return dirsize;
-}
-
-#include <signal.h>
-
-/*
- * calculate total size of tablespace
- */
-Datum
-pg_tablespace_size(PG_FUNCTION_ARGS)
-{
- Oid tblspcOid = PG_GETARG_OID(0);
-
- char tblspcPath[MAXPGPATH];
- char pathname[MAXPGPATH];
- int64 totalsize=0;
- DIR *dirdesc;
- struct dirent *direntry;
-
- if (tblspcOid == DEFAULTTABLESPACE_OID)
- snprintf(tblspcPath, MAXPGPATH, "%s/base", DataDir);
- else if (tblspcOid == GLOBALTABLESPACE_OID)
- snprintf(tblspcPath, MAXPGPATH, "%s/global", DataDir);
- else
- snprintf(tblspcPath, MAXPGPATH, "%s/pg_tblspc/%u", DataDir,
(unsigned)tblspcOid);
-
- dirdesc = AllocateDir(tblspcPath);
-
- if (!dirdesc)
- ereport(ERROR,
- (errcode_for_file_access(),
- errmsg("No such tablespace OID: %u: %m",
(unsigned)tblspcOid)));
-
- while ((direntry = readdir(dirdesc)) != 0)
- {
- struct stat fst;
-
- if (!strcmp(direntry->d_name, ".") || !strcmp(direntry->d_name, ".."))
- continue;
-
- snprintf(pathname, MAXPGPATH, "%s/%s", tblspcPath, direntry->d_name);
- if (stat(pathname, &fst) < 0)
- ereport(ERROR,
- (errcode_for_file_access(),
- errmsg("could not stat \"%s\": %m",
pathname)));
- totalsize += fst.st_size;
-
- if (fst.st_mode & S_IFDIR)
- totalsize += db_dir_size(pathname);
- }
-
- FreeDir(dirdesc);
-
- PG_RETURN_INT64(totalsize);
-}
-
-
-/*
- * calculate size of databases in all tablespaces
- */
-Datum
-pg_database_size(PG_FUNCTION_ARGS)
-{
- Oid dbOid = PG_GETARG_OID(0);
-
- int64 totalsize=0;
- DIR *dirdesc;
- struct dirent *direntry;
- char pathname[MAXPGPATH];
-
- snprintf(pathname, MAXPGPATH, "%s/global/%u", DataDir, (unsigned)dbOid);
- totalsize += db_dir_size(pathname);
- snprintf(pathname, MAXPGPATH, "%s/base/%u", DataDir, (unsigned)dbOid);
- totalsize += db_dir_size(pathname);
-
- snprintf(pathname, MAXPGPATH, "%s/pg_tblspc", DataDir);
- dirdesc = AllocateDir(pathname);
-
- if (!dirdesc)
- ereport(ERROR,
- (errcode_for_file_access(),
- errmsg("could not open tablespace directory: %m")));
-
- while ((direntry = readdir(dirdesc)) != 0)
- {
- if (!strcmp(direntry->d_name, ".") || !strcmp(direntry->d_name, ".."))
- continue;
-
- snprintf(pathname, MAXPGPATH, "%s/pg_tblspc/%s/%u", DataDir,
direntry->d_name, (unsigned)dbOid);
- totalsize += db_dir_size(pathname);
- }
-
- FreeDir(dirdesc);
-
- if (!totalsize)
- ereport(ERROR,
- (ERRCODE_UNDEFINED_DATABASE,
- errmsg("Database OID %u unknown.", (unsigned)dbOid)));
-
- PG_RETURN_INT64(totalsize);
-}
-
-
-
-/*
- * calculate size of relation
- */
-Datum
-pg_relation_size(PG_FUNCTION_ARGS)
-{
- Oid relOid=PG_GETARG_OID(0);
-
- HeapTuple tuple;
- Form_pg_class pg_class;
- Oid relnodeOid;
- Oid tblspcOid;
- char relkind;
- int64 totalsize=0;
- unsigned int segcount=0;
- char dirpath[MAXPGPATH];
- char pathname[MAXPGPATH];
-
-
- tuple = SearchSysCache(RELOID, ObjectIdGetDatum(relOid), 0, 0, 0);
- if (!HeapTupleIsValid(tuple))
- ereport(ERROR,
- (ERRCODE_UNDEFINED_TABLE,
- errmsg("Relation OID %u does not exist", relOid)));
-
- pg_class = (Form_pg_class) GETSTRUCT(tuple);
- relnodeOid = pg_class->relfilenode;
- tblspcOid = pg_class->reltablespace;
- relkind = pg_class->relkind;
-
- ReleaseSysCache(tuple);
-
- switch(relkind)
- {
- case RELKIND_INDEX:
- case RELKIND_RELATION:
- case RELKIND_TOASTVALUE:
- break;
- default:
- ereport(ERROR,
- (ERRCODE_WRONG_OBJECT_TYPE,
- errmsg("Relation kind %d not supported",
relkind)));
- }
-
- if (tblspcOid == 0 || tblspcOid == DEFAULTTABLESPACE_OID)
- snprintf(dirpath, MAXPGPATH, "%s/base/%u", DataDir,
(unsigned)MyDatabaseId);
- else if (tblspcOid == GLOBALTABLESPACE_OID)
- snprintf(dirpath, MAXPGPATH, "%s/global", DataDir);
- else
- snprintf(dirpath, MAXPGPATH, "%s/pg_tblspc/%u/%u", DataDir,
(unsigned)tblspcOid, (unsigned)MyDatabaseId);
-
- for (segcount = 0 ;; segcount++)
- {
- struct stat fst;
-
- if (segcount == 0)
- snprintf(pathname, MAXPGPATH, "%s/%u", dirpath, (unsigned)
relnodeOid);
- else
- snprintf(pathname, MAXPGPATH, "%s/%u.%u", dirpath, (unsigned)
relnodeOid, segcount);
-
- if (stat(pathname, &fst) < 0)
- {
- if (errno == ENOENT)
- break;
- else
- ereport(ERROR,
- (errcode_for_file_access(),
- errmsg("could not stat \"%s\": %m",
pathname)));
- }
- totalsize += fst.st_size;
- }
-
- PG_RETURN_INT64(totalsize);
-}
-
-
-Datum
-pg_size_pretty(PG_FUNCTION_ARGS)
-{
- int64 size=PG_GETARG_INT64(0);
- char *result=palloc(50+VARHDRSZ);
- int64 limit = 10*1024;
- int64 mult=1;
-
- if (size < limit*mult)
- snprintf(VARDATA(result), 50, INT64_FORMAT" bytes", size);
- else
- {
- mult *= 1024;
- if (size < limit*mult)
- snprintf(VARDATA(result), 50, INT64_FORMAT " kB", (size+mult/2) /
mult);
- else
- {
- mult *= 1024;
- if (size < limit*mult)
- snprintf(VARDATA(result), 50, INT64_FORMAT " MB",
(size+mult/2) / mult);
- else
- {
- mult *= 1024;
- if (size < limit*mult)
- snprintf(VARDATA(result), 50, INT64_FORMAT " GB",
(size+mult/2) / mult);
- else
- {
- mult *= 1024;
- snprintf(VARDATA(result), 50, INT64_FORMAT " TB",
(size+mult/2) / mult);
- }
- }
- }
- }
- VARATT_SIZEP(result) = strlen(VARDATA(result)) + VARHDRSZ;
-
- PG_RETURN_TEXT_P(result);
-}
Index: admin.sql.in
===================================================================
RCS file: /projects/pgadmin-tools/support/admin.sql.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsupport/admin.sql.in -Lsupport/admin.sql.in -u -w -r1.4 -r1.5
--- support/admin.sql.in
+++ support/admin.sql.in
@@ -2,25 +2,6 @@
* Administrative functions
* ********************************* */
-/* database object size functions (admin.c) */
-
-CREATE FUNCTION pg_tablespace_size(oid) RETURNS bigint
- AS 'MODULE_PATHNAME', 'pg_tablespace_size'
- LANGUAGE C STABLE STRICT;
-
-CREATE FUNCTION pg_database_size(oid) RETURNS bigint
- AS 'MODULE_PATHNAME', 'pg_database_size'
- LANGUAGE C STABLE STRICT;
-
-CREATE FUNCTION pg_relation_size(oid) RETURNS bigint
- AS 'MODULE_PATHNAME', 'pg_relation_size'
- LANGUAGE C STABLE STRICT;
-
-CREATE FUNCTION pg_size_pretty(bigint) RETURNS text
- AS 'MODULE_PATHNAME', 'pg_size_pretty'
- LANGUAGE C STABLE STRICT;
-
-
/* generic file access functions (genfile.c) */
CREATE FUNCTION pg_file_stat(text) RETURNS record
Index: Makefile
===================================================================
RCS file: /projects/pgadmin-tools/support/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lsupport/Makefile -Lsupport/Makefile -u -w -r1.1.1.1 -r1.2
--- support/Makefile
+++ support/Makefile
@@ -6,6 +6,6 @@
PG_CPPFLAGS = -I$(libpq_srcdir)
DATA_built = admin.sql
DOCS = README.admin
-OBJS = size.o genfile.o misc.o
+OBJS = genfile.o misc.o
include $(top_srcdir)/contrib/contrib-global.mk
Index: README.admin
===================================================================
RCS file: /projects/pgadmin-tools/support/README.admin,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lsupport/README.admin -Lsupport/README.admin -u -w -r1.1.1.1 -r1.2
--- support/README.admin
+++ support/README.admin
@@ -1,13 +1,5 @@
Misc functions for administrative purposes
-size.c:
------------------------------
-int8 pg_tablespace_size(oid)
-int8 pg_database_size(oid)
-int8 pg_relation_size(oid)
-text pg_size_pretty(int8)
-
-
genfile.c (superuser only):
-----------------------------
record pg_file_stat(fname text)
@@ -26,4 +18,4 @@
bool pg_logfile_rotate()
setof record pg_logdir_ls()
-VIEW pg_logdir_ls(filetime timestamp, pid int4, filename text)
+VIEW pg_logdir_ls(filetime timestamp, filename text)
---------------------------(end of broadcast)---------------------------
TIP 3: if posting/reading through Usenet, please send an appropriate
subscribe-nomail command to [EMAIL PROTECTED] so that your
message can get through to the mailing list cleanly
