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

Commit743226b

Browse files
committed
Merge branch 'PGPRO9_6' into PGPROEE9_6
2 parents83664fc +a035fd5 commit743226b

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

‎contrib/pg_pathman/META.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name":"pg_pathman",
33
"abstract":"Partitioning tool",
44
"description":"The `pg_pathman` module provides optimized partitioning mechanism and functions to manage partitions.",
5-
"version":"1.4.6",
5+
"version":"1.4.7",
66
"maintainer": [
77
"Ildar Musin <i.musin@postgrespro.ru>",
88
"Dmitry Ivanov <d.ivanov@postgrespro.ru>",
@@ -24,7 +24,7 @@
2424
"pg_pathman": {
2525
"file":"pg_pathman--1.4.sql",
2626
"docfile":"README.md",
27-
"version":"1.4.6",
27+
"version":"1.4.7",
2828
"abstract":"Partitioning tool"
2929
}
3030
},

‎contrib/pg_pathman/expected/pathman_bgw.out

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,8 @@ BEGIN
200200

201201
ASSERT rows IS NOT NULL;
202202

203-
IF rows_old = rows THEN
203+
-- rows should increase!
204+
IF rows_old <= rows THEN
204205
i = i + 1;
205206
END IF;
206207
ELSE

‎contrib/pg_pathman/expected/pathman_calamity.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SELECT debug_capture();
1212
SELECT get_pathman_lib_version();
1313
get_pathman_lib_version
1414
-------------------------
15-
10406
15+
10407
1616
(1 row)
1717

1818
set client_min_messages = NOTICE;

‎contrib/pg_pathman/sql/pathman_bgw.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ BEGIN
114114

115115
ASSERT rowsIS NOT NULL;
116116

117-
IF rows_old= rows THEN
117+
-- rows should increase!
118+
IF rows_old<= rows THEN
118119
i= i+1;
119120
END IF;
120121
ELSE

‎contrib/pg_pathman/src/include/init.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ simpify_mcxt_name(MemoryContext mcxt)
157157
#defineLOWEST_COMPATIBLE_FRONT0x010400
158158

159159
/* Current version of native C library (0xAA_BB_CC) */
160-
#defineCURRENT_LIB_VERSION0x010406
160+
#defineCURRENT_LIB_VERSION0x010407
161161

162162

163163
void*pathman_cache_search_relid(HTAB*cache_table,

‎contrib/pg_pathman/src/pathman_workers.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,7 @@ bgw_main_concurrent_part(Datum main_arg)
569569

570570
/* Extract number of processed rows */
571571
rows=DatumGetInt64(SPI_getbinval(tuple,tupdesc,1,&isnull));
572+
Assert(tupdesc->attrs[0]->atttypid==INT8OID);/* check type */
572573
Assert(!isnull);/* ... and ofc it must not be NULL */
573574
}
574575
/* Else raise generic error */

0 commit comments

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