mirror of https://github.com/citusdata/citus.git
modify columnar_drop test
parent
a1d7b08f45
commit
5b67bfcc1a
|
@ -2368,26 +2368,33 @@ ColumnarProcessUtility(PlannedStmt *pstmt,
|
||||||
{
|
{
|
||||||
CreateExtensionStmt *createExtensionStmt = castNode(CreateExtensionStmt,
|
CreateExtensionStmt *createExtensionStmt = castNode(CreateExtensionStmt,
|
||||||
parsetree);
|
parsetree);
|
||||||
if (strcmp(createExtensionStmt->extname, "citus_columnar") == 0)
|
|
||||||
|
if (get_extension_oid("citus_columnar", true) == InvalidOid)
|
||||||
{
|
{
|
||||||
DefElem *newVersionValue = GetExtensionOption(createExtensionStmt->options,
|
if (strcmp(createExtensionStmt->extname, "citus_columnar") == 0)
|
||||||
"new_version");
|
|
||||||
if (newVersionValue)
|
|
||||||
{
|
{
|
||||||
const char *newVersion = defGetString(newVersionValue);
|
DefElem *newVersionValue = GetExtensionOption(
|
||||||
if (strcmp(newVersion, "11.1-0") == 0)
|
createExtensionStmt->options,
|
||||||
|
"new_version");
|
||||||
|
if (newVersionValue)
|
||||||
|
{
|
||||||
|
const char *newVersion = defGetString(newVersionValue);
|
||||||
|
if (strcmp(newVersion, "11.1-0") == 0)
|
||||||
|
{
|
||||||
|
ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
|
||||||
|
errmsg(
|
||||||
|
"unsupported citus_columnar version 11.1-0")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*latest citus requires install columnar first, existing citus can only be an older version */
|
||||||
|
if (get_extension_oid("citus", true) != InvalidOid)
|
||||||
{
|
{
|
||||||
ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
|
ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
|
||||||
errmsg("unsupported citus_columnar version 11.1-0")));
|
errmsg(
|
||||||
|
"must upgrade citus to version 11.1-1 first")));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*latest citus requires install columnar first, existing citus can only be an older version */
|
|
||||||
if (get_extension_oid("citus", true) != InvalidOid)
|
|
||||||
{
|
|
||||||
ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
|
|
||||||
errmsg("must upgrade citus to version 11.1-1 first")));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -186,7 +186,7 @@ check-operations: all
|
||||||
-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/operations_schedule $(EXTRA_TESTS)
|
-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/operations_schedule $(EXTRA_TESTS)
|
||||||
|
|
||||||
check-columnar:
|
check-columnar:
|
||||||
$(pg_regress_multi_check) --load-extension=citus \
|
$(pg_regress_multi_check) --load-extension=citus_columnar --load-extension=citus \
|
||||||
-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/columnar_schedule $(EXTRA_TESTS)
|
-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/columnar_schedule $(EXTRA_TESTS)
|
||||||
|
|
||||||
check-columnar-isolation: all $(isolation_test_files)
|
check-columnar-isolation: all $(isolation_test_files)
|
||||||
|
|
|
@ -42,13 +42,13 @@ NOTICE: Citus partially supports CREATE DATABASE for distributed databases
|
||||||
DETAIL: Citus does not propagate CREATE DATABASE command to workers
|
DETAIL: Citus does not propagate CREATE DATABASE command to workers
|
||||||
HINT: You can manually create a database and its extensions on workers.
|
HINT: You can manually create a database and its extensions on workers.
|
||||||
\c db_to_drop
|
\c db_to_drop
|
||||||
CREATE EXTENSION citus;
|
CREATE EXTENSION citus_columnar;
|
||||||
SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database() \gset
|
SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database() \gset
|
||||||
CREATE TABLE test_table(data int) USING columnar;
|
CREATE TABLE test_table(data int) USING columnar;
|
||||||
DROP EXTENSION citus CASCADE;
|
DROP EXTENSION citus_columnar CASCADE;
|
||||||
NOTICE: drop cascades to table test_table
|
NOTICE: drop cascades to table test_table
|
||||||
-- test database drop
|
-- test database drop
|
||||||
CREATE EXTENSION citus;
|
CREATE EXTENSION citus_columnar;
|
||||||
SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database() \gset
|
SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database() \gset
|
||||||
CREATE TABLE test_table(data int) USING columnar;
|
CREATE TABLE test_table(data int) USING columnar;
|
||||||
\c :datname
|
\c :datname
|
||||||
|
|
|
@ -37,15 +37,15 @@ SELECT current_database() datname \gset
|
||||||
|
|
||||||
CREATE DATABASE db_to_drop;
|
CREATE DATABASE db_to_drop;
|
||||||
\c db_to_drop
|
\c db_to_drop
|
||||||
CREATE EXTENSION citus;
|
CREATE EXTENSION citus_columnar;
|
||||||
SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database() \gset
|
SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database() \gset
|
||||||
|
|
||||||
CREATE TABLE test_table(data int) USING columnar;
|
CREATE TABLE test_table(data int) USING columnar;
|
||||||
|
|
||||||
DROP EXTENSION citus CASCADE;
|
DROP EXTENSION citus_columnar CASCADE;
|
||||||
|
|
||||||
-- test database drop
|
-- test database drop
|
||||||
CREATE EXTENSION citus;
|
CREATE EXTENSION citus_columnar;
|
||||||
SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database() \gset
|
SELECT oid::text databaseoid FROM pg_database WHERE datname = current_database() \gset
|
||||||
|
|
||||||
CREATE TABLE test_table(data int) USING columnar;
|
CREATE TABLE test_table(data int) USING columnar;
|
||||||
|
|
Loading…
Reference in New Issue