This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new 0608a6061aa Fix some conflict for test
0608a6061aa is described below
commit 0608a6061aa32c54472ad052cc07fa562dcb2d1e
Author: Jinbao Chen <[email protected]>
AuthorDate: Sun Mar 8 23:10:12 2026 -0400
Fix some conflict for test
---
src/test/authentication/t/001_password.pl | 4 -
src/test/authentication/t/002_saslprep.pl | 7 -
.../summarization-and-inprogress-insertion.out | 26 ----
src/test/modules/brin/t/01_workitems.pl | 32 ++--
src/test/modules/brin/t/02_wal_consistency.pl | 15 --
src/test/modules/libpq_pipeline/libpq_pipeline.c | 3 -
.../modules/libpq_pipeline/t/001_libpq_pipeline.pl | 4 -
.../modules/test_ddl_deparse/test_ddl_deparse.c | 5 -
src/test/modules/test_escape/test_escape.c | 163 ---------------------
.../test_extensions/expected/test_extensions.out | 21 ---
.../test_extensions/sql/test_extensions.sql | 13 --
src/test/modules/test_predtest/test_predtest.c | 5 -
.../modules/test_regex/expected/test_regex.out | 3 -
src/test/modules/test_regex/sql/test_regex.sql | 3 -
14 files changed, 12 insertions(+), 292 deletions(-)
diff --git a/src/test/authentication/t/001_password.pl
b/src/test/authentication/t/001_password.pl
index 3027b2c73c7..12552837a8e 100644
--- a/src/test/authentication/t/001_password.pl
+++ b/src/test/authentication/t/001_password.pl
@@ -42,11 +42,7 @@ sub test_conn
{
local $Test::Builder::Level = $Test::Builder::Level + 1;
-<<<<<<< HEAD
- my ($node, $role, $method, $expected_res, %params) = @_;
-=======
my ($node, $connstr, $method, $expected_res, %params) = @_;
->>>>>>> REL_16_9
my $status_string = 'failed';
$status_string = 'success' if ($expected_res eq 0);
diff --git a/src/test/authentication/t/002_saslprep.pl
b/src/test/authentication/t/002_saslprep.pl
index 0ca7813f667..ef158311668 100644
--- a/src/test/authentication/t/002_saslprep.pl
+++ b/src/test/authentication/t/002_saslprep.pl
@@ -34,17 +34,10 @@ sub test_login
{
local $Test::Builder::Level = $Test::Builder::Level + 1;
-<<<<<<< HEAD
- my $node = shift;
- my $role = shift;
- my $password = shift;
- my $expected_res = shift;
-=======
my $node = shift;
my $role = shift;
my $password = shift;
my $expected_res = shift;
->>>>>>> REL_16_9
my $status_string = 'failed';
$status_string = 'success' if ($expected_res eq 0);
diff --git
a/src/test/modules/brin/expected/summarization-and-inprogress-insertion.out
b/src/test/modules/brin/expected/summarization-and-inprogress-insertion.out
index a3edf11a1e5..201786c82c0 100644
--- a/src/test/modules/brin/expected/summarization-and-inprogress-insertion.out
+++ b/src/test/modules/brin/expected/summarization-and-inprogress-insertion.out
@@ -2,15 +2,9 @@ Parsed test spec with 2 sessions
starting permutation: s2check s1b s2b s1i s2summ s1c s2c s2check
step s2check: SELECT * FROM brin_page_items(get_raw_page('brinidx', 2),
'brinidx'::regclass);
-<<<<<<< HEAD
-itemoffset|blknum|attnum|allnulls|hasnulls|placeholder|value
-----------+------+------+--------+--------+-----------+--------
- 1| 0| 1|f |t |f |{1 .. 1}
-=======
itemoffset|blknum|attnum|allnulls|hasnulls|placeholder|empty|value
----------+------+------+--------+--------+-----------+-----+--------
1| 0| 1|f |t |f |f |{1 .. 1}
->>>>>>> REL_16_9
(1 row)
step s1b: BEGIN ISOLATION LEVEL REPEATABLE READ;
@@ -30,31 +24,18 @@ brin_summarize_new_values
step s1c: COMMIT;
step s2c: COMMIT;
step s2check: SELECT * FROM brin_page_items(get_raw_page('brinidx', 2),
'brinidx'::regclass);
-<<<<<<< HEAD
-itemoffset|blknum|attnum|allnulls|hasnulls|placeholder|value
-----------+------+------+--------+--------+-----------+-----------
- 1| 0| 1|f |t |f |{1 .. 1}
- 2| 1| 1|f |f |f |{1 .. 1000}
-=======
itemoffset|blknum|attnum|allnulls|hasnulls|placeholder|empty|value
----------+------+------+--------+--------+-----------+-----+-----------
1| 0| 1|f |t |f |f |{1 .. 1}
2| 1| 1|f |f |f |f |{1 .. 1000}
->>>>>>> REL_16_9
(2 rows)
starting permutation: s2check s1b s1i s2vacuum s1c s2check
step s2check: SELECT * FROM brin_page_items(get_raw_page('brinidx', 2),
'brinidx'::regclass);
-<<<<<<< HEAD
-itemoffset|blknum|attnum|allnulls|hasnulls|placeholder|value
-----------+------+------+--------+--------+-----------+--------
- 1| 0| 1|f |t |f |{1 .. 1}
-=======
itemoffset|blknum|attnum|allnulls|hasnulls|placeholder|empty|value
----------+------+------+--------+--------+-----------+-----+--------
1| 0| 1|f |t |f |f |{1 .. 1}
->>>>>>> REL_16_9
(1 row)
step s1b: BEGIN ISOLATION LEVEL REPEATABLE READ;
@@ -62,16 +43,9 @@ step s1i: INSERT INTO brin_iso VALUES (1000);
step s2vacuum: VACUUM brin_iso;
step s1c: COMMIT;
step s2check: SELECT * FROM brin_page_items(get_raw_page('brinidx', 2),
'brinidx'::regclass);
-<<<<<<< HEAD
-itemoffset|blknum|attnum|allnulls|hasnulls|placeholder|value
-----------+------+------+--------+--------+-----------+-----------
- 1| 0| 1|f |t |f |{1 .. 1}
- 2| 1| 1|f |f |f |{1 .. 1000}
-=======
itemoffset|blknum|attnum|allnulls|hasnulls|placeholder|empty|value
----------+------+------+--------+--------+-----------+-----+-----------
1| 0| 1|f |t |f |f |{1 .. 1}
2| 1| 1|f |f |f |f |{1 .. 1000}
->>>>>>> REL_16_9
(2 rows)
diff --git a/src/test/modules/brin/t/01_workitems.pl
b/src/test/modules/brin/t/01_workitems.pl
index b8efe103d09..5f710742314 100644
--- a/src/test/modules/brin/t/01_workitems.pl
+++ b/src/test/modules/brin/t/01_workitems.pl
@@ -6,16 +6,9 @@
use strict;
use warnings;
-<<<<<<< HEAD
-use TestLib;
-use Test::More tests => 1;
-# use Test::More tests => 2;
-use PostgresNode;
-=======
use PostgreSQL::Test::Utils;
use Test::More;
use PostgreSQL::Test::Cluster;
->>>>>>> REL_16_9
my $node = PostgreSQL::Test::Cluster->new('tango');
$node->init;
@@ -36,19 +29,18 @@ my $count = $node->safe_psql('postgres',
);
is($count, '1', "initial index state is correct");
-# GPDB: Disabled until autovacuum on user tables can be enabled.
-# $node->safe_psql('postgres',
-# 'insert into brin_wi select * from generate_series(1, 100)');
-#
-# $node->poll_query_until(
-# 'postgres',
-# "select count(*) > 1 from brin_page_items(get_raw_page('brin_wi_idx',
2), 'brin_wi_idx'::regclass)",
-# 't');
-#
-# $count = $node->safe_psql('postgres',
-# "select count(*) > 1 from brin_page_items(get_raw_page('brin_wi_idx',
2), 'brin_wi_idx'::regclass)"
-# );
-# is($count, 't', "index got summarized");
+$node->safe_psql('postgres',
+ 'insert into brin_wi select * from generate_series(1, 100)');
+
+$node->poll_query_until(
+ 'postgres',
+ "select count(*) > 1 from brin_page_items(get_raw_page('brin_wi_idx',
2), 'brin_wi_idx'::regclass)",
+ 't');
+
+$count = $node->safe_psql('postgres',
+ "select count(*) > 1 from brin_page_items(get_raw_page('brin_wi_idx',
2), 'brin_wi_idx'::regclass)"
+);
+is($count, 't', "index got summarized");
$node->stop;
done_testing();
diff --git a/src/test/modules/brin/t/02_wal_consistency.pl
b/src/test/modules/brin/t/02_wal_consistency.pl
index c2e5f87dee6..8b2b244feb9 100644
--- a/src/test/modules/brin/t/02_wal_consistency.pl
+++ b/src/test/modules/brin/t/02_wal_consistency.pl
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-# Copyright (c) 2021-2022, PostgreSQL Global Development Group
-=======
# Copyright (c) 2021-2023, PostgreSQL Global Development Group
->>>>>>> REL_16_9
# Verify WAL consistency
@@ -19,10 +15,7 @@ $whiskey->init(allows_streaming => 1);
$whiskey->append_conf('postgresql.conf', 'wal_consistency_checking = brin');
$whiskey->start;
$whiskey->safe_psql('postgres', 'create extension pageinspect');
-<<<<<<< HEAD
-=======
$whiskey->safe_psql('postgres', 'create extension pg_walinspect');
->>>>>>> REL_16_9
is( $whiskey->psql(
'postgres',
qq[SELECT pg_create_physical_replication_slot('standby_1');]),
@@ -46,10 +39,7 @@ $whiskey->safe_psql(
create table tbl_timestamp0 (d1 timestamp(0) without time zone) with
(fillfactor=10);
create index on tbl_timestamp0 using brin (d1) with (pages_per_range = 1,
autosummarize=false);
});
-<<<<<<< HEAD
-=======
my $start_lsn = $whiskey->lsn('insert');
->>>>>>> REL_16_9
# Run a loop that will end when the second revmap page is created
$whiskey->safe_psql(
'postgres', q{
@@ -70,10 +60,6 @@ begin
end
$$;
});
-<<<<<<< HEAD
-
-$whiskey->wait_for_catchup($charlie, 'replay', $whiskey->lsn('insert'));
-=======
my $end_lsn = $whiskey->lsn('flush');
my ($ret, $out, $err) = $whiskey->psql(
@@ -85,6 +71,5 @@ my ($ret, $out, $err) = $whiskey->psql(
cmp_ok($out, '>=', 1);
$whiskey->wait_for_replay_catchup($charlie);
->>>>>>> REL_16_9
done_testing();
diff --git a/src/test/modules/libpq_pipeline/libpq_pipeline.c
b/src/test/modules/libpq_pipeline/libpq_pipeline.c
index 8664fd394d3..1933b078ebf 100644
--- a/src/test/modules/libpq_pipeline/libpq_pipeline.c
+++ b/src/test/modules/libpq_pipeline/libpq_pipeline.c
@@ -26,11 +26,8 @@
static void exit_nicely(PGconn *conn);
-<<<<<<< HEAD
-=======
static void pg_attribute_noreturn() pg_fatal_impl(int line, const char
*fmt,...)
pg_attribute_printf(2, 3);
->>>>>>> REL_16_9
static bool process_result(PGconn *conn, PGresult *res, int results,
int numsent);
diff --git a/src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl
b/src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl
index 0b559bf4a67..056fa5c6d2b 100644
--- a/src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl
+++ b/src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl
@@ -38,12 +38,8 @@ for my $testname (@tests)
my @extraargs = ('-r', $numrows);
my $cmptrace = grep(/^$testname$/,
qw(simple_pipeline nosync multi_pipelines prepared singlerow
-<<<<<<< HEAD
- pipeline_abort transaction disallowed_in_pipeline)) > 0;
-=======
pipeline_abort pipeline_idle transaction
disallowed_in_pipeline)) > 0;
->>>>>>> REL_16_9
# For a bunch of tests, generate a libpq trace file too.
my $traceout =
diff --git a/src/test/modules/test_ddl_deparse/test_ddl_deparse.c
b/src/test/modules/test_ddl_deparse/test_ddl_deparse.c
index fe7ec23d008..b1f45ddb186 100644
--- a/src/test/modules/test_ddl_deparse/test_ddl_deparse.c
+++ b/src/test/modules/test_ddl_deparse/test_ddl_deparse.c
@@ -288,16 +288,12 @@ get_altertable_subcmdinfo(PG_FUNCTION_ARGS)
case AT_GenericOptions:
strtype = "SET OPTIONS";
break;
-<<<<<<< HEAD
case AT_SetTags:
strtype = "SET TAGS";
break;
case AT_UnsetTags:
strtype = "UNSET TAGS";
break;
- default:
- strtype = "unrecognized";
-=======
case AT_DetachPartition:
strtype = "DETACH PARTITION";
break;
@@ -318,7 +314,6 @@ get_altertable_subcmdinfo(PG_FUNCTION_ARGS)
break;
case AT_ReAddStatistics:
strtype = "(re) ADD STATS";
->>>>>>> REL_16_9
break;
}
diff --git a/src/test/modules/test_escape/test_escape.c
b/src/test/modules/test_escape/test_escape.c
index f839351756a..dddb6d6d623 100644
--- a/src/test/modules/test_escape/test_escape.c
+++ b/src/test/modules/test_escape/test_escape.c
@@ -12,19 +12,13 @@
#include <string.h>
#include <stdio.h>
-<<<<<<< HEAD
-=======
#include "common/jsonapi.h"
->>>>>>> REL_16_9
#include "fe_utils/psqlscan.h"
#include "fe_utils/string_utils.h"
#include "getopt_long.h"
#include "libpq-fe.h"
#include "mb/pg_wchar.h"
-<<<<<<< HEAD
-=======
#include "utils/memdebug.h"
->>>>>>> REL_16_9
typedef struct pe_test_config
@@ -38,11 +32,8 @@ typedef struct pe_test_config
int failure_count;
} pe_test_config;
-<<<<<<< HEAD
-=======
#define NEVER_ACCESS_STR "\xff never-to-be-touched"
->>>>>>> REL_16_9
/*
* An escape function to be tested by this test.
@@ -69,14 +60,11 @@ typedef struct pe_test_escape_func
*/
bool supports_only_ascii_overlap;
-<<<<<<< HEAD
-=======
/*
* Does the escape function have a length input?
*/
bool supports_input_length;
->>>>>>> REL_16_9
bool (*escape) (PGconn *conn, PQExpBuffer target,
const char *unescaped,
size_t unescaped_len,
PQExpBuffer escape_err);
@@ -101,8 +89,6 @@ static const PsqlScanCallbacks test_scan_callbacks = {
};
-<<<<<<< HEAD
-=======
/*
* Print the string into buf, making characters outside of plain ascii
* somewhat easier to recognize.
@@ -264,7 +250,6 @@ test_gb18030_json(pe_test_config *tc)
}
->>>>>>> REL_16_9
static bool
escape_literal(PGconn *conn, PQExpBuffer target,
const char *unescaped, size_t unescaped_len,
@@ -419,37 +404,25 @@ static pe_test_escape_func pe_test_escape_funcs[] =
{
.name = "PQescapeLiteral",
.reports_errors = true,
-<<<<<<< HEAD
-=======
.supports_input_length = true,
->>>>>>> REL_16_9
.escape = escape_literal,
},
{
.name = "PQescapeIdentifier",
.reports_errors = true,
-<<<<<<< HEAD
-=======
.supports_input_length = true,
->>>>>>> REL_16_9
.escape = escape_identifier
},
{
.name = "PQescapeStringConn",
.reports_errors = true,
-<<<<<<< HEAD
-=======
.supports_input_length = true,
->>>>>>> REL_16_9
.escape = escape_string_conn
},
{
.name = "PQescapeString",
.reports_errors = false,
-<<<<<<< HEAD
-=======
.supports_input_length = true,
->>>>>>> REL_16_9
.escape = escape_string
},
{
@@ -457,10 +430,7 @@ static pe_test_escape_func pe_test_escape_funcs[] =
.reports_errors = false,
.supports_only_valid = true,
.supports_only_ascii_overlap = true,
-<<<<<<< HEAD
-=======
.supports_input_length = true,
->>>>>>> REL_16_9
.escape = escape_replace
},
{
@@ -477,10 +447,7 @@ static pe_test_escape_func pe_test_escape_funcs[] =
#define TV(enc, string) {.client_encoding = (enc), .escape=string,
.escape_len=sizeof(string) - 1, }
-<<<<<<< HEAD
-=======
#define TV_LEN(enc, string, len) {.client_encoding = (enc), .escape=string,
.escape_len=len, }
->>>>>>> REL_16_9
static pe_test_vector pe_test_vectors[] =
{
/* expected to work sanity checks */
@@ -568,86 +535,6 @@ static pe_test_vector pe_test_vectors[] =
TV("mule_internal", "\\\x9c';\0;"),
TV("sql_ascii", "1\xC0'"),
-<<<<<<< HEAD
-};
-
-
-/*
- * Print the string into buf, making characters outside of plain ascii
- * somewhat easier to recognize.
- *
- * The output format could stand to be improved significantly, it's not at all
- * unambiguous.
- */
-static void
-escapify(PQExpBuffer buf, const char *str, size_t len)
-{
- for (size_t i = 0; i < len; i++)
- {
- char c = *str;
-
- if (c == '\n')
- appendPQExpBufferStr(buf, "\\n");
- else if (c == '\0')
- appendPQExpBufferStr(buf, "\\0");
- else if (c < ' ' || c > '~')
- appendPQExpBuffer(buf, "\\x%2x", (uint8_t) c);
- else
- appendPQExpBufferChar(buf, c);
- str++;
- }
-}
-
-static void
-report_result(pe_test_config *tc,
- bool success,
- PQExpBuffer testname,
- PQExpBuffer details,
- const char *subname,
- const char *resultdesc)
-{
- int test_id = ++tc->test_count;
- bool print_details = true;
- bool print_result = true;
-
- if (success)
- {
- if (tc->verbosity <= 0)
- print_details = false;
- if (tc->verbosity < 0)
- print_result = false;
- }
- else
- tc->failure_count++;
-
- if (print_details)
- printf("%s", details->data);
-
- if (print_result)
- printf("%s %d - %s: %s: %s\n",
- success ? "ok" : "not ok",
- test_id, testname->data,
- subname,
- resultdesc);
-}
-
-/*
- * Return true for encodings in which bytes in a multi-byte character look
- * like valid ascii characters.
- */
-static bool
-encoding_conflicts_ascii(int encoding)
-{
- /*
- * We don't store this property directly anywhere, but whether an
encoding
- * is a client-only encoding is a good proxy.
- */
- if (encoding > PG_ENCODING_BE_LAST)
- return true;
- return false;
-}
-
-=======
/*
* Testcases that are not null terminated for the specified input
length.
@@ -670,7 +557,6 @@ encoding_conflicts_ascii(int encoding)
};
->>>>>>> REL_16_9
static const char *
scan_res_s(PsqlScanResult res)
{
@@ -745,11 +631,7 @@ test_psql_parse(pe_test_config *tc, PQExpBuffer testname,
else
resdesc = "ok";
-<<<<<<< HEAD
- report_result(tc, !test_fails, testname, details,
-=======
report_result(tc, !test_fails, testname->data, details->data,
->>>>>>> REL_16_9
"psql parse",
resdesc);
}
@@ -759,10 +641,7 @@ test_one_vector_escape(pe_test_config *tc, const
pe_test_vector *tv, const pe_te
{
PQExpBuffer testname;
PQExpBuffer details;
-<<<<<<< HEAD
-=======
PQExpBuffer raw_buf;
->>>>>>> REL_16_9
PQExpBuffer escape_buf;
PQExpBuffer escape_err;
size_t input_encoding_validlen;
@@ -776,10 +655,7 @@ test_one_vector_escape(pe_test_config *tc, const
pe_test_vector *tv, const pe_te
escape_err = createPQExpBuffer();
testname = createPQExpBuffer();
details = createPQExpBuffer();
-<<<<<<< HEAD
-=======
raw_buf = createPQExpBuffer();
->>>>>>> REL_16_9
escape_buf = createPQExpBuffer();
if (ef->supports_only_ascii_overlap &&
@@ -813,13 +689,8 @@ test_one_vector_escape(pe_test_config *tc, const
pe_test_vector *tv, const pe_te
input_encoding0_validlen =
pg_encoding_verifymbstr(PQclientEncoding(tc->conn),
tv->escape,
-<<<<<<< HEAD
-
strlen(tv->escape));
- input_encoding0_valid = input_encoding0_validlen == strlen(tv->escape);
-=======
strnlen(tv->escape, tv->escape_len));
input_encoding0_valid = input_encoding0_validlen == strnlen(tv->escape,
tv->escape_len);
->>>>>>> REL_16_9
appendPQExpBuffer(details, "#\t input encoding valid till 0: %d\n",
input_encoding0_valid);
@@ -831,11 +702,6 @@ test_one_vector_escape(pe_test_config *tc, const
pe_test_vector *tv, const pe_te
goto out;
-<<<<<<< HEAD
- /* call the to-be-tested escape function */
- escape_success = ef->escape(tc->conn, escape_buf,
- tv->escape,
tv->escape_len,
-=======
/*
* Put the to-be-escaped data into a buffer, so that we
*
@@ -874,7 +740,6 @@ test_one_vector_escape(pe_test_config *tc, const
pe_test_vector *tv, const pe_te
/* call the to-be-tested escape function */
escape_success = ef->escape(tc->conn, escape_buf,
raw_buf->data,
tv->escape_len,
->>>>>>> REL_16_9
escape_err);
if (!escape_success)
{
@@ -884,11 +749,8 @@ test_one_vector_escape(pe_test_config *tc, const
pe_test_vector *tv, const pe_te
if (escape_buf->len > 0)
{
-<<<<<<< HEAD
-=======
bool contains_never;
->>>>>>> REL_16_9
appendPQExpBuffer(details, "#\t escaped string: %zd bytes: ",
escape_buf->len);
escapify(details, escape_buf->data, escape_buf->len);
appendPQExpBufferChar(details, '\n');
@@ -900,8 +762,6 @@ test_one_vector_escape(pe_test_config *tc, const
pe_test_vector *tv, const pe_te
appendPQExpBuffer(details, "#\t escape encoding valid: %d\n",
escape_encoding_valid);
-<<<<<<< HEAD
-=======
/*
* Verify that no data beyond the end of the input is included
in the
@@ -912,7 +772,6 @@ test_one_vector_escape(pe_test_config *tc, const
pe_test_vector *tv, const pe_te
report_result(tc, contains_never, testname->data, details->data,
"escaped data beyond end of input",
contains_never ? "no" : "all secrets
revealed");
->>>>>>> REL_16_9
}
else
{
@@ -953,11 +812,7 @@ test_one_vector_escape(pe_test_config *tc, const
pe_test_vector *tv, const pe_te
resdesc = "valid input failed to escape, due to
zero byte";
}
-<<<<<<< HEAD
- report_result(tc, ok, testname, details,
-=======
report_result(tc, ok, testname->data, details->data,
->>>>>>> REL_16_9
"input validity vs escape success",
resdesc);
}
@@ -987,11 +842,7 @@ test_one_vector_escape(pe_test_config *tc, const
pe_test_vector *tv, const pe_te
resdesc = "invalid input produced valid output";
}
-<<<<<<< HEAD
- report_result(tc, ok, testname, details,
-=======
report_result(tc, ok, testname->data, details->data,
->>>>>>> REL_16_9
"input and escaped encoding validity",
resdesc);
}
@@ -1011,10 +862,7 @@ out:
destroyPQExpBuffer(details);
destroyPQExpBuffer(testname);
destroyPQExpBuffer(escape_buf);
-<<<<<<< HEAD
-=======
destroyPQExpBuffer(raw_buf);
->>>>>>> REL_16_9
}
static void
@@ -1051,11 +899,7 @@ usage(const char *hint)
" -c, --conninfo=CONNINFO connection information to use\n"
" -v, --verbose show test details even for
successes\n"
" -q, --quiet only show failures\n"
-<<<<<<< HEAD
- " --force-unsupported test invalid input even if
unsupported\n"
-=======
" -f, --force-unsupported test invalid input even if
unsupported\n"
->>>>>>> REL_16_9
);
if (hint)
@@ -1078,11 +922,7 @@ main(int argc, char *argv[])
{NULL, 0, NULL, 0},
};
-<<<<<<< HEAD
- while ((c = getopt_long(argc, argv, "vqh", long_options,
&option_index)) != -1)
-=======
while ((c = getopt_long(argc, argv, "c:fhqv", long_options,
&option_index)) != -1)
->>>>>>> REL_16_9
{
switch (c)
{
@@ -1120,12 +960,9 @@ main(int argc, char *argv[])
exit(1);
}
-<<<<<<< HEAD
-=======
test_gb18030_page_multiple(&tc);
test_gb18030_json(&tc);
->>>>>>> REL_16_9
for (int i = 0; i < lengthof(pe_test_vectors); i++)
{
test_one_vector(&tc, &pe_test_vectors[i]);
diff --git a/src/test/modules/test_extensions/expected/test_extensions.out
b/src/test/modules/test_extensions/expected/test_extensions.out
index b8661efc323..5d6e56cbb60 100644
--- a/src/test/modules/test_extensions/expected/test_extensions.out
+++ b/src/test/modules/test_extensions/expected/test_extensions.out
@@ -156,14 +156,6 @@ DROP TABLE test_ext4_tab;
DROP FUNCTION create_extension_with_temp_schema();
RESET client_min_messages;
\unset SHOW_CONTEXT
-<<<<<<< HEAD
-=======
--- Test case of an event trigger run in an extension upgrade script.
--- See: https://postgr.es/m/20200902193715.6e0269d4@firost
-CREATE EXTENSION test_ext_evttrig;
-ALTER EXTENSION test_ext_evttrig UPDATE TO '2.0';
-DROP EXTENSION test_ext_evttrig;
->>>>>>> REL_16_9
-- It's generally bad style to use CREATE OR REPLACE unnecessarily.
-- Test what happens if an extension does it anyway.
-- Replacing a shell type or operator is sort of like CREATE OR REPLACE;
@@ -256,10 +248,7 @@ ERROR: collation ext_cine_coll is not a member of
extension "test_ext_cine"
DETAIL: An extension may only use CREATE ... IF NOT EXISTS to skip object
creation if the conflicting object is one that it already owns.
DROP COLLATION ext_cine_coll;
CREATE MATERIALIZED VIEW ext_cine_mv AS SELECT 11 AS f1;
-<<<<<<< HEAD
NOTICE: Table doesn't have 'DISTRIBUTED BY' clause. Creating a NULL policy
entry.
-=======
->>>>>>> REL_16_9
CREATE EXTENSION test_ext_cine; -- fail
ERROR: materialized view ext_cine_mv is not a member of extension
"test_ext_cine"
DETAIL: An extension may only use CREATE ... IF NOT EXISTS to skip object
creation if the conflicting object is one that it already owns.
@@ -281,20 +270,13 @@ ERROR: sequence ext_cine_seq is not a member of
extension "test_ext_cine"
DETAIL: An extension may only use CREATE ... IF NOT EXISTS to skip object
creation if the conflicting object is one that it already owns.
DROP SEQUENCE ext_cine_seq;
CREATE TABLE ext_cine_tab1 (x int);
-<<<<<<< HEAD
NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'x'
as the Apache Cloudberry data distribution key for this table.
HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make
sure column(s) chosen are the optimal data distribution key to minimize skew.
-=======
->>>>>>> REL_16_9
CREATE EXTENSION test_ext_cine; -- fail
ERROR: table ext_cine_tab1 is not a member of extension "test_ext_cine"
DETAIL: An extension may only use CREATE ... IF NOT EXISTS to skip object
creation if the conflicting object is one that it already owns.
DROP TABLE ext_cine_tab1;
CREATE TABLE ext_cine_tab2 AS SELECT 42 AS y;
-<<<<<<< HEAD
-NOTICE: Table doesn't have 'DISTRIBUTED BY' clause. Creating a NULL policy
entry.
-=======
->>>>>>> REL_16_9
CREATE EXTENSION test_ext_cine; -- fail
ERROR: table ext_cine_tab2 is not a member of extension "test_ext_cine"
DETAIL: An extension may only use CREATE ... IF NOT EXISTS to skip object
creation if the conflicting object is one that it already owns.
@@ -337,8 +319,6 @@ CREATE SCHEMA "has space";
CREATE EXTENSION test_ext_extschema SCHEMA has$dollar;
ERROR: invalid character in extension "test_ext_extschema" schema: must not
contain any of ""$'\"
CREATE EXTENSION test_ext_extschema SCHEMA "has space";
-<<<<<<< HEAD
-=======
--
-- Test extension with objects outside the extension's schema.
--
@@ -464,4 +444,3 @@ SELECT test_s_dep.dep_req2();
DROP EXTENSION test_ext_req_schema1 CASCADE;
NOTICE: drop cascades to extension test_ext_req_schema2
->>>>>>> REL_16_9
diff --git a/src/test/modules/test_extensions/sql/test_extensions.sql
b/src/test/modules/test_extensions/sql/test_extensions.sql
index b178a2207c6..b1216b61065 100644
--- a/src/test/modules/test_extensions/sql/test_extensions.sql
+++ b/src/test/modules/test_extensions/sql/test_extensions.sql
@@ -97,15 +97,6 @@ DROP FUNCTION create_extension_with_temp_schema();
RESET client_min_messages;
\unset SHOW_CONTEXT
-<<<<<<< HEAD
-=======
--- Test case of an event trigger run in an extension upgrade script.
--- See: https://postgr.es/m/20200902193715.6e0269d4@firost
-CREATE EXTENSION test_ext_evttrig;
-ALTER EXTENSION test_ext_evttrig UPDATE TO '2.0';
-DROP EXTENSION test_ext_evttrig;
-
->>>>>>> REL_16_9
-- It's generally bad style to use CREATE OR REPLACE unnecessarily.
-- Test what happens if an extension does it anyway.
-- Replacing a shell type or operator is sort of like CREATE OR REPLACE;
@@ -221,9 +212,6 @@ ALTER EXTENSION test_ext_cine UPDATE TO '1.1';
--
CREATE SCHEMA "has space";
CREATE EXTENSION test_ext_extschema SCHEMA has$dollar;
-<<<<<<< HEAD
-CREATE EXTENSION test_ext_extschema SCHEMA "has space";
-=======
CREATE EXTENSION test_ext_extschema SCHEMA "has space";
--
@@ -283,4 +271,3 @@ ALTER EXTENSION test_ext_req_schema1 SET SCHEMA
test_s_dep2; -- now ok
SELECT test_s_dep2.dep_req1();
SELECT test_s_dep.dep_req2();
DROP EXTENSION test_ext_req_schema1 CASCADE;
->>>>>>> REL_16_9
diff --git a/src/test/modules/test_predtest/test_predtest.c
b/src/test/modules/test_predtest/test_predtest.c
index ff4ce7e3f43..3e4792b5c3a 100644
--- a/src/test/modules/test_predtest/test_predtest.c
+++ b/src/test/modules/test_predtest/test_predtest.c
@@ -132,7 +132,6 @@ test_predtest(PG_FUNCTION_ARGS)
elog(ERROR, "test_predtest query must be a SELECT");
plan = stmt->planTree;
Assert(list_length(plan->targetlist) >= 2);
-<<<<<<< HEAD
/*
* GPDB will add Motion node whose target list is replaced by OUTER_VAR
@@ -145,12 +144,8 @@ test_predtest(PG_FUNCTION_ARGS)
plan = plan->lefttree;
}
- clause1 = castNode(TargetEntry, linitial(plan->targetlist))->expr;
- clause2 = castNode(TargetEntry, lsecond(plan->targetlist))->expr;
-=======
clause1 = linitial_node(TargetEntry, plan->targetlist)->expr;
clause2 = lsecond_node(TargetEntry, plan->targetlist)->expr;
->>>>>>> REL_16_9
/*
* Because the clauses are in the SELECT list, preprocess_expression did
diff --git a/src/test/modules/test_regex/expected/test_regex.out
b/src/test/modules/test_regex/expected/test_regex.out
index 3c7d2e940ff..c44c717edf4 100644
--- a/src/test/modules/test_regex/expected/test_regex.out
+++ b/src/test/modules/test_regex/expected/test_regex.out
@@ -3574,8 +3574,6 @@ select * from test_regex('((.))(\2){0}', 'xy', 'RPQ');
{x,x,x,NULL}
(2 rows)
-<<<<<<< HEAD
-=======
-- expectMatch 21.37 RP ((.))(\2) xyy yy y y
y
select * from test_regex('((.))(\2)', 'xyy', 'RP');
test_regex
@@ -3592,7 +3590,6 @@ select * from test_regex('((.))(\2)', 'xyy', 'oRP');
{yy,NULL,NULL,NULL}
(2 rows)
->>>>>>> REL_16_9
-- expectNomatch 21.39 PQR {(.){0}(\1)} xxx
select * from test_regex('(.){0}(\1)', 'xxx', 'PQR');
test_regex
diff --git a/src/test/modules/test_regex/sql/test_regex.sql
b/src/test/modules/test_regex/sql/test_regex.sql
index d8bf1221cee..b2a847577e8 100644
--- a/src/test/modules/test_regex/sql/test_regex.sql
+++ b/src/test/modules/test_regex/sql/test_regex.sql
@@ -1035,13 +1035,10 @@ select * from test_regex('(a*)*', 'bc', 'N');
select * from test_regex(' TO (([a-z0-9._]+|"([^"]+|"")+")+)', 'asd TO foo',
'M');
-- expectMatch 21.36 RPQ ((.))(\2){0} xy x x x
{}
select * from test_regex('((.))(\2){0}', 'xy', 'RPQ');
-<<<<<<< HEAD
-=======
-- expectMatch 21.37 RP ((.))(\2) xyy yy y y
y
select * from test_regex('((.))(\2)', 'xyy', 'RP');
-- expectMatch 21.38 oRP ((.))(\2) xyy yy {} {}
{}
select * from test_regex('((.))(\2)', 'xyy', 'oRP');
->>>>>>> REL_16_9
-- expectNomatch 21.39 PQR {(.){0}(\1)} xxx
select * from test_regex('(.){0}(\1)', 'xxx', 'PQR');
-- expectNomatch 21.40 PQR {((.)){0}(\2)} xxx
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
