Skip to content

Commit bce2240

Browse files
vbwagnervbwagner
committed
Merge branch 'PGPROEE9_6' into PGPROEE9_6-15-64-xid
2 parents a8c0416 + c43151f commit bce2240

File tree

396 files changed

+17026
-4905
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

396 files changed

+17026
-4905
lines changed

‎contrib/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ SUBDIRS = \
3232
pg_buffercache \
3333
pg_freespacemap \
3434
pg_prewarm \
35+
pg_query_state \
3536
pg_standby \
3637
pg_stat_statements \
3738
pg_trgm \

‎contrib/pg_pathman/.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
.deps
22
isolation_output
3-
results/pg_pathman.out
3+
results/*
44
regression.diffs
55
regression.out
66
*.o
77
*.so
88
*.pyc
9-
pg_pathman--*.sql
9+
*.gcda
10+
*.gcno
11+
pg_pathman--1.1.sql

‎contrib/pg_pathman/Makefile

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,27 @@
11
# contrib/pg_pathman/Makefile
22

33
MODULE_big = pg_pathman
4-
OBJS = src/init.o src/relation_info.o src/utils.o src/partition_filter.o src/runtimeappend.o \
5-
src/runtime_merge_append.o src/pg_pathman.o src/dsm_array.o src/rangeset.o src/pl_funcs.o \
6-
src/pathman_workers.o src/hooks.o src/nodes_common.o src/xact_handling.o src/pg_compat.o \
7-
$(WIN32RES)
4+
OBJS = src/init.o src/relation_info.o src/utils.o src/partition_filter.o \
5+
src/runtimeappend.o src/runtime_merge_append.o src/pg_pathman.o src/rangeset.o \
6+
src/pl_funcs.o src/pl_range_funcs.o src/pl_hash_funcs.o src/pathman_workers.o \
7+
src/hooks.o src/nodes_common.o src/xact_handling.o src/copy_stmt_hooking.o \
8+
src/pg_compat.o $(WIN32RES)
89

910
EXTENSION = pg_pathman
10-
EXTVERSION = 1.0
11-
DATA_built = $(EXTENSION)--$(EXTVERSION).sql
11+
EXTVERSION = 1.1
12+
DATA_built = pg_pathman--$(EXTVERSION).sql
13+
DATA = pg_pathman--1.0.sql pg_pathman--1.0--1.1.sql
1214
PGFILEDESC = "pg_pathman - partitioning tool"
1315

14-
REGRESS = pg_pathman
16+
REGRESS = pathman_basic \
17+
pathman_runtime_nodes \
18+
pathman_callbacks \
19+
pathman_domains \
20+
pathman_foreign_keys \
21+
pathman_permissions \
22+
pathman_rowmarks
1523
EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add
16-
EXTRA_CLEAN = $(EXTENSION)--$(EXTVERSION).sql ./isolation_output
24+
EXTRA_CLEAN = pg_pathman--$(EXTVERSION).sql ./isolation_output
1725

1826
ifdef USE_PGXS
1927
PG_CONFIG = pg_config

‎contrib/pg_pathman/README.md

Lines changed: 188 additions & 64 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)