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

Commit021981f

Browse files
committed
Merge branch 'PGPROEE9_6' ofhttps://gitlab.postgrespro.ru/pgpro-dev/postgrespro into PGPROEE9_6
2 parentsd06bc61 +410aa2d commit021981f

File tree

7 files changed

+11
-61
lines changed

7 files changed

+11
-61
lines changed

‎.ci/build_and_test_world

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ stage() {
2424
}
2525

2626
# Dump logs on exit unless interactive
27-
["$1"="-i"-o-z"$DESKTOP_SESSION" ]||trap .ci/collect_logs EXIT
27+
["$1"="-i"-o-n"$DESKTOP_SESSION" ]||trap .ci/collect_logs EXIT
2828
set -e
2929
stage configure
3030
./configure --enable-tap-tests --enable-debug --enable-cassert --enable-nls \

‎.ci/collect_logs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ for f in cores:
2323
gdb=subprocess.Popen(["gdb","src/backend/postgres",f],
2424
stderr=subprocess.PIPE,stdout=subprocess.PIPE,stdin=subprocess.PIPE)
2525
out,err=gdb.communicate("bt\nq\n")
26-
iferr.index("core file may not match specified")>=0:
26+
iferr.find("core file may not match specified")>=0:
2727
m=re.search("Core was generated by `(.*)'",out)
2828
ifm:
2929
gdb=subprocess.Popen(["gdb",m.group(1),f],

‎.ci/make_test_base

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ if os.access(datadir,os.R_OK):
1919
importshutil
2020
shutil.rmtree(datadir)
2121
os.mkdir(datadir)
22+
env=os.environ.copy()
23+
env["LANG"]="C"
2224
withopen("initdb.log","w")asf:
23-
exitcode=subprocess.call(["initdb","-E","UTF8",datadir],stdout=f,stderr=subprocess.STDOUT)
25+
exitcode=subprocess.call(["initdb","-E","UTF8",datadir],env=env,stdout=f,stderr=subprocess.STDOUT)
2426
ifexitcode:
2527
sys.exit(exitcode)
2628
# Collect extra config option
@@ -59,7 +61,7 @@ if addopts:
5961
foropt,valueinaddopts.items():
6062
print>>f,"%s=%s"%(opt,value)
6163
withopen("initdb.log","a")asf:
62-
exitcode=subprocess.call(["pg_ctl","start","-D",datadir,"-l",datadir+"/postmaster.log"],stdout=f,stderr=subprocess.STDOUT)
64+
exitcode=subprocess.call(["pg_ctl","start","-D",datadir,"-l",datadir+"/postmaster.log"],env=env,stdout=f,stderr=subprocess.STDOUT)
6365
ifexitcode:
6466
sys.exit(exitcode)
6567

‎.ci/run_install_check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export PGPORT
1919
./.ci/make_test_base$PGDATA
2020
#run checks
2121
set +e
22-
make installcheck-world prefix=`pwd`/tmp_install
22+
make installcheck-world prefix=`pwd`/tmp_install NO_LOCALE=1
2323
code=$?
2424
pg_ctl stop -D$PGDATA
2525
exit$code

‎doc/src/sgml/pghintplan.sgml

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -189,27 +189,6 @@ postgres=#
189189
</sect2>
190190
<sect2 id="pg-hint-plan-install">
191191
<title>Installation</title>
192-
<para>
193-
This section describes the installation steps.
194-
</para>
195-
<sect3 id="pg-hint-plan-build">
196-
<title>Building binary module</title>
197-
<para>
198-
Simply run <quote>make</quote> in the top of the source tree,
199-
then <quote>make install</quote> as appropriate user. The PATH
200-
environment variable should be set properly for the target
201-
&productname; for this process.
202-
</para>
203-
<programlisting>
204-
$ tar xzvf pg_hint_plan-1.x.x.tar.gz
205-
$ cd pg_hint_plan-1.x.x
206-
$ make
207-
$ su
208-
# make install
209-
</programlisting>
210-
</sect3>
211-
<sect3 id="pg-hint-plan-hint-load">
212-
<title>Loading pg_hint_plan</title>
213192
<para>
214193
Basically pg_hint_plan does not requires CREATE EXTENSION.
215194
Simply loading it by LOAD command will activate it and of
@@ -227,20 +206,6 @@ postgres=#
227206
Do CREATE EXTENSION and SET pg_hint_plan.enable_hint_table TO
228207
<literal>on</literal> if you are planning to use hint table.
229208
</para>
230-
</sect3>
231-
</sect2>
232-
<sect2 id="pg-hint-plan-uninstall">
233-
<title>Uninstallation</title>
234-
<para>
235-
<quote>make uninstall</quote> in the top directory of source tree
236-
will uninstall the installed files if you installed from the
237-
source tree and it is left available.
238-
</para>
239-
<programlisting>
240-
$ cd pg_hint_plan-1.x.x
241-
$ su
242-
# make uninstall
243-
</programlisting>
244209
</sect2>
245210
<sect2 id="pg-hint-plan-examples">
246211
<title>Hint descriptions</title>

‎doc/src/sgml/pgpro-scheduler.sgml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,9 @@
4242
extension and it has no special prerequisites.
4343
</para>
4444

45-
<para>
46-
To build extension from the source, make sure that the environment variable
47-
<envar>PATH</envar> includes path to <application>pg_config</application> utility.
48-
Also make sure that you have developer version of
49-
<productname>&productname;</productname> installed or
50-
<productname>&productname;</productname> was built from source code.
51-
</para>
52-
5345
<para>
5446
Install extension as follows:
5547
<screen>
56-
$ cd pgpro_scheduler
57-
$ make USE_PGXS=1
58-
$ sudo make USE_PGXS=1 install
5948
$ psql <replaceable>dbname</replaceable> -c "CREATE EXTENSION pgpro_scheduler"
6049
</screen>
6150
</para>

‎doc/src/sgml/rum.sgml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,20 +59,14 @@
5959
<title>Installation</title>
6060

6161
<para>
62-
Before you build and install <filename>rum</filename> you should ensure
63-
that you have <productname>&productname;</productname> or
64-
<productname>PostgreSQL</productname> version 9.6 or newer installed.
62+
<filename>rum</filename> is a <productname>&productname;</productname>
63+
extension and it has no special prerequisites.
6564
</para>
6665

6766
<para>
68-
Typical installation procedure may look like this:
67+
Install extension as follows:
6968
<screen>
70-
$ git clone https://github.com/postgrespro/rum
71-
$ cd rum
72-
$ make USE_PGXS=1
73-
$ sudo make USE_PGXS=1 install
74-
$ make USE_PGXS=1 installcheck
75-
$ psql DB -c "CREATE EXTENSION rum;"
69+
$ psql <replaceable>dbname</replaceable> -c "CREATE EXTENSION rum"
7670
</screen>
7771
</para>
7872
</sect2>

0 commit comments

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