Merge pull request #922 from yuanyl630/IVORY_REL_5_STABLE

gaoxueyu · web-flow · commit c53c1c4bf76e · 2025-10-17T15:17:30.000+08:00
refactor rowid codes
diff --git a/contrib/ivorysql_ora/preload_ora_misc.sql b/contrib/ivorysql_ora/preload_ora_misc.sql
@@ -6,7 +6,9 @@ insert into dual values('X');
 GRANT SELECT ON dual TO PUBLIC;
 
 --
--- ROWID type
+-- Oracle-compatible ROWID and UROWID types
+-- ROWID: Composite type containing row object ID and row number
+-- UROWID: Universal ROWID, compatible with ROWID
 --
 CREATE TYPE sys.rowid AS(rowoid OID, rowno bigint);
 CREATE TYPE sys.urowid AS(rowoid OID, rowno bigint);
diff --git a/contrib/tablefunc/expected/ivy_tablefunc.out b/contrib/tablefunc/expected/ivy_tablefunc.out
@@ -14,6 +14,7 @@ SELECT avg(normal_rand)::int, count(*) FROM normal_rand(-1, 250, 0.2);
 ERROR:  number of rows cannot be negative
 --
 -- crosstab()
+-- Use 'orarowid' instead of 'rowid' to avoid conflict with system column
 --
 CREATE TABLE ct(id int, rowclass text, orarowid text, attribute text, val text);
 \copy ct from 'data/ct.data'
diff --git a/contrib/tablefunc/sql/ivy_tablefunc.sql b/contrib/tablefunc/sql/ivy_tablefunc.sql
@@ -10,6 +10,7 @@ SELECT avg(normal_rand)::int, count(*) FROM normal_rand(-1, 250, 0.2);
 
 --
 -- crosstab()
+-- Use 'orarowid' instead of 'rowid' to avoid conflict with system column
 --
 CREATE TABLE ct(id int, rowclass text, orarowid text, attribute text, val text);
 \copy ct from 'data/ct.data'
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
@@ -228,7 +228,9 @@ static const FormData_pg_attribute a6 = {
 };
 
 /*
- * Compatible Oracle ROWID pseudo column.
+ * Oracle-compatible ROWID pseudo-column.
+ * This system column provides a unique identifier for each row,
+ * compatible with Oracle's ROWID functionality.
  */
 static const FormData_pg_attribute a7 = {
    .attname = {"rowid"},
diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
@@ -68,7 +68,7 @@
 #include "utils/ruleutils.h"
 #include "utils/syscache.h"
 #include "utils/typcache.h"
-#include <math.h> 
+#include <math.h>
 #include "utils/guc.h"
 #include "utils/ora_compatible.h"
 
@@ -280,10 +280,12 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString)
 	if (cxt.inhRelations)
 	{
 		ListCell   *inher;
+
 		foreach(inher, cxt.inhRelations)
 		{
 			RangeVar   *inh = lfirst_node(RangeVar, inher);
 			Relation	prel;
+
 			prel = table_openrv(inh, AccessShareLock);
 			cxt.hasrowid = cxt.hasrowid || prel->rd_rel->relhasrowid;
 			table_close(prel, NoLock);
@@ -302,7 +304,8 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString)
 		{
 			case T_ColumnDef:
 				{
-					ColumnDef *col = (ColumnDef *) element;
+					ColumnDef  *col = (ColumnDef *) element;
+
 					if (compatible_db == ORA_PARSER && strcmp(col->colname, "rowid") == 0)
 						elog(ERROR, "column name \"%s\" conflicts with a system column name", col->colname);
 					else
@@ -331,13 +334,14 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString)
 	 */
 	foreach(elements, cxt.columns)
 	{
-		ColumnDef          *element = lfirst(elements);
-		if(element->identity == ATTRIBUTE_IDENTITY_DEFAULT_ON_NULL ||
-				element->identity == ATTRIBUTE_ORA_IDENTITY_ALWAYS ||
-					element->identity == ATTRIBUTE_ORA_IDENTITY_BY_DEFAULT)
+		ColumnDef  *element = lfirst(elements);
+
+		if (element->identity == ATTRIBUTE_IDENTITY_DEFAULT_ON_NULL ||
+			element->identity == ATTRIBUTE_ORA_IDENTITY_ALWAYS ||
+			element->identity == ATTRIBUTE_ORA_IDENTITY_BY_DEFAULT)
 			ora_identity_cnt++;
 	}
-	if(ora_identity_cnt > 1)
+	if (ora_identity_cnt > 1)
 		elog(ERROR, "table can have only one identity column");
 
 	if (like_found && cxt.hasrowid)
@@ -348,7 +352,7 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString)
 
 	if (cxt.hasrowid)
 	{
-		Oid	   snamespaceid;
+		Oid			snamespaceid;
 		char	   *snamespace;
 		char	   *sname;
 
@@ -368,47 +372,48 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString)
 								   false);
 
 		/*
-		 * Build a CREATE SEQUENCE command to create the sequence object,
-		 * and add it to the list of things to be done before this CREATE/ALTER TABLE
+		 * Build a CREATE SEQUENCE command to create the sequence object, and
+		 * add it to the list of things to be done before this CREATE/ALTER
+		 * TABLE
 		 */
 		seqstmt = makeNode(CreateSeqStmt);
 		seqstmt->with_rowid = true;
 		seqstmt->sequence = makeRangeVar(snamespace, sname, -1);
 		seqstmt->options = lcons(makeDefElem("as",
-					 	(Node *) makeTypeNameFromOid(INT8OID, -1),
-						 -1),
-					 seqstmt->options);
+											 (Node *) makeTypeNameFromOid(INT8OID, -1),
+											 -1),
+								 seqstmt->options);
 		if (rowid_seq_cache > 1)
 		{
 			seqstmt->options = lcons(makeDefElem("cache",
-							 (Node *) makeInteger(rowid_seq_cache),
-							 -1),
-						 seqstmt->options);
+												 (Node *) makeInteger(rowid_seq_cache),
+												 -1),
+									 seqstmt->options);
 		}
 		else
 			seqstmt->options = lcons(makeDefElem("nocache",
-								 NULL,
-							 -1),
-						seqstmt->options);
+												 NULL,
+												 -1),
+									 seqstmt->options);
 
 		if (cxt.rel)
 			seqstmt->ownerId = cxt.rel->rd_rel->relowner;
 
 		cxt.blist = lappend(cxt.blist, seqstmt);
 
 		/*
-		 * Build an ALTER SEQUENCE ... OWNED BY command to mark the sequence as owned
-		 * by this table.
+		 * Build an ALTER SEQUENCE ... OWNED BY command to mark the sequence
+		 * as owned by this table.
 		 */
 		altseqstmt = makeNode(AlterSeqStmt);
 		altseqstmt->sequence = makeRangeVar(snamespace, sname, -1);
 
 		relnamelist = list_make3(makeString(snamespace),
-					 makeString(cxt.relation->relname),
-					 makeString(sname));
+								 makeString(cxt.relation->relname),
+								 makeString(sname));
 
 		altseqstmt->options = list_make1(makeDefElem("owned_by",
-								 (Node *) relnamelist, -1));
+													 (Node *) relnamelist, -1));
 		cxt.alist = lappend(cxt.alist, altseqstmt);
 	}
 
@@ -971,11 +976,14 @@ transformColumnDefinition(CreateStmtContext *cxt, ColumnDef *column)
 					ctype = typenameType(cxt->pstate, column->typeName, &typmod);
 					typeOid = ((Form_pg_type) GETSTRUCT(ctype))->oid;
 
-					/* Convert compatible identity smallint/int type column to bigint type */
+					/*
+					 * Convert compatible identity smallint/int type column to
+					 * bigint type
+					 */
 					if ((constraint->generated_when == ATTRIBUTE_IDENTITY_DEFAULT_ON_NULL
-							|| constraint->generated_when == ATTRIBUTE_ORA_IDENTITY_ALWAYS
-								|| constraint->generated_when == ATTRIBUTE_ORA_IDENTITY_BY_DEFAULT)
-									&& (typeOid == INT4OID || typeOid == INT2OID))
+						 || constraint->generated_when == ATTRIBUTE_ORA_IDENTITY_ALWAYS
+						 || constraint->generated_when == ATTRIBUTE_ORA_IDENTITY_BY_DEFAULT)
+						&& (typeOid == INT4OID || typeOid == INT2OID))
 					{
 						column->typeName = makeTypeName("int8");
 						typeOid = INT8OID;
@@ -1296,7 +1304,7 @@ transformTableLikeClause(CreateStmtContext *cxt, TableLikeClause *table_like_cla
 	if (relation->rd_rel->relkind == RELKIND_COMPOSITE_TYPE)
 	{
 		aclresult = object_aclcheck(TypeRelationId, relation->rd_rel->reltype, GetUserId(),
-									 ACL_USAGE);
+									ACL_USAGE);
 		if (aclresult != ACLCHECK_OK)
 			aclcheck_error(aclresult, OBJECT_TYPE,
 						   RelationGetRelationName(relation));
@@ -2689,7 +2697,7 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
 				 * mentioned above.
 				 */
 				Datum		attoptions =
-				get_attoptions(RelationGetRelid(index_rel), i + 1);
+					get_attoptions(RelationGetRelid(index_rel), i + 1);
 
 				defopclass = GetDefaultOpClass(attform->atttypid,
 											   index_rel->rd_rel->relam);
@@ -3764,12 +3772,12 @@ transformAlterTableStmt(Oid relid, AlterTableStmt *stmt,
 
 			case AT_AddRowidsRecurse:
 				{
-					Oid 			snamespaceid;
-					char	 		*snamespace;
-					char	 		*sname;
-					List 	 		*relnamelist;
-					CreateSeqStmt 	*seqstmt;
-					AlterSeqStmt 	*altseqstmt;
+					Oid			snamespaceid;
+					char	   *snamespace;
+					char	   *sname;
+					List	   *relnamelist;
+					CreateSeqStmt *seqstmt;
+					AlterSeqStmt *altseqstmt;
 
 					if (cmd->is_rowid)
 					{
@@ -3789,45 +3797,46 @@ transformAlterTableStmt(Oid relid, AlterTableStmt *stmt,
 												   false);
 
 						/*
-						 * Build a CREATE SEQUENCE command to create the sequence object,
-						 * and add it to the list of things to be done before this CREATE/ALTER TABLE
+						 * Build a CREATE SEQUENCE command to create the
+						 * sequence object, and add it to the list of things
+						 * to be done before this CREATE/ALTER TABLE
 						 */
 						seqstmt = makeNode(CreateSeqStmt);
 						seqstmt->with_rowid = true;
 						seqstmt->sequence = makeRangeVar(snamespace, sname, -1);
 						seqstmt->options = lcons(makeDefElem("as",
-									 (Node *) makeTypeNameFromOid(INT8OID, -1),
-										 -1), seqstmt->options);
+															 (Node *) makeTypeNameFromOid(INT8OID, -1),
+															 -1), seqstmt->options);
 						if (rowid_seq_cache > 1)
 						{
 							seqstmt->options = lcons(makeDefElem("cache",
-									 (Node *) makeInteger(rowid_seq_cache),
-										 -1), seqstmt->options);
+																 (Node *) makeInteger(rowid_seq_cache),
+																 -1), seqstmt->options);
 						}
 						else
 							seqstmt->options = lcons(makeDefElem("nocache",
-										 NULL,
-										 -1),
-										seqstmt->options);
+																 NULL,
+																 -1),
+													 seqstmt->options);
 
 						if (cxt.rel)
 							seqstmt->ownerId = cxt.rel->rd_rel->relowner;
 
 						cxt.blist = lappend(cxt.blist, seqstmt);
 
 						/*
-						 * Build an ALTER SEQUENCE ... OWNED BY command to mark the sequence as owned
-						 * by this table.
+						 * Build an ALTER SEQUENCE ... OWNED BY command to
+						 * mark the sequence as owned by this table.
 						 */
 						altseqstmt = makeNode(AlterSeqStmt);
 						altseqstmt->sequence = makeRangeVar(snamespace, sname, -1);
 
 						relnamelist = list_make3(makeString(snamespace),
-									 makeString(cxt.relation->relname),
-									 makeString(sname));
+												 makeString(cxt.relation->relname),
+												 makeString(sname));
 
 						altseqstmt->options = list_make1(makeDefElem("owned_by",
-										 (Node *) relnamelist, -1));
+																	 (Node *) relnamelist, -1));
 						cxt.alist = lappend(cxt.alist, altseqstmt);
 
 						newcmds = lappend(newcmds, cmd);
@@ -4669,7 +4678,7 @@ transformPartitionRangeBounds(ParseState *pstate, List *blist,
 		 * as ColumnRefs.
 		 */
 		if (IsA(expr, ColumnRef) ||
-				IsA(expr, ColumnRefOrFuncCall))
+			IsA(expr, ColumnRefOrFuncCall))
 		{
 			ColumnRef  *cref = NULL;
 			char	   *cname = NULL;
diff --git a/src/backend/utils/misc/ivy_guc.c b/src/backend/utils/misc/ivy_guc.c
@@ -183,9 +183,19 @@ static struct config_bool Ivy_ConfigureNamesBool[] =
 		NULL, NULL, NULL
 	},
 
+	/*
+ 	 * ivorysql.default_with_rowids
+	 *
+	 * When enabled, all newly created tables will automatically include
+	 * an Oracle-compatible ROWID pseudo-column. This provides compatibility
+	 * with Oracle applications that rely on ROWID for row identification.
+	 *
+	 * Default: off
+	 * Context: USERSET (can be changed by any user)
+ 	 */
 	{
 		{"ivorysql.default_with_rowids", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Auto add rowid column for create new table."),
+			gettext_noop("Automatically add rowid column when creating new tables."),
 			NULL,
 			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
 		},
diff --git a/src/include/access/htup_details.h b/src/include/access/htup_details.h
@@ -190,7 +190,7 @@ struct HeapTupleHeaderData
 #define HEAP_HASNULL			0x0001	/* has null attribute(s) */
 #define HEAP_HASVARWIDTH		0x0002	/* has variable-width attribute(s) */
 #define HEAP_HASEXTERNAL		0x0004	/* has external stored attribute(s) */
-#define HEAP_HASROWID			0x0008	/* has an ROWID field */
+#define HEAP_HASROWID			0x0008	/* has a ROWID field */
 #define HEAP_XMAX_KEYSHR_LOCK	0x0010	/* xmax is a key-shared locker */
 #define HEAP_COMBOCID			0x0020	/* t_cid is a combo CID */
 #define HEAP_XMAX_EXCL_LOCK		0x0040	/* xmax is exclusive locker */
diff --git a/src/oracle_test/regress/sql/ora_rowid.sql b/src/oracle_test/regress/sql/ora_rowid.sql
@@ -1,5 +1,5 @@
 --
--- Test Compatible Oracle ROWID pseudo
+-- Test Oracle-Compatible ROWID Pseudo-Column
 --
 
 --
@@ -111,12 +111,12 @@ alter table t2 set without rowid;
 
 select (rowid).rowno, * from t2;
 
--- clearup
+-- cleanup
 drop table t2;
 drop table t3;
 
 --
---3, CTEATE TABLE ... WITH ROWID 
+--3, CREATE TABLE ... WITH ROWID
 --
 create table t2 (a int, b int) with rowid;
 
