Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit32c389d

Browse files
committed
Merge branch 'master' into stable
2 parentsdf7612b +92becb3 commit32c389d

File tree

19 files changed

+172
-9
lines changed

19 files changed

+172
-9
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
/results
55
*pg_wait_sampling--1.1.sql
66
.log
7+
Dockerfile

‎.travis.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,9 @@ env:
2323
-PG_VERSION=10 CHECK_CODE=clang
2424
-PG_VERSION=10 CHECK_CODE=cppcheck
2525
-PG_VERSION=10 CHECK_CODE=false
26+
-PG_VERSION=11 CHECK_CODE=clang
2627
-PG_VERSION=11 CHECK_CODE=false
28+
-PG_VERSION=12 CHECK_CODE=clang
2729
-PG_VERSION=12 CHECK_CODE=false
30+
-PG_VERSION=13 CHECK_CODE=clang
31+
-PG_VERSION=13 CHECK_CODE=false

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build Status](https://travis-ci.org/postgrespro/pg_wait_sampling.svg?branch=master)](https://travis-ci.org/postgrespro/pg_wait_sampling)
1+
[![Build Status](https://travis-ci.com/postgrespro/pg_wait_sampling.svg?branch=master)](https://travis-ci.com/postgrespro/pg_wait_sampling)
22
[![PGXN version](https://badge.fury.io/pg/pg_wait_sampling.svg)](https://badge.fury.io/pg/pg_wait_sampling)
33
[![GitHub license](https://img.shields.io/badge/license-PostgreSQL-blue.svg)](https://raw.githubusercontent.com/postgrespro/pg_wait_sampling/master/LICENSE)
44

‎collector.c‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
#include"postgres.h"
1111

1212
#include"catalog/pg_type.h"
13+
#ifPG_VERSION_NUM >=130000
14+
#include"common/hashfn.h"
15+
#endif
1316
#include"funcapi.h"
1417
#include"miscadmin.h"
1518
#include"postmaster/bgworker.h"
@@ -303,11 +306,11 @@ static int64
303306
millisecs_diff(TimestampTztz1,TimestampTztz2)
304307
{
305308
longsecs;
306-
intmillisecs;
309+
intmicrosecs;
307310

308-
TimestampDifference(tz1,tz2,&secs,&millisecs);
311+
TimestampDifference(tz1,tz2,&secs,&microsecs);
309312

310-
returnsecs*1000+millisecs;
313+
returnsecs*1000+microsecs /1000;
311314

312315
}
313316

‎debian/changelog‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
pg-wait-sampling (1.1.2-1) unstable; urgency=medium
2+
3+
* New upstream version compatible with PG13
4+
5+
-- Adrien Nayrat <adrien.nayrat@anayrat.info> Wed, 28 Oct 2020 09:03:03 +0000
6+
7+
pg-wait-sampling (1.1.1-1) unstable; urgency=medium
8+
9+
* Release 1.1.1
10+
11+
-- Adrien Nayrat <adrien.nayrat@anayrat.info> Wed, 17 Jun 2020 12:26:59 +0000

‎debian/compat‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9

‎debian/control‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
Source: pg-wait-sampling
2+
Section: database
3+
Priority: optional
4+
Maintainer: Adrien Nayrat <adrien.nayrat@anayrat.info>
5+
Standards-Version: 4.5.0
6+
Build-Depends: debhelper (>=9~), postgresql-server-dev-all (>= 141~)
7+
Homepage: https://github.com/postgrespro/pg_wait_sampling
8+
Vcs-Browser: https://github.com/postgrespro/pg_wait_sampling
9+
Vcs-Git: https://github.com/postgrespro/pg_wait_sampling.git
10+
11+
Package: postgresql-9.6-pg-wait-sampling
12+
Architecture: any
13+
Depends: ${misc:Depends}, ${shlibs:Depends}, postgresql-9.6,
14+
Description: pg_wait-sampling provides functions for detailed per backend
15+
and per query statistics about PostgreSQL wait events
16+
17+
Package: postgresql-10-pg-wait-sampling
18+
Architecture: any
19+
Depends: ${misc:Depends}, ${shlibs:Depends}, postgresql-10,
20+
Description: pg_wait-sampling provides functions for detailed per backend
21+
and per query statistics about PostgreSQL wait events
22+
23+
Package: postgresql-11-pg-wait-sampling
24+
Architecture: any
25+
Depends: ${misc:Depends}, ${shlibs:Depends}, postgresql-11,
26+
Description: pg_wait-sampling provides functions for detailed per backend
27+
and per query statistics about PostgreSQL wait events
28+
29+
Package: postgresql-12-pg-wait-sampling
30+
Architecture: any
31+
Depends: ${misc:Depends}, ${shlibs:Depends}, postgresql-12,
32+
Description: pg_wait-sampling provides functions for detailed per backend
33+
and per query statistics about PostgreSQL wait events
34+
35+
Package: postgresql-13-pg-wait-sampling
36+
Architecture: any
37+
Depends: ${misc:Depends}, ${shlibs:Depends}, postgresql-13,
38+
Description: pg_wait-sampling provides functions for detailed per backend
39+
and per query statistics about PostgreSQL wait events

‎debian/control.in‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Source: pg-wait-sampling
2+
Section: database
3+
Priority: optional
4+
Maintainer: Adrien Nayrat <adrien.nayrat@anayrat.info>
5+
Standards-Version: 4.5.0
6+
Build-Depends: debhelper (>=9~), postgresql-server-dev-all (>= 141~)
7+
Homepage: https://github.com/postgrespro/pg_wait_sampling
8+
Vcs-Browser: https://github.com/postgrespro/pg_wait_sampling
9+
Vcs-Git: https://github.com/postgrespro/pg_wait_sampling.git
10+
11+
Package: postgresql-PGVERSION-pg-wait-sampling
12+
Architecture: any
13+
Depends: ${misc:Depends}, ${shlibs:Depends}, postgresql-PGVERSION,
14+
Description: pg_wait-sampling provides functions for detailed per backend
15+
and per query statistics about PostgreSQL wait events

‎debian/copyright‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
pg_wait_sampling is released under the PostgreSQL License, a liberal Open Source license, similar to the BSD or MIT licenses.
2+
3+
Copyright (c) 2015-2017, Postgres Professional
4+
Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
5+
Portions Copyright (c) 1994, The Regents of the University of California
6+
7+
Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies.
8+
9+
IN NO EVENT SHALL POSTGRES PROFESSIONAL BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF POSTGRES PROFESSIONAL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
10+
11+
POSTGRES PROFESSIONAL SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND POSTGRES PROFESSIONAL HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.

‎debian/pgversions‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9.6+

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp