diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/Makefile | 2 | ||||
| -rw-r--r-- | databases/pg_statsinfo/Makefile | 17 | ||||
| -rw-r--r-- | databases/pg_statsinfo/distinfo | 2 | ||||
| -rw-r--r-- | databases/pg_statsinfo/files/patch-archive_pglog.sh | 8 | ||||
| -rw-r--r-- | databases/pg_statsinfo/files/patch-libstatsinfo.c | 319 | ||||
| -rw-r--r-- | databases/pg_statsinfo/files/patch-port.c | 14 | ||||
| -rw-r--r-- | databases/pg_statsinfo/pkg-descr | 7 | ||||
| -rw-r--r-- | databases/pg_statsinfo/pkg-plist | 10 | ||||
| -rw-r--r-- | databases/postgresql-repmgr2/Makefile | 39 | ||||
| -rw-r--r-- | databases/postgresql-repmgr2/distinfo | 3 | ||||
| -rw-r--r-- | databases/postgresql-repmgr2/files/repmgrd.in | 33 | ||||
| -rw-r--r-- | databases/postgresql-repmgr2/pkg-descr | 4 | ||||
| -rw-r--r-- | databases/postgresql-repmgr2/pkg-plist | 8 |
13 files changed, 0 insertions, 466 deletions
diff --git a/databases/Makefile b/databases/Makefile index 21ea29ceb8f2..cd790b87c6bb 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -579,7 +579,6 @@ SUBDIR += pg_repack SUBDIR += pg_rman SUBDIR += pg_stat_kcache - SUBDIR += pg_statsinfo SUBDIR += pgaccess SUBDIR += pgadmin3 SUBDIR += pgagent @@ -697,7 +696,6 @@ SUBDIR += postgresql-plv8js SUBDIR += postgresql-relay SUBDIR += postgresql-repmgr - SUBDIR += postgresql-repmgr2 SUBDIR += postgresql-tds_fdw SUBDIR += postgresql-zhparser SUBDIR += postgresql10-client diff --git a/databases/pg_statsinfo/Makefile b/databases/pg_statsinfo/Makefile deleted file mode 100644 index fcd2c5795881..000000000000 --- a/databases/pg_statsinfo/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# $FreeBSD$ - -PORTNAME= pg_statsinfo -PORTVERSION= 2.4.1 -PORTREVISION= 2 -CATEGORIES= databases -MASTER_SITES= http://pgfoundry.org/frs/download.php/3429/ - -MAINTAINER= kuriyama@FreeBSD.org -COMMENT= Monitor statistics and activity of PostgreSQL - -USES= gmake pgsql:9.3+ -WANT_PGSQL= server - -MAKE_ARGS= USE_PGXS=1 LDFLAGS=-lkvm - -.include <bsd.port.mk> diff --git a/databases/pg_statsinfo/distinfo b/databases/pg_statsinfo/distinfo deleted file mode 100644 index 36099e096263..000000000000 --- a/databases/pg_statsinfo/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (pg_statsinfo-2.4.1.tar.gz) = 3d56ca8bb2afdb2d959865b5ec249e254448f049f759f2bcd1d819b960f281bd -SIZE (pg_statsinfo-2.4.1.tar.gz) = 408287 diff --git a/databases/pg_statsinfo/files/patch-archive_pglog.sh b/databases/pg_statsinfo/files/patch-archive_pglog.sh deleted file mode 100644 index 4c543f010539..000000000000 --- a/databases/pg_statsinfo/files/patch-archive_pglog.sh +++ /dev/null @@ -1,8 +0,0 @@ ---- agent/bin/archive_pglog.sh.orig 2013-03-11 00:12:28.148440022 +0900 -+++ agent/bin/archive_pglog.sh 2013-03-11 00:12:35.089438682 +0900 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - ############################################################################# - # Copyright (c) 2012, NIPPON TELEGRAPH AND TELEPHONE CORPORATION - ############################################################################# diff --git a/databases/pg_statsinfo/files/patch-libstatsinfo.c b/databases/pg_statsinfo/files/patch-libstatsinfo.c deleted file mode 100644 index 45c056791992..000000000000 --- a/databases/pg_statsinfo/files/patch-libstatsinfo.c +++ /dev/null @@ -1,319 +0,0 @@ ---- agent/lib/libstatsinfo.c.orig 2012-11-26 11:21:03.000000000 +0900 -+++ agent/lib/libstatsinfo.c 2013-03-10 23:32:13.408438036 +0900 -@@ -50,9 +50,16 @@ - #include "pgut/pgut-spi.h" - #include "../common.h" - --#ifndef WIN32 -+#if !defined(WIN32) -+#if defined(__FreeBSD__) -+#include <sys/resource.h> -+#include <sys/sysctl.h> -+#include <paths.h> -+#include <kvm.h> -+#else - #include "linux/version.h" - #endif -+#endif - - /* also adjust non-critial setting parameters? */ - /* #define ADJUST_NON_CRITICAL_SETTINGS */ -@@ -1114,9 +1121,11 @@ - #define NUM_STAT_FIELDS_MIN 6 - - /* not support a kernel that does not have the required fields at "/proc/stat" */ -+#if !defined(__FreeBSD__) - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,41) - #error kernel version 2.5.41 or later is required - #endif -+#endif - - /* - * statsinfo_cpustats - get cpu information -@@ -1155,6 +1164,64 @@ - PG_RETURN_DATUM(get_cpustats(fcinfo, 0, 0, 0, 0)); - } - -+#ifdef __FreeBSD__ -+static Datum -+get_cpustats(FunctionCallInfo fcinfo, -+ int64 prev_cpu_user, -+ int64 prev_cpu_system, -+ int64 prev_cpu_idle, -+ int64 prev_cpu_iowait) -+{ -+ TupleDesc tupdesc; -+ int64 cpu_user; -+ int64 cpu_system; -+ int64 cpu_idle; -+ int64 cpu_iowait; -+ HeapTuple tuple; -+ Datum values[NUM_CPUSTATS_COLS]; -+ bool nulls[NUM_CPUSTATS_COLS]; -+ long cp_time[CPUSTATES]; -+ kvm_t *kd; -+ char errbuf[_POSIX2_LINE_MAX]; -+ -+ must_be_superuser(); -+ -+ /* Build a tuple descriptor for our result type */ -+ if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE) -+ elog(ERROR, "return type must be a row type"); -+ -+ Assert(tupdesc->natts == lengthof(values)); -+ -+ kd = kvm_openfiles(NULL, _PATH_DEVNULL, NULL, O_RDONLY, errbuf); -+ if (kd == NULL) { -+ elog(ERROR, "kvm_openfiles failed: %s", errbuf); -+ } -+ if (kvm_getcptime(kd, cp_time) == -1) { -+ elog(ERROR, "kvm_getcptime failed"); -+ } -+ -+ memset(nulls, 0, sizeof(nulls)); -+ memset(values, 0, sizeof(values)); -+ -+ cpu_user = cp_time[CP_USER] + cp_time[CP_IDLE]; -+ cpu_system = cp_time[CP_SYS]; -+ cpu_idle = cp_time[CP_IDLE]; -+ cpu_iowait = cp_time[CP_INTR]; -+ -+ values[0] = CStringGetTextDatum((char *)"cpu"); -+ values[1] = Int64GetDatum(cpu_user); -+ values[2] = Int64GetDatum(cpu_system); -+ values[3] = Int64GetDatum(cpu_idle); -+ values[4] = Int64GetDatum(cpu_iowait); -+ values[5] = Int16GetDatum(cpu_user < prev_cpu_user ? 1 : 0); -+ values[6] = Int16GetDatum(cpu_system < prev_cpu_system ? 1 : 0); -+ values[7] = Int16GetDatum(cpu_idle < prev_cpu_idle ? 1 : 0); -+ values[8] = Int16GetDatum(cpu_iowait < prev_cpu_iowait ? 1 : 0); -+ -+ tuple = heap_form_tuple(tupdesc, values, nulls); -+ return HeapTupleGetDatum(tuple); -+} -+#else - static Datum - get_cpustats(FunctionCallInfo fcinfo, - int64 prev_cpu_user, -@@ -1239,6 +1306,7 @@ - - return HeapTupleGetDatum(tuple); - } -+#endif - - /* - * statsinfo_devicestats - get device information -@@ -1333,11 +1401,14 @@ - - for (row = 0; row < SPI_processed; row++) - { -+#if !defined(__FreeBSD__) - HeapTupleHeader prev_devicestats; -+#endif - char *device; - char *spcname; - char *dev_major; - char *dev_minor; -+#if !defined(__FreeBSD__) - char *dev_name = NULL; - int64 readsector; - int64 readtime; -@@ -1346,14 +1417,18 @@ - int64 ioqueue; - int64 iototaltime; - char *record; -+#endif - char regex[64]; - List *devicenum = NIL; -+#if !defined(__FreeBSD__) - List *records = NIL; - List *fields = NIL; - int nfield; -+#endif - - device = SPI_getvalue(tuptable->vals[row], tuptable->tupdesc, 1); - spcname = SPI_getvalue(tuptable->vals[row], tuptable->tupdesc, 2); -+ elog(LOG, "device:%s, spc:%s\n", device, spcname); - - if (prev_device) - { -@@ -1375,6 +1450,7 @@ - - snprintf(regex, lengthof(regex), "^\\s*%s\\s+%s\\s+", dev_major, dev_minor); - -+#if !defined(__FreeBSD__) - /* extract device information */ - if (exec_grep(FILE_DISKSTATS, regex, &records) <= 0) - { -@@ -1389,11 +1465,24 @@ - record = b_trim((char *) list_nth(records, 0)); - - nfield = exec_split(record, "\\s+", &fields); -+#endif - - memset(nulls, 0, sizeof(nulls)); - memset(values, 0, sizeof(values)); - spclist = list_truncate(spclist, 0); - -+#if defined(__FreeBSD__) -+ values[0] = CStringGetTextDatum(""); -+ values[1] = CStringGetTextDatum(""); -+ values[2] = CStringGetTextDatum(""); -+ values[2] = Int64GetDatum(0); -+ values[3] = Int64GetDatum(0); -+ values[4] = Int64GetDatum(0); -+ values[5] = Int64GetDatum(0); -+ values[6] = Int64GetDatum(0); -+ values[7] = Int64GetDatum(0); -+ values[8] = Int64GetDatum(0); -+#else - if (nfield == NUM_DISKSTATS_FIELDS) - { - /* device_major */ -@@ -1467,7 +1556,15 @@ - (errcode(ERRCODE_DATA_EXCEPTION), - errmsg("unexpected file format: \"%s\"", FILE_DISKSTATS), - errdetail("number of fields is not corresponding"))); -+#endif - -+#if defined(__FreeBSD__) -+ values[9] = Int16GetDatum(0); -+ values[10] = Int16GetDatum(0); -+ values[11] = Int16GetDatum(0); -+ values[12] = Int16GetDatum(0); -+ values[13] = Int16GetDatum(0); -+#else - /* set the overflow flag if value is smaller than previous value */ - prev_devicestats = search_devicestats(devicestats, dev_name); - -@@ -1536,6 +1633,7 @@ - - spclist = lappend(spclist, spcname); - prev_device = device; -+#endif - } - - /* store the last tuple */ -@@ -1560,6 +1658,46 @@ - /* - * statsinfo_loadavg - get loadavg information - */ -+#if defined(__FreeBSD__) -+Datum -+statsinfo_loadavg(PG_FUNCTION_ARGS) -+{ -+ TupleDesc tupdesc; -+ HeapTuple tuple; -+ Datum values[NUM_LOADAVG_COLS]; -+ bool nulls[NUM_LOADAVG_COLS]; -+ kvm_t *kd; -+ char errbuf[_POSIX2_LINE_MAX]; -+ double loadavg[3]; -+ -+ must_be_superuser(); -+ -+ /* Build a tuple descriptor for our result type */ -+ if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE) -+ elog(ERROR, "return type must be a row type"); -+ -+ Assert(tupdesc->natts == lengthof(values)); -+ -+ kd = kvm_openfiles(NULL, _PATH_DEVNULL, NULL, O_RDONLY, errbuf); -+ if (kd == NULL) { -+ elog(ERROR, "kvm_openfiles failed: %s", errbuf); -+ } -+ if (kvm_getloadavg(kd, loadavg, 3) == -1) { -+ elog(ERROR, "kvm_getloadavg failed"); -+ } -+ -+ memset(nulls, 0, sizeof(nulls)); -+ memset(values, 0, sizeof(values)); -+ -+ values[0] = Float4GetDatum(loadavg[0]); -+ values[1] = Float4GetDatum(loadavg[1]); -+ values[2] = Float4GetDatum(loadavg[2]); -+ -+ tuple = heap_form_tuple(tupdesc, values, nulls); -+ -+ return HeapTupleGetDatum(tuple); -+} -+#else - Datum - statsinfo_loadavg(PG_FUNCTION_ARGS) - { -@@ -1622,6 +1760,7 @@ - - return HeapTupleGetDatum(tuple); - } -+#endif - - #define FILE_MEMINFO "/proc/meminfo" - #define NUM_MEMORY_COLS 5 -@@ -1641,6 +1780,37 @@ - /* - * statsinfo_memory - get memory information - */ -+#if defined(__FreeBSD__) -+Datum -+statsinfo_memory(PG_FUNCTION_ARGS) -+{ -+ TupleDesc tupdesc; -+ HeapTuple tuple; -+ Datum values[NUM_MEMORY_COLS]; -+ bool nulls[NUM_MEMORY_COLS]; -+ -+ must_be_superuser(); -+ -+ /* Build a tuple descriptor for our result type */ -+ if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE) -+ elog(ERROR, "return type must be a row type"); -+ -+ Assert(tupdesc->natts == lengthof(values)); -+ -+ memset(nulls, 0, sizeof(nulls)); -+ memset(values, 0, sizeof(values)); -+ -+ values[0] = Int64GetDatum(0); -+ values[1] = Int64GetDatum(0); -+ values[2] = Int64GetDatum(0); -+ values[3] = Int64GetDatum(0); -+ values[4] = Int64GetDatum(0); -+ -+ tuple = heap_form_tuple(tupdesc, values, nulls); -+ -+ return HeapTupleGetDatum(tuple); -+} -+#else - Datum - statsinfo_memory(PG_FUNCTION_ARGS) - { -@@ -1746,6 +1916,7 @@ - - return HeapTupleGetDatum(tuple); - } -+#endif - - #define FILE_PROFILE "/proc/systemtap/statsinfo_prof/profile" - #define NUM_PROFILE_COLS 3 -@@ -1754,6 +1925,13 @@ - /* - * statsinfo_profile - get profile information - */ -+#if defined(x__FreeBSD__) -+Datum -+statsinfo_profile(PG_FUNCTION_ARGS) -+{ -+ PG_RETURN_VOID(); -+} -+#else - Datum - statsinfo_profile(PG_FUNCTION_ARGS) - { -@@ -1863,6 +2041,7 @@ - - PG_RETURN_VOID(); - } -+#endif - - static void - checked_write(int fd, const void *buf, int size) diff --git a/databases/pg_statsinfo/files/patch-port.c b/databases/pg_statsinfo/files/patch-port.c deleted file mode 100644 index 32f02007b04a..000000000000 --- a/databases/pg_statsinfo/files/patch-port.c +++ /dev/null @@ -1,14 +0,0 @@ ---- agent/lib/port.c.orig 2013-03-09 18:29:25.828440497 +0900 -+++ agent/lib/port.c 2013-03-09 18:30:03.711650531 +0900 -@@ -8,7 +8,11 @@ - - #ifndef WIN32 - -+#if defined(__FreeBSD__) -+#include <sys/mount.h> -+#else - #include <sys/statfs.h> -+#endif - #include <unistd.h> - - bool diff --git a/databases/pg_statsinfo/pkg-descr b/databases/pg_statsinfo/pkg-descr deleted file mode 100644 index 8cf2f7ea251a..000000000000 --- a/databases/pg_statsinfo/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -pg_statsinfo is a utility that monitor statistics and the activity of -PostgreSQL(and OS). pg_statsinfo gets some statistics information as -snapshot. We can check the DB activity and bottleneck analysis by -using these snapshot information. This utility provides some function -to get the information acquisition easily. - -WWW: http://pgstatsinfo.projects.pgfoundry.org/ diff --git a/databases/pg_statsinfo/pkg-plist b/databases/pg_statsinfo/pkg-plist deleted file mode 100644 index d79e4bc51934..000000000000 --- a/databases/pg_statsinfo/pkg-plist +++ /dev/null @@ -1,10 +0,0 @@ -bin/archive_pglog.sh -bin/pg_statsinfo -bin/pg_statsinfod -lib/postgresql/pg_statsinfo.so -share/postgresql/contrib/pg_statsrepo83.sql -share/postgresql/contrib/pg_statsrepo_partition.sql -share/postgresql/contrib/pg_statsrepo_alert.sql -share/postgresql/contrib/uninstall_pg_statsrepo.sql -share/postgresql/contrib/uninstall_pg_statsinfo.sql -share/postgresql/contrib/pg_statsinfo.sql diff --git a/databases/postgresql-repmgr2/Makefile b/databases/postgresql-repmgr2/Makefile deleted file mode 100644 index d1e4a40a4989..000000000000 --- a/databases/postgresql-repmgr2/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# Created by: alp@sfedu.ru -# $FreeBSD$ - -PORTNAME= postgresql-repmgr -PORTVERSION= 2.0.3 -PORTREVISION= 2 -CATEGORIES= databases -MASTER_SITES= http://www.repmgr.org/download/ -DISTNAME= repmgr-${PORTVERSION} -PKGNAMESUFFIX= 2 - -MAINTAINER= bofh@FreeBSD.org -COMMENT= PostgreSQL replication manager - -LICENSE= GPLv3 - -RUN_DEPENDS= rsync:net/rsync - -USES+= gettext gmake pgsql:9.3+ -USE_RC_SUBR= repmgrd -WANT_PGSQL= server -MAKE_ENV= USE_PGXS=1 - -OPTIONS_DEFINE= DOCS - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/repmgr ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/repmgrd ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/repmgr.conf.sample ${STAGEDIR}${PREFIX}/etc - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.rst ${STAGEDIR}${DOCSDIR} - @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/repmgr.sql ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/sql/repmgr_funcs.sql ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/sql/uninstall_repmgr_funcs.sql ${STAGEDIR}${DATADIR} - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/postgresql - ${INSTALL_LIB} ${WRKSRC}/sql/repmgr_funcs.so ${STAGEDIR}${PREFIX}/lib/postgresql - -.include <bsd.port.mk> diff --git a/databases/postgresql-repmgr2/distinfo b/databases/postgresql-repmgr2/distinfo deleted file mode 100644 index 29d26da2538a..000000000000 --- a/databases/postgresql-repmgr2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1465474704 -SHA256 (repmgr-2.0.3.tar.gz) = b257921c74602c733f0ab39012160cbd36c1713f86b8d9ee957042d7ce006f19 -SIZE (repmgr-2.0.3.tar.gz) = 77172 diff --git a/databases/postgresql-repmgr2/files/repmgrd.in b/databases/postgresql-repmgr2/files/repmgrd.in deleted file mode 100644 index 33f7b336890c..000000000000 --- a/databases/postgresql-repmgr2/files/repmgrd.in +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ -# -# PROVIDE: repmgrd -# REQUIRE: postgresql -# KEYWORD: shutdown -# -# Add these lines to /etc/rc.conf.local or /etc/rc.conf to enable this -# service: -# -# repmgrd_enable (bool): Set to YES to enable repmgrd. Default: NO -# -# repmgrd_config (path): Default: %%PREFIX%%/etc/repmgr.conf -# - -. /etc/rc.subr - -name=repmgrd -rcvar=repmgrd_enable - -load_rc_config $name - -: ${repmgrd_enable:="NO"} -: ${repmgrd_config="%%PREFIX%%/etc/repmgr.conf"} - -command=%%PREFIX%%/sbin/${name} -pidfile=/var/run/${name}.pid - -command_args="-p $pidfile -f $repmgrd_config" - -run_rc_command "$1" - diff --git a/databases/postgresql-repmgr2/pkg-descr b/databases/postgresql-repmgr2/pkg-descr deleted file mode 100644 index a45d06d0f05f..000000000000 --- a/databases/postgresql-repmgr2/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -repmgr allows you to monitor and manage your replicated PostgreSQL -databases as a single cluster. - -WWW: http://projects.2ndquadrant.com/repmgr diff --git a/databases/postgresql-repmgr2/pkg-plist b/databases/postgresql-repmgr2/pkg-plist deleted file mode 100644 index b3383bae623e..000000000000 --- a/databases/postgresql-repmgr2/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -bin/repmgr -@sample etc/repmgr.conf.sample -sbin/repmgrd -lib/postgresql/repmgr_funcs.so -%%PORTDOCS%%%%DOCSDIR%%/README.rst -%%DATADIR%%/repmgr.sql -%%DATADIR%%/repmgr_funcs.sql -%%DATADIR%%/uninstall_repmgr_funcs.sql |
