commit 891c03c4b8f37cf6711d6ae84f4e75573c123ec8 Author: Anastasia Date: Mon Dec 23 19:52:22 2019 +0300 v4-Opclass-bitwise-equality-0001.patch Add new infrastracture to mark opclass as BITWISE. Actual values of this parameter will be added in the following patch. diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.out index c915885..9b5c33b 100644 --- a/contrib/postgres_fdw/expected/postgres_fdw.out +++ b/contrib/postgres_fdw/expected/postgres_fdw.out @@ -3111,7 +3111,7 @@ create operator public.>^ ( create operator family my_op_family using btree; create function my_op_cmp(a int, b int) returns int as $$begin return btint4cmp(a, b); end $$ language plpgsql; -create operator class my_op_class for type int using btree family my_op_family as +create operator class my_op_class bitwise for type int using btree family my_op_family as operator 1 public.<^, operator 3 public.=^, operator 5 public.>^, diff --git a/contrib/postgres_fdw/sql/postgres_fdw.sql b/contrib/postgres_fdw/sql/postgres_fdw.sql index 4f29e7c..48263d6 100644 --- a/contrib/postgres_fdw/sql/postgres_fdw.sql +++ b/contrib/postgres_fdw/sql/postgres_fdw.sql @@ -825,7 +825,7 @@ create operator family my_op_family using btree; create function my_op_cmp(a int, b int) returns int as $$begin return btint4cmp(a, b); end $$ language plpgsql; -create operator class my_op_class for type int using btree family my_op_family as +create operator class my_op_class bitwise for type int using btree family my_op_family as operator 1 public.<^, operator 3 public.=^, operator 5 public.>^, diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml index 55694c4..87cc344 100644 --- a/doc/src/sgml/catalogs.sgml +++ b/doc/src/sgml/catalogs.sgml @@ -4544,6 +4544,13 @@ SCRAM-SHA-256$<iteration count>:&l Type of data stored in index, or zero if same as opcintype + + opcisbitwise + bool + + True if the operator class equality is the same as equivalence + + diff --git a/doc/src/sgml/ref/create_opclass.sgml b/doc/src/sgml/ref/create_opclass.sgml index dd5252f..8d0ddfc 100644 --- a/doc/src/sgml/ref/create_opclass.sgml +++ b/doc/src/sgml/ref/create_opclass.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation -CREATE OPERATOR CLASS name [ DEFAULT ] FOR TYPE data_type +CREATE OPERATOR CLASS name [ DEFAULT | BITWISE ] FOR TYPE data_type USING index_method [ FAMILY family_name ] AS { OPERATOR strategy_number operator_name [ ( op_type, op_type ) ] [ FOR SEARCH | FOR ORDER BY sort_family_name ] | FUNCTION support_number [ ( op_type [ , op_type ] ) ] function_name ( argument_type [, ...] ) @@ -106,6 +106,20 @@ CREATE OPERATOR CLASS name [ DEFAUL + + BITWISE + + + If present, the operator class equality is the same as equivalence. + For example, two integers that compare equal are also binary equal, + while, numerics can compare equal but have different scales, + thus numeric opclass is not BITWISE. Even though, + most opclasses implement bitwise equal comparison, this behaviour + must be set explicitly. + + + + data_type diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c index cb7a6bd..c0fe187 100644 --- a/src/backend/commands/opclasscmds.c +++ b/src/backend/commands/opclasscmds.c @@ -653,6 +653,7 @@ DefineOpClass(CreateOpClassStmt *stmt) values[Anum_pg_opclass_opcintype - 1] = ObjectIdGetDatum(typeoid); values[Anum_pg_opclass_opcdefault - 1] = BoolGetDatum(stmt->isDefault); values[Anum_pg_opclass_opckeytype - 1] = ObjectIdGetDatum(storageoid); + values[Anum_pg_opclass_opcisbitwise - 1] = BoolGetDatum(stmt->isBitwise); tup = heap_form_tuple(rel->rd_att, values, nulls); diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index a9b8b84..73b076dd 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -3790,6 +3790,7 @@ _copyCreateOpClassStmt(const CreateOpClassStmt *from) COPY_NODE_FIELD(datatype); COPY_NODE_FIELD(items); COPY_SCALAR_FIELD(isDefault); + COPY_SCALAR_FIELD(isBitwise); return newnode; } diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c index 2fcd4a3..8f4ece4 100644 --- a/src/backend/nodes/equalfuncs.c +++ b/src/backend/nodes/equalfuncs.c @@ -1609,6 +1609,7 @@ _equalCreateOpClassStmt(const CreateOpClassStmt *a, const CreateOpClassStmt *b) COMPARE_NODE_FIELD(datatype); COMPARE_NODE_FIELD(items); COMPARE_SCALAR_FIELD(isDefault); + COMPARE_SCALAR_FIELD(isBitwise); return true; } diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index c508684..683f9b4 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -447,7 +447,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query); %type opt_instead %type opt_unique opt_concurrently opt_verbose opt_full -%type opt_freeze opt_analyze opt_default opt_recheck +%type opt_freeze opt_analyze opt_default opt_recheck opt_bitwise %type opt_binary copy_delimiter %type copy_from opt_program @@ -618,7 +618,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query); AGGREGATE ALL ALSO ALTER ALWAYS ANALYSE ANALYZE AND ANY ARRAY AS ASC ASSERTION ASSIGNMENT ASYMMETRIC AT ATTACH ATTRIBUTE AUTHORIZATION - BACKWARD BEFORE BEGIN_P BETWEEN BIGINT BINARY BIT + BACKWARD BEFORE BEGIN_P BETWEEN BIGINT BINARY BIT BITWISE BOOLEAN_P BOTH BY CACHE CALL CALLED CASCADE CASCADED CASE CAST CATALOG_P CHAIN CHAR_P @@ -5953,16 +5953,17 @@ opt_if_not_exists: IF_P NOT EXISTS { $$ = true; } *****************************************************************************/ CreateOpClassStmt: - CREATE OPERATOR CLASS any_name opt_default FOR TYPE_P Typename + CREATE OPERATOR CLASS any_name opt_default opt_bitwise FOR TYPE_P Typename USING access_method opt_opfamily AS opclass_item_list { CreateOpClassStmt *n = makeNode(CreateOpClassStmt); n->opclassname = $4; n->isDefault = $5; - n->datatype = $8; - n->amname = $10; - n->opfamilyname = $11; - n->items = $13; + n->isBitwise = $6; + n->datatype = $9; + n->amname = $11; + n->opfamilyname = $12; + n->items = $14; $$ = (Node *) n; } ; @@ -6025,6 +6026,10 @@ opt_default: DEFAULT { $$ = true; } | /*EMPTY*/ { $$ = false; } ; +opt_bitwise: BITWISE { $$ = true; } + | /*EMPTY*/ { $$ = false; } + ; + opt_opfamily: FAMILY any_name { $$ = $2; } | /*EMPTY*/ { $$ = NIL; } ; @@ -15129,6 +15134,7 @@ unreserved_keyword: | BACKWARD | BEFORE | BEGIN_P + | BITWISE | BY | CACHE | CALL diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 08658c8..00e248b 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -12833,6 +12833,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo) int i_opcintype; int i_opckeytype; int i_opcdefault; + int i_opcisbitwise; int i_opcfamily; int i_opcfamilyname; int i_opcfamilynsp; @@ -12849,6 +12850,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo) char *opcintype; char *opckeytype; char *opcdefault; + char *opcisbitwise; char *opcfamily; char *opcfamilyname; char *opcfamilynsp; @@ -12875,11 +12877,25 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo) nameusing = createPQExpBuffer(); /* Get additional fields from the pg_opclass row */ - if (fout->remoteVersion >= 80300) + if (fout->remoteVersion >= 13000) + { + appendPQExpBuffer(query, "SELECT opcintype::pg_catalog.regtype, " + "opckeytype::pg_catalog.regtype, " + "opcdefault, opcisbitwise, opcfamily, " + "opfname AS opcfamilyname, " + "nspname AS opcfamilynsp, " + "(SELECT amname FROM pg_catalog.pg_am WHERE oid = opcmethod) AS amname " + "FROM pg_catalog.pg_opclass c " + "LEFT JOIN pg_catalog.pg_opfamily f ON f.oid = opcfamily " + "LEFT JOIN pg_catalog.pg_namespace n ON n.oid = opfnamespace " + "WHERE c.oid = '%u'::pg_catalog.oid", + opcinfo->dobj.catId.oid); + } + else if (fout->remoteVersion >= 80300) { appendPQExpBuffer(query, "SELECT opcintype::pg_catalog.regtype, " "opckeytype::pg_catalog.regtype, " - "opcdefault, opcfamily, " + "opcdefault, 'f' as opcisbitwise, opcfamily, " "opfname AS opcfamilyname, " "nspname AS opcfamilynsp, " "(SELECT amname FROM pg_catalog.pg_am WHERE oid = opcmethod) AS amname " @@ -12893,7 +12909,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo) { appendPQExpBuffer(query, "SELECT opcintype::pg_catalog.regtype, " "opckeytype::pg_catalog.regtype, " - "opcdefault, NULL AS opcfamily, " + "opcdefault, 'f' as opcisbitwise, NULL AS opcfamily, " "NULL AS opcfamilyname, " "NULL AS opcfamilynsp, " "(SELECT amname FROM pg_catalog.pg_am WHERE oid = opcamid) AS amname " @@ -12907,6 +12923,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo) i_opcintype = PQfnumber(res, "opcintype"); i_opckeytype = PQfnumber(res, "opckeytype"); i_opcdefault = PQfnumber(res, "opcdefault"); + i_opcisbitwise = PQfnumber(res, "opcisbitwise"); i_opcfamily = PQfnumber(res, "opcfamily"); i_opcfamilyname = PQfnumber(res, "opcfamilyname"); i_opcfamilynsp = PQfnumber(res, "opcfamilynsp"); @@ -12916,6 +12933,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo) opcintype = pg_strdup(PQgetvalue(res, 0, i_opcintype)); opckeytype = PQgetvalue(res, 0, i_opckeytype); opcdefault = PQgetvalue(res, 0, i_opcdefault); + opcisbitwise = PQgetvalue(res, 0, i_opcisbitwise); /* opcfamily will still be needed after we PQclear res */ opcfamily = pg_strdup(PQgetvalue(res, 0, i_opcfamily)); opcfamilyname = PQgetvalue(res, 0, i_opcfamilyname); @@ -12933,6 +12951,8 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo) fmtQualifiedDumpable(opcinfo)); if (strcmp(opcdefault, "t") == 0) appendPQExpBufferStr(q, "DEFAULT "); + if (strcmp(opcisbitwise, "t") == 0) + appendPQExpBufferStr(q, "BITWISE "); appendPQExpBuffer(q, "FOR TYPE %s USING %s", opcintype, fmtId(amname)); diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h index 84853c1..9ab32b3 100644 --- a/src/include/catalog/pg_opclass.h +++ b/src/include/catalog/pg_opclass.h @@ -73,6 +73,9 @@ CATALOG(pg_opclass,2616,OperatorClassRelationId) /* type of data in index, or InvalidOid */ Oid opckeytype BKI_DEFAULT(0) BKI_LOOKUP(pg_type); + + /* T if opclass equality also means "bitwise equality" */ + bool opcisbitwise BKI_DEFAULT(f); } FormData_pg_opclass; /* ---------------- diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index ff626cb..47ad85f 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -2577,6 +2577,7 @@ typedef struct CreateOpClassStmt TypeName *datatype; /* datatype of indexed column */ List *items; /* List of CreateOpClassItem nodes */ bool isDefault; /* Should be marked as default for type? */ + bool isBitwise; /* Is opclass equality bitwise? */ } CreateOpClassStmt; #define OPCLASS_ITEM_OPERATOR 1 diff --git a/src/include/parser/kwlist.h b/src/include/parser/kwlist.h index 00ace84..d6a8e8f 100644 --- a/src/include/parser/kwlist.h +++ b/src/include/parser/kwlist.h @@ -58,6 +58,7 @@ PG_KEYWORD("between", BETWEEN, COL_NAME_KEYWORD) PG_KEYWORD("bigint", BIGINT, COL_NAME_KEYWORD) PG_KEYWORD("binary", BINARY, TYPE_FUNC_NAME_KEYWORD) PG_KEYWORD("bit", BIT, COL_NAME_KEYWORD) +PG_KEYWORD("bitwise", BITWISE, UNRESERVED_KEYWORD) PG_KEYWORD("boolean", BOOLEAN_P, COL_NAME_KEYWORD) PG_KEYWORD("both", BOTH, RESERVED_KEYWORD) PG_KEYWORD("by", BY, UNRESERVED_KEYWORD)