Skip to content

Commit 3113bc7

Browse files
dmpgprodmpgpro
committed
Merge branch 'PGPRO9_6' into PGPROEE9_6
Conflicts: GNUmakefile.in configure
2 parents b517fab + 59f8d6c commit 3113bc7

File tree

189 files changed

+429478
-875
lines changed

Some content is hidden

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

189 files changed

+429478
-875
lines changed

‎.gitmodules

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[submodule "contrib/pg_variables"]
2+
path = contrib/pg_variables
3+
url = https://github.com/postgrespro/pg_variables
4+
branch = master
5+
[submodule "contrib/jsquery"]
6+
path = contrib/jsquery
7+
url = https://github.com/postgrespro/jsquery
8+
branch = master
9+
[submodule "contrib/sr_plan"]
10+
path = contrib/sr_plan
11+
url = https://github.com/postgrespro/sr_plan
12+
branch = master
13+
[submodule "contrib/pg_pathman"]
14+
path = contrib/pg_pathman
15+
url = https://github.com/postgrespro/pg_pathman
16+
branch = master

‎contrib/Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,14 @@ SUBDIRS = \
4949
tsm_system_time \
5050
tsearch2 \
5151
unaccent \
52-
vacuumlo
52+
vacuumlo \
53+
dump_stat \
54+
hunspell_en_us \
55+
hunspell_fr \
56+
hunspell_nl_nl \
57+
hunspell_ru_ru \
58+
pg_variables \
59+
shared_ispell
5360

5461
ifeq ($(with_openssl),yes)
5562
SUBDIRS += sslinfo

‎contrib/bloom/blinsert.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,7 @@ blbuild(Relation heap, Relation index, IndexInfo *indexInfo)
130130
initBloomState(&buildstate.blstate, index);
131131
buildstate.tmpCtx = AllocSetContextCreate(CurrentMemoryContext,
132132
"Bloom build temporary context",
133-
ALLOCSET_DEFAULT_MINSIZE,
134-
ALLOCSET_DEFAULT_INITSIZE,
135-
ALLOCSET_DEFAULT_MAXSIZE);
133+
ALLOCSET_DEFAULT_SIZES);
136134
initCachedPage(&buildstate);
137135

138136
/* Do the heap scan */
@@ -204,9 +202,7 @@ blinsert(Relation index, Datum *values, bool *isnull,
204202

205203
insertCtx = AllocSetContextCreate(CurrentMemoryContext,
206204
"Bloom insert temporary context",
207-
ALLOCSET_DEFAULT_MINSIZE,
208-
ALLOCSET_DEFAULT_INITSIZE,
209-
ALLOCSET_DEFAULT_MAXSIZE);
205+
ALLOCSET_DEFAULT_SIZES);
210206

211207
oldCtx = MemoryContextSwitchTo(insertCtx);
212208

‎contrib/dblink/dblink.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -980,9 +980,7 @@ materializeQueryResult(FunctionCallInfo fcinfo,
980980
/* Create short-lived memory context for data conversions */
981981
sinfo.tmpcontext = AllocSetContextCreate(CurrentMemoryContext,
982982
"dblink temporary context",
983-
ALLOCSET_DEFAULT_MINSIZE,
984-
ALLOCSET_DEFAULT_INITSIZE,
985-
ALLOCSET_DEFAULT_MAXSIZE);
983+
ALLOCSET_DEFAULT_SIZES);
986984

987985
/* execute query, collecting any tuples into the tuplestore */
988986
res = storeQueryResult(&sinfo, conn, sql);

‎contrib/dump_stat/Makefile

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# contrib/pageinspect/Makefile
2+
3+
MODULE_big = dump_stat
4+
OBJS = anyarray_elemtype.o $(WIN32RES)
5+
6+
EXTENSION = dump_stat
7+
DATA = dump_stat--1.0.sql
8+
PGFILEDESC = "dump_stat - move pg_statistic to new instance of PostgreSQL"
9+
10+
ifdef USE_PGXS
11+
PG_CONFIG = pg_config
12+
PGXS := $(shell $(PG_CONFIG) --pgxs)
13+
include $(PGXS)
14+
else
15+
subdir = contrib/dump_stat
16+
top_builddir = ../..
17+
include $(top_builddir)/src/Makefile.global
18+
include $(top_srcdir)/contrib/contrib-global.mk
19+
endif

‎contrib/dump_stat/anyarray_elemtype.c

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#include "postgres.h"
2+
#include "utils/array.h"
3+
4+
5+
PG_MODULE_MAGIC;
6+
7+
PG_FUNCTION_INFO_V1(anyarray_elemtype);
8+
9+
10+
Datum
11+
anyarray_elemtype(PG_FUNCTION_ARGS)
12+
{
13+
#if (PG_VERSION_NUM >= 90500)
14+
AnyArrayType *v = PG_GETARG_ANY_ARRAY(0);
15+
PG_RETURN_OID(AARR_ELEMTYPE(v));
16+
#else
17+
ArrayType *v = PG_GETARG_ARRAYTYPE_P(0);
18+
PG_RETURN_OID(ARR_ELEMTYPE(v));
19+
#endif
20+
}

0 commit comments

Comments
 (0)