From 1cdc58722cdbd60f70a48c83d6ead45cebb3562d Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 2 Jun 2004 21:01:10 +0000
Subject: OK, here's the final version of ALTER TABLE ... SET WITHOUT CLUSTER.
 Has docs + regression test.

Christopher Kings-Lynne
---
 src/backend/commands/tablecmds.c | 22 ++++++++++++++++++++--
 src/backend/parser/gram.y        | 10 +++++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

(limited to 'src/backend')

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 431c4ac742a..71f5ad0c001 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.108 2004/05/26 04:41:12 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.109 2004/06/02 21:01:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -233,6 +233,7 @@ static void ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab);
 static void ATPostAlterTypeParse(char *cmd, List **wqueue);
 static void ATExecChangeOwner(Oid relationOid, int32 newOwnerSysId);
 static void ATExecClusterOn(Relation rel, const char *indexName);
+static void ATExecDropCluster(Relation rel);
 static int	ri_trigger_type(Oid tgfoid);
 static void update_ri_trigger_args(Oid relid,
 					   const char *oldname,
@@ -1922,8 +1923,9 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd,
 			pass = AT_PASS_MISC;
 			break;
 		case AT_ClusterOn:	/* CLUSTER ON */
+		case AT_DropCluster:	/* SET WITHOUT CLUSTER */
 			ATSimplePermissions(rel, false);
-			/* This command never recurses */
+			/* These commands never recurse */
 			/* No command-specific prep needed */
 			pass = AT_PASS_MISC;
 			break;
@@ -2083,6 +2085,9 @@ ATExecCmd(AlteredTableInfo *tab, Relation rel, AlterTableCmd *cmd)
 		case AT_ClusterOn:		/* CLUSTER ON */
 			ATExecClusterOn(rel, cmd->name);
 			break;
+		case AT_DropCluster:		/* SET WITHOUT CLUSTER */
+			ATExecDropCluster(rel);
+			break;
 		case AT_DropOids:		/* SET WITHOUT OIDS */
 			/*
 			 * Nothing to do here; we'll have generated a DropColumn subcommand
@@ -5044,6 +5049,19 @@ ATExecClusterOn(Relation rel, const char *indexName)
 	mark_index_clustered(rel, indexOid);
 }
 
+/*
+ * ALTER TABLE SET WITHOUT CLUSTER
+ *
+ * We have to find any indexes on the table that have indisclustered bit
+ * set and turn it off.
+ */
+static void
+ATExecDropCluster(Relation rel)
+{
+	mark_index_clustered(rel, InvalidOid);
+}
+
+
 /*
  * ALTER TABLE CREATE TOAST TABLE
  *
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 249c5907709..61a3bd477e6 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.459 2004/06/01 03:28:48 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.460 2004/06/02 21:01:09 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -1277,6 +1277,14 @@ alter_table_cmd:
 					n->name = $3;
 					$$ = (Node *)n;
 				}
+			/* ALTER TABLE <name> SET WITHOUT CLUSTER */ 
+			| SET WITHOUT CLUSTER
+				{
+					AlterTableCmd *n = makeNode(AlterTableCmd);
+					n->subtype = AT_DropCluster;
+					n->name = NULL;
+					$$ = (Node *)n;
+				}
 		;
 
 alter_column_default:
-- 
cgit v1.2.3