external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support operator class parameters in indexes 

(cherry picked from commit defb97b7f5)
pull/5568/head
Marco Slot 2021-10-20 17:02:24 +02:00 committed by Onur Tirtir
parent e19089503e
commit d695deae16
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/backend/distributed/deparser/citus_ruleutils.c
View File

@ -756,10 +756,15 @@ deparse_shard_index_statement(IndexStmt *origStmt, Oid distrelid, int64 shardid,
{ {
appendStringInfoString(buffer, "INCLUDE ("); appendStringInfoString(buffer, "INCLUDE (");
deparse_index_columns(buffer, indexStmt->indexIncludingParams, deparseContext); deparse_index_columns(buffer, indexStmt->indexIncludingParams, deparseContext);
appendStringInfoChar(buffer, ')'); appendStringInfoString(buffer, ") ");
} }
AppendStorageParametersToString(buffer, indexStmt->options); if (indexStmt->options != NIL)
{
appendStringInfoString(buffer, "WITH (");
AppendStorageParametersToString(buffer, indexStmt->options);
appendStringInfoString(buffer, ") ");
}
if (indexStmt->whereClause != NULL) if (indexStmt->whereClause != NULL)
{ {
@ -958,8 +963,9 @@ deparse_index_columns(StringInfo buffer, List *indexParameterList, List *deparse
/* Commit on postgres: 911e70207703799605f5a0e8aad9f06cff067c63*/ /* Commit on postgres: 911e70207703799605f5a0e8aad9f06cff067c63*/
if (indexElement->opclassopts != NIL) if (indexElement->opclassopts != NIL)
{ {
ereport(ERROR, errmsg( appendStringInfoString(buffer, "(");
"citus currently doesn't support operator class parameters in indexes")); AppendStorageParametersToString(buffer, indexElement->opclassopts);
appendStringInfoString(buffer, ") ");
} }
#endif #endif
@ -1091,13 +1097,6 @@ AppendStorageParametersToString(StringInfo stringBuffer, List *optionList)
ListCell *optionCell = NULL; ListCell *optionCell = NULL;
bool firstOptionPrinted = false; bool firstOptionPrinted = false;
if (optionList == NIL)
{
return;
}
appendStringInfo(stringBuffer, " WITH (");
foreach(optionCell, optionList) foreach(optionCell, optionList)
{ {
DefElem *option = (DefElem *) lfirst(optionCell); DefElem *option = (DefElem *) lfirst(optionCell);
@ -1114,8 +1113,6 @@ AppendStorageParametersToString(StringInfo stringBuffer, List *optionList)
quote_identifier(optionName), quote_identifier(optionName),
quote_literal_cstr(optionValue)); quote_literal_cstr(optionValue));
} }
appendStringInfo(stringBuffer, ")");
} }

3
src/test/regress/expected/pg13.out
View File

@ -169,9 +169,8 @@ SELECT create_distributed_table('test_table', 'a');
(1 row) (1 row)
-- we currently don't support this -- operator class options are supported
CREATE INDEX test_table_index ON test_table USING gist (b tsvector_ops(siglen = 100)); CREATE INDEX test_table_index ON test_table USING gist (b tsvector_ops(siglen = 100));
ERROR: citus currently doesn't support operator class parameters in indexes
-- testing WAL -- testing WAL
CREATE TABLE test_wal(a int, b int); CREATE TABLE test_wal(a int, b int);
-- test WAL without ANALYZE, this should raise an error -- test WAL without ANALYZE, this should raise an error

2
src/test/regress/sql/pg13.sql
View File

@ -94,7 +94,7 @@ SELECT create_distributed_table('my_table', 'a');
CREATE TABLE test_table(a int, b tsvector); CREATE TABLE test_table(a int, b tsvector);
SELECT create_distributed_table('test_table', 'a'); SELECT create_distributed_table('test_table', 'a');
-- we currently don't support this -- operator class options are supported
CREATE INDEX test_table_index ON test_table USING gist (b tsvector_ops(siglen = 100)); CREATE INDEX test_table_index ON test_table USING gist (b tsvector_ops(siglen = 100));
-- testing WAL -- testing WAL