Merge branch 'PGPROEE9_6' of https://gitlab.postgrespro.ru/pgpro-dev/postgrespro into PGPROEE9_6

knizhnik · knizhnik · commit 021981f28bea · 2017-01-13T17:15:44.000+03:00
diff --git a/.ci/build_and_test_world b/.ci/build_and_test_world
@@ -24,7 +24,7 @@ stage() {
 }
 
 # Dump logs on exit unless interactive
-[ "$1" = "-i" -o -z "$DESKTOP_SESSION" ]|| trap .ci/collect_logs EXIT
+[ "$1" = "-i" -o -n "$DESKTOP_SESSION" ]|| trap .ci/collect_logs EXIT
 set -e
 stage configure
 ./configure --enable-tap-tests --enable-debug --enable-cassert --enable-nls \
diff --git a/.ci/collect_logs b/.ci/collect_logs
@@ -23,7 +23,7 @@ for f in cores:
     gdb=subprocess.Popen(["gdb","src/backend/postgres",f],
         stderr=subprocess.PIPE,stdout=subprocess.PIPE,stdin=subprocess.PIPE)
     out,err=gdb.communicate("bt\nq\n")
-    if err.index("core file may not match specified")>=0:
+    if err.find("core file may not match specified")>=0:
         m=re.search("Core was generated by `(.*)'",out)
         if m:
             gdb=subprocess.Popen(["gdb",m.group(1),f],
diff --git a/.ci/make_test_base b/.ci/make_test_base
@@ -19,8 +19,10 @@ if os.access(datadir,os.R_OK):
     import shutil
     shutil.rmtree(datadir)
 os.mkdir(datadir)
+env=os.environ.copy()
+env["LANG"]="C"
 with open("initdb.log","w") as f:
-    exitcode=subprocess.call(["initdb","-E","UTF8",datadir],stdout=f,stderr=subprocess.STDOUT)
+    exitcode=subprocess.call(["initdb","-E","UTF8",datadir],env=env,stdout=f,stderr=subprocess.STDOUT)
 if exitcode:
     sys.exit(exitcode)
 # Collect extra config option
@@ -59,7 +61,7 @@ if addopts:
         for opt,value in addopts.items():
             print >> f,"%s=%s"%(opt,value)
 with open("initdb.log","a") as f:
-    exitcode=subprocess.call(["pg_ctl","start","-D",datadir,"-l",datadir+"/postmaster.log"],stdout=f,stderr=subprocess.STDOUT)
+    exitcode=subprocess.call(["pg_ctl","start","-D",datadir,"-l",datadir+"/postmaster.log"],env=env,stdout=f,stderr=subprocess.STDOUT)
 if exitcode:
     sys.exit(exitcode)
 
diff --git a/.ci/run_install_check b/.ci/run_install_check
@@ -19,7 +19,7 @@ export PGPORT
 ./.ci/make_test_base $PGDATA
 #run checks
 set +e
-make installcheck-world  prefix=`pwd`/tmp_install
+make installcheck-world  prefix=`pwd`/tmp_install NO_LOCALE=1
 code=$?
 pg_ctl stop -D $PGDATA
 exit $code
diff --git a/doc/src/sgml/pghintplan.sgml b/doc/src/sgml/pghintplan.sgml
@@ -189,27 +189,6 @@ postgres=#
   </sect2>
   <sect2 id="pg-hint-plan-install">
     <title>Installation</title>
-    <para>
-      This section describes the installation steps.
-    </para>
-    <sect3 id="pg-hint-plan-build">
-      <title>Building binary module</title>
-      <para>
-        Simply run <quote>make</quote> in the top of the source tree,
-        then <quote>make install</quote> as appropriate user. The PATH
-        environment variable should be set properly for the target
-        &productname; for this process.
-      </para>
-      <programlisting>
-$ tar xzvf pg_hint_plan-1.x.x.tar.gz
-$ cd pg_hint_plan-1.x.x
-$ make
-$ su
-# make install
-</programlisting>
-    </sect3>
-    <sect3 id="pg-hint-plan-hint-load">
-      <title>Loading pg_hint_plan</title>
       <para>
         Basically pg_hint_plan does not requires CREATE EXTENSION.
         Simply loading it by LOAD command will activate it and of
@@ -227,20 +206,6 @@ postgres=#
         Do CREATE EXTENSION and SET pg_hint_plan.enable_hint_table TO
         <literal>on</literal> if you are planning to use hint table.
       </para>
-    </sect3>
-  </sect2>
-  <sect2 id="pg-hint-plan-uninstall">
-    <title>Uninstallation</title>
-    <para>
-      <quote>make uninstall</quote> in the top directory of source tree
-      will uninstall the installed files if you installed from the
-      source tree and it is left available.
-    </para>
-    <programlisting>
-$ cd pg_hint_plan-1.x.x
-$ su
-# make uninstall
-</programlisting>
   </sect2>
   <sect2 id="pg-hint-plan-examples">
     <title>Hint descriptions</title>
diff --git a/doc/src/sgml/pgpro-scheduler.sgml b/doc/src/sgml/pgpro-scheduler.sgml
@@ -42,20 +42,9 @@
     extension and it has no special prerequisites.
    </para>
 
-   <para>
-    To build extension from the source, make sure that the environment variable
-    <envar>PATH</envar> includes path to <application>pg_config</application> utility.
-    Also make sure that you have developer version of
-    <productname>&productname;</productname> installed or
-    <productname>&productname;</productname> was built from source code.
-   </para>
-
    <para>
     Install extension as follows:
 <screen>
-$ cd pgpro_scheduler
-$ make USE_PGXS=1
-$ sudo make USE_PGXS=1 install
 $ psql <replaceable>dbname</replaceable> -c "CREATE EXTENSION pgpro_scheduler"
 </screen>
    </para>
diff --git a/doc/src/sgml/rum.sgml b/doc/src/sgml/rum.sgml
@@ -59,20 +59,14 @@
    <title>Installation</title>
 
    <para>
-    Before you build and install <filename>rum</filename> you should ensure
-    that you have <productname>&productname;</productname> or
-    <productname>PostgreSQL</productname> version 9.6 or newer installed.
+    <filename>rum</filename> is a <productname>&productname;</productname>
+    extension and it has no special prerequisites.
    </para>
 
    <para>
-    Typical installation procedure may look like this:
+    Install extension as follows:
 <screen>
-$ git clone https://github.com/postgrespro/rum
-$ cd rum
-$ make USE_PGXS=1
-$ sudo make USE_PGXS=1 install
-$ make USE_PGXS=1 installcheck
-$ psql DB -c "CREATE EXTENSION rum;"
+$ psql <replaceable>dbname</replaceable> -c "CREATE EXTENSION rum"
 </screen>
    </para>
   </sect2>

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ stage() {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`# 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`
`28`	`28`	`set -e`
`29`	`29`	`stage configure`
`30`	`30`	`./configure --enable-tap-tests --enable-debug --enable-cassert --enable-nls \`