Skip to content

Commit 45933cb

Browse files
mrdrivingduckmrdrivingduck
authored
Merge pull request #441 from ApsaraDB/POLARDB_11_DEV
merge: 20231022
2 parents ec10e26 + eda86b4 commit 45933cb

Some content is hidden

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

50 files changed

+2031
-647
lines changed

‎configure

Lines changed: 300 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7015,6 +7015,306 @@ if test x"$pgac_cv_prog_CLANGXX_cxxflags__fexcess_precision_standard" = x"yes";
70157015
BITCODE_CXXFLAGS="${BITCODE_CXXFLAGS} -fexcess-precision=standard"
70167016
fi
70177017

7018+
7019+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -Xclang -no-opaque-pointers, for BITCODE_CFLAGS" >&5
7020+
$as_echo_n "checking whether ${CLANG} supports -Xclang -no-opaque-pointers, for BITCODE_CFLAGS... " >&6; }
7021+
if ${pgac_cv_prog_CLANG_cflags__Xclang__no_opaque_pointers+:} false; then :
7022+
$as_echo_n "(cached) " >&6
7023+
else
7024+
pgac_save_CFLAGS=$CFLAGS
7025+
pgac_save_CC=$CC
7026+
CC=${CLANG}
7027+
CFLAGS="${BITCODE_CFLAGS} -Xclang -no-opaque-pointers"
7028+
ac_save_c_werror_flag=$ac_c_werror_flag
7029+
ac_c_werror_flag=yes
7030+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7031+
/* end confdefs.h. */
7032+
7033+
int
7034+
main ()
7035+
{
7036+
7037+
;
7038+
return 0;
7039+
}
7040+
_ACEOF
7041+
if ac_fn_c_try_compile "$LINENO"; then :
7042+
pgac_cv_prog_CLANG_cflags__Xclang__no_opaque_pointers=yes
7043+
else
7044+
pgac_cv_prog_CLANG_cflags__Xclang__no_opaque_pointers=no
7045+
fi
7046+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7047+
ac_c_werror_flag=$ac_save_c_werror_flag
7048+
CFLAGS="$pgac_save_CFLAGS"
7049+
CC="$pgac_save_CC"
7050+
fi
7051+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANG_cflags__Xclang__no_opaque_pointers" >&5
7052+
$as_echo "$pgac_cv_prog_CLANG_cflags__Xclang__no_opaque_pointers" >&6; }
7053+
if test x"$pgac_cv_prog_CLANG_cflags__Xclang__no_opaque_pointers" = x"yes"; then
7054+
BITCODE_CFLAGS="${BITCODE_CFLAGS} -Xclang -no-opaque-pointers"
7055+
fi
7056+
7057+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANGXX} supports -Xclang -no-opaque-pointers, for BITCODE_CXXFLAGS" >&5
7058+
$as_echo_n "checking whether ${CLANGXX} supports -Xclang -no-opaque-pointers, for BITCODE_CXXFLAGS... " >&6; }
7059+
if ${pgac_cv_prog_CLANGXX_cxxflags__Xclang__no_opaque_pointers+:} false; then :
7060+
$as_echo_n "(cached) " >&6
7061+
else
7062+
pgac_save_CXXFLAGS=$CXXFLAGS
7063+
pgac_save_CXX=$CXX
7064+
CXX=${CLANGXX}
7065+
CXXFLAGS="${BITCODE_CXXFLAGS} -Xclang -no-opaque-pointers"
7066+
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
7067+
ac_cxx_werror_flag=yes
7068+
ac_ext=cpp
7069+
ac_cpp='$CXXCPP $CPPFLAGS'
7070+
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7071+
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7072+
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
7073+
7074+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7075+
/* end confdefs.h. */
7076+
7077+
int
7078+
main ()
7079+
{
7080+
7081+
;
7082+
return 0;
7083+
}
7084+
_ACEOF
7085+
if ac_fn_cxx_try_compile "$LINENO"; then :
7086+
pgac_cv_prog_CLANGXX_cxxflags__Xclang__no_opaque_pointers=yes
7087+
else
7088+
pgac_cv_prog_CLANGXX_cxxflags__Xclang__no_opaque_pointers=no
7089+
fi
7090+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7091+
ac_ext=c
7092+
ac_cpp='$CPP $CPPFLAGS'
7093+
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7094+
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7095+
ac_compiler_gnu=$ac_cv_c_compiler_gnu
7096+
7097+
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
7098+
CXXFLAGS="$pgac_save_CXXFLAGS"
7099+
CXX="$pgac_save_CXX"
7100+
fi
7101+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANGXX_cxxflags__Xclang__no_opaque_pointers" >&5
7102+
$as_echo "$pgac_cv_prog_CLANGXX_cxxflags__Xclang__no_opaque_pointers" >&6; }
7103+
if test x"$pgac_cv_prog_CLANGXX_cxxflags__Xclang__no_opaque_pointers" = x"yes"; then
7104+
BITCODE_CXXFLAGS="${BITCODE_CXXFLAGS} -Xclang -no-opaque-pointers"
7105+
fi
7106+
7107+
7108+
NOT_THE_CFLAGS=""
7109+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -Wunused-command-line-argument, for NOT_THE_CFLAGS" >&5
7110+
$as_echo_n "checking whether ${CLANG} supports -Wunused-command-line-argument, for NOT_THE_CFLAGS... " >&6; }
7111+
if ${pgac_cv_prog_CLANG_cflags__Wunused_command_line_argument+:} false; then :
7112+
$as_echo_n "(cached) " >&6
7113+
else
7114+
pgac_save_CFLAGS=$CFLAGS
7115+
pgac_save_CC=$CC
7116+
CC=${CLANG}
7117+
CFLAGS="${NOT_THE_CFLAGS} -Wunused-command-line-argument"
7118+
ac_save_c_werror_flag=$ac_c_werror_flag
7119+
ac_c_werror_flag=yes
7120+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7121+
/* end confdefs.h. */
7122+
7123+
int
7124+
main ()
7125+
{
7126+
7127+
;
7128+
return 0;
7129+
}
7130+
_ACEOF
7131+
if ac_fn_c_try_compile "$LINENO"; then :
7132+
pgac_cv_prog_CLANG_cflags__Wunused_command_line_argument=yes
7133+
else
7134+
pgac_cv_prog_CLANG_cflags__Wunused_command_line_argument=no
7135+
fi
7136+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7137+
ac_c_werror_flag=$ac_save_c_werror_flag
7138+
CFLAGS="$pgac_save_CFLAGS"
7139+
CC="$pgac_save_CC"
7140+
fi
7141+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANG_cflags__Wunused_command_line_argument" >&5
7142+
$as_echo "$pgac_cv_prog_CLANG_cflags__Wunused_command_line_argument" >&6; }
7143+
if test x"$pgac_cv_prog_CLANG_cflags__Wunused_command_line_argument" = x"yes"; then
7144+
NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wunused-command-line-argument"
7145+
fi
7146+
7147+
if test -n "$NOT_THE_CFLAGS"; then
7148+
BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-unused-command-line-argument"
7149+
fi
7150+
NOT_THE_CFLAGS=""
7151+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -Wcompound-token-split-by-macro, for NOT_THE_CFLAGS" >&5
7152+
$as_echo_n "checking whether ${CLANG} supports -Wcompound-token-split-by-macro, for NOT_THE_CFLAGS... " >&6; }
7153+
if ${pgac_cv_prog_CLANG_cflags__Wcompound_token_split_by_macro+:} false; then :
7154+
$as_echo_n "(cached) " >&6
7155+
else
7156+
pgac_save_CFLAGS=$CFLAGS
7157+
pgac_save_CC=$CC
7158+
CC=${CLANG}
7159+
CFLAGS="${NOT_THE_CFLAGS} -Wcompound-token-split-by-macro"
7160+
ac_save_c_werror_flag=$ac_c_werror_flag
7161+
ac_c_werror_flag=yes
7162+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7163+
/* end confdefs.h. */
7164+
7165+
int
7166+
main ()
7167+
{
7168+
7169+
;
7170+
return 0;
7171+
}
7172+
_ACEOF
7173+
if ac_fn_c_try_compile "$LINENO"; then :
7174+
pgac_cv_prog_CLANG_cflags__Wcompound_token_split_by_macro=yes
7175+
else
7176+
pgac_cv_prog_CLANG_cflags__Wcompound_token_split_by_macro=no
7177+
fi
7178+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7179+
ac_c_werror_flag=$ac_save_c_werror_flag
7180+
CFLAGS="$pgac_save_CFLAGS"
7181+
CC="$pgac_save_CC"
7182+
fi
7183+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANG_cflags__Wcompound_token_split_by_macro" >&5
7184+
$as_echo "$pgac_cv_prog_CLANG_cflags__Wcompound_token_split_by_macro" >&6; }
7185+
if test x"$pgac_cv_prog_CLANG_cflags__Wcompound_token_split_by_macro" = x"yes"; then
7186+
NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wcompound-token-split-by-macro"
7187+
fi
7188+
7189+
if test -n "$NOT_THE_CFLAGS"; then
7190+
BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-compound-token-split-by-macro"
7191+
fi
7192+
NOT_THE_CFLAGS=""
7193+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -Wdeprecated-non-prototype, for NOT_THE_CFLAGS" >&5
7194+
$as_echo_n "checking whether ${CLANG} supports -Wdeprecated-non-prototype, for NOT_THE_CFLAGS... " >&6; }
7195+
if ${pgac_cv_prog_CLANG_cflags__Wdeprecated_non_prototype+:} false; then :
7196+
$as_echo_n "(cached) " >&6
7197+
else
7198+
pgac_save_CFLAGS=$CFLAGS
7199+
pgac_save_CC=$CC
7200+
CC=${CLANG}
7201+
CFLAGS="${NOT_THE_CFLAGS} -Wdeprecated-non-prototype"
7202+
ac_save_c_werror_flag=$ac_c_werror_flag
7203+
ac_c_werror_flag=yes
7204+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7205+
/* end confdefs.h. */
7206+
7207+
int
7208+
main ()
7209+
{
7210+
7211+
;
7212+
return 0;
7213+
}
7214+
_ACEOF
7215+
if ac_fn_c_try_compile "$LINENO"; then :
7216+
pgac_cv_prog_CLANG_cflags__Wdeprecated_non_prototype=yes
7217+
else
7218+
pgac_cv_prog_CLANG_cflags__Wdeprecated_non_prototype=no
7219+
fi
7220+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7221+
ac_c_werror_flag=$ac_save_c_werror_flag
7222+
CFLAGS="$pgac_save_CFLAGS"
7223+
CC="$pgac_save_CC"
7224+
fi
7225+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANG_cflags__Wdeprecated_non_prototype" >&5
7226+
$as_echo "$pgac_cv_prog_CLANG_cflags__Wdeprecated_non_prototype" >&6; }
7227+
if test x"$pgac_cv_prog_CLANG_cflags__Wdeprecated_non_prototype" = x"yes"; then
7228+
NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wdeprecated-non-prototype"
7229+
fi
7230+
7231+
if test -n "$NOT_THE_CFLAGS"; then
7232+
BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-deprecated-non-prototype"
7233+
fi
7234+
NOT_THE_CFLAGS=""
7235+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -Wformat-truncation, for NOT_THE_CFLAGS" >&5
7236+
$as_echo_n "checking whether ${CLANG} supports -Wformat-truncation, for NOT_THE_CFLAGS... " >&6; }
7237+
if ${pgac_cv_prog_CLANG_cflags__Wformat_truncation+:} false; then :
7238+
$as_echo_n "(cached) " >&6
7239+
else
7240+
pgac_save_CFLAGS=$CFLAGS
7241+
pgac_save_CC=$CC
7242+
CC=${CLANG}
7243+
CFLAGS="${NOT_THE_CFLAGS} -Wformat-truncation"
7244+
ac_save_c_werror_flag=$ac_c_werror_flag
7245+
ac_c_werror_flag=yes
7246+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7247+
/* end confdefs.h. */
7248+
7249+
int
7250+
main ()
7251+
{
7252+
7253+
;
7254+
return 0;
7255+
}
7256+
_ACEOF
7257+
if ac_fn_c_try_compile "$LINENO"; then :
7258+
pgac_cv_prog_CLANG_cflags__Wformat_truncation=yes
7259+
else
7260+
pgac_cv_prog_CLANG_cflags__Wformat_truncation=no
7261+
fi
7262+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7263+
ac_c_werror_flag=$ac_save_c_werror_flag
7264+
CFLAGS="$pgac_save_CFLAGS"
7265+
CC="$pgac_save_CC"
7266+
fi
7267+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANG_cflags__Wformat_truncation" >&5
7268+
$as_echo "$pgac_cv_prog_CLANG_cflags__Wformat_truncation" >&6; }
7269+
if test x"$pgac_cv_prog_CLANG_cflags__Wformat_truncation" = x"yes"; then
7270+
NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wformat-truncation"
7271+
fi
7272+
7273+
if test -n "$NOT_THE_CFLAGS"; then
7274+
BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-format-truncation"
7275+
fi
7276+
NOT_THE_CFLAGS=""
7277+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -Wstringop-truncation, for NOT_THE_CFLAGS" >&5
7278+
$as_echo_n "checking whether ${CLANG} supports -Wstringop-truncation, for NOT_THE_CFLAGS... " >&6; }
7279+
if ${pgac_cv_prog_CLANG_cflags__Wstringop_truncation+:} false; then :
7280+
$as_echo_n "(cached) " >&6
7281+
else
7282+
pgac_save_CFLAGS=$CFLAGS
7283+
pgac_save_CC=$CC
7284+
CC=${CLANG}
7285+
CFLAGS="${NOT_THE_CFLAGS} -Wstringop-truncation"
7286+
ac_save_c_werror_flag=$ac_c_werror_flag
7287+
ac_c_werror_flag=yes
7288+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7289+
/* end confdefs.h. */
7290+
7291+
int
7292+
main ()
7293+
{
7294+
7295+
;
7296+
return 0;
7297+
}
7298+
_ACEOF
7299+
if ac_fn_c_try_compile "$LINENO"; then :
7300+
pgac_cv_prog_CLANG_cflags__Wstringop_truncation=yes
7301+
else
7302+
pgac_cv_prog_CLANG_cflags__Wstringop_truncation=no
7303+
fi
7304+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7305+
ac_c_werror_flag=$ac_save_c_werror_flag
7306+
CFLAGS="$pgac_save_CFLAGS"
7307+
CC="$pgac_save_CC"
7308+
fi
7309+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANG_cflags__Wstringop_truncation" >&5
7310+
$as_echo "$pgac_cv_prog_CLANG_cflags__Wstringop_truncation" >&6; }
7311+
if test x"$pgac_cv_prog_CLANG_cflags__Wstringop_truncation" = x"yes"; then
7312+
NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wstringop-truncation"
7313+
fi
7314+
7315+
if test -n "$NOT_THE_CFLAGS"; then
7316+
BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-stringop-truncation"
7317+
fi
70187318
fi
70197319

70207320
# supply -g if --enable-debug

‎configure.in

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,35 @@ if test "$with_llvm" = yes ; then
589589
PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANGXX, BITCODE_CXXFLAGS, [-fwrapv])
590590
PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, BITCODE_CFLAGS, [-fexcess-precision=standard])
591591
PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANGXX, BITCODE_CXXFLAGS, [-fexcess-precision=standard])
592+
593+
PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, BITCODE_CFLAGS, [-Xclang -no-opaque-pointers])
594+
PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANGXX, BITCODE_CXXFLAGS, [-Xclang -no-opaque-pointers])
595+
596+
NOT_THE_CFLAGS=""
597+
PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, NOT_THE_CFLAGS, [-Wunused-command-line-argument])
598+
if test -n "$NOT_THE_CFLAGS"; then
599+
BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-unused-command-line-argument"
600+
fi
601+
NOT_THE_CFLAGS=""
602+
PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, NOT_THE_CFLAGS, [-Wcompound-token-split-by-macro])
603+
if test -n "$NOT_THE_CFLAGS"; then
604+
BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-compound-token-split-by-macro"
605+
fi
606+
NOT_THE_CFLAGS=""
607+
PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, NOT_THE_CFLAGS, [-Wdeprecated-non-prototype])
608+
if test -n "$NOT_THE_CFLAGS"; then
609+
BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-deprecated-non-prototype"
610+
fi
611+
NOT_THE_CFLAGS=""
612+
PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, NOT_THE_CFLAGS, [-Wformat-truncation])
613+
if test -n "$NOT_THE_CFLAGS"; then
614+
BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-format-truncation"
615+
fi
616+
NOT_THE_CFLAGS=""
617+
PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, NOT_THE_CFLAGS, [-Wstringop-truncation])
618+
if test -n "$NOT_THE_CFLAGS"; then
619+
BITCODE_CFLAGS="$BITCODE_CFLAGS -Wno-stringop-truncation"
620+
fi
592621
fi
593622

594623
# supply -g if --enable-debug

‎doc/src/sgml/parallel.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
136136

137137
<para>
138138
In addition, the system must not be running in single-user mode. Since
139-
the entire database system is running in single process in this situation,
139+
the entire database system is running as a single process in this situation,
140140
no background workers will be available.
141141
</para>
142142

‎doc/src/sgml/ref/alter_table.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@ WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
899899
constraint. This does not work, however, if any of the partition keys
900900
is an expression and the partition does not accept
901901
<literal>NULL</literal> values. If attaching a list partition that will
902-
not accept <literal>NULL</literal> values, also add
902+
not accept <literal>NULL</literal> values, also add a
903903
<literal>NOT NULL</literal> constraint to the partition key column,
904904
unless it's an expression.
905905
</para>

‎doc/src/sgml/sources.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -886,9 +886,9 @@ BETTER: unrecognized node type: 42
886886
<simplesect>
887887
<title>Function-Like Macros and Inline Functions</title>
888888
<para>
889-
Both, macros with arguments and <literal>static inline</literal>
890-
functions, may be used. The latter are preferable if there are
891-
multiple-evaluation hazards when written as a macro, as e.g. the
889+
Both macros with arguments and <literal>static inline</literal>
890+
functions may be used. The latter are preferable if there are
891+
multiple-evaluation hazards when written as a macro, as e.g., the
892892
case with
893893
<programlisting>
894894
#define Max(x, y) ((x) > (y) ? (x) : (y))

0 commit comments

Comments
 (0)