cleanup

alubennikova · alubennikova · commit 773358e396da · 2016-04-11T20:05:19.000+03:00
diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml
@@ -151,7 +151,7 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
         benefit from <firstterm>index-only scans</> by including certain
         columns in the index, the value of which would otherwise have to be
         obtained by reading the table's heap. Having these columns in the
-        <literal>INCLUDING</> clause in some cases allows 
+        <literal>INCLUDING</> clause in some cases allows
         <productname>PostgreSQL</> to skip the heap read completely. This
         also allows <literal>UNIQUE</> indexes to be defined on one set of
         columns, which can include another set of column in the
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
@@ -499,6 +499,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
       primary key constraint defined for the table.  (Otherwise it
       would just be the same constraint listed twice.)
      </para>
+
      <para>
       Adding a unique constraint will automatically create a unique btree
       index on the column or group of columns used in the constraint.
@@ -510,13 +511,16 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
       See paragraph about <literal>INCLUDING</literal> in
       <xref linkend="SQL-CREATEINDEX"> for more information.
      </para>
+
     </listitem>
    </varlistentry>
 
    <varlistentry>
     <term><literal>PRIMARY KEY</> (column constraint)</term>
     <term><literal>PRIMARY KEY ( <replaceable class="PARAMETER">column_name</replaceable> [, ... ] )
-    <optional>INCLUDING ( <replaceable class="PARAMETER">column_name</replaceable> [, ...])</optional></> (table constraint)</term>    <listitem>
+    <optional>INCLUDING ( <replaceable class="PARAMETER">column_name</replaceable> [, ...])</optional></> (table constraint)</term>
+
+    <listitem>
      <para>
       The <literal>PRIMARY KEY</> constraint specifies that a column or
       columns of a table can contain only unique (non-duplicate), nonnull
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
@@ -471,6 +471,5 @@ index_truncate_tuple(Relation idxrel, IndexTuple olditup)
 	itupdesc->natts = indnatts;
 
 	Assert(IndexTupleSize(newitup) <= IndexTupleSize(olditup));
-
 	return newitup;
 }
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
@@ -247,36 +247,33 @@ BuildIndexValueDescription(Relation indexRelation,
 	appendStringInfo(&buf, "(%s)=(",
 					 pg_get_indexdef_columns(indexrelid, true));
 
-	for (i = 0; i < indnkeyatts; i++)
-	{
-		char	   *val;
-
-		if (isnull[i])
-			val = "null";
-		else
-		{
-			Oid			foutoid;
-			bool		typisvarlena;
-			/*
-			 * The provided data is not necessarily of the type stored in the
-			 * index; rather it is of the index opclass's input type. So look
-			 * at rd_opcintype not the index tupdesc.
-			 *
-			 * Note: this is a bit shaky for opclasses that have pseudotype
-			 * input types such as ANYARRAY or RECORD.  Currently, the
-			 * typoutput functions associated with the pseudotypes will work
-			 * okay, but we might have to try harder in future.
-			 */
-			getTypeOutputInfo(indexRelation->rd_opcintype[i],
-							&foutoid, &typisvarlena);
-			val = OidOutputFunctionCall(foutoid, values[i]);
-		}
+	char	   *val;
 
-		if (i > 0)
-			appendStringInfoString(&buf, ", ");
-		appendStringInfoString(&buf, val);
+	if (isnull[i])
+		val = "null";
+	else
+	{
+		Oid			foutoid;
+		bool		typisvarlena;
+		/*
+			* The provided data is not necessarily of the type stored in the
+			* index; rather it is of the index opclass's input type. So look
+			* at rd_opcintype not the index tupdesc.
+			*
+			* Note: this is a bit shaky for opclasses that have pseudotype
+			* input types such as ANYARRAY or RECORD.  Currently, the
+			* typoutput functions associated with the pseudotypes will work
+			* okay, but we might have to try harder in future.
+			*/
+		getTypeOutputInfo(indexRelation->rd_opcintype[i],
+						&foutoid, &typisvarlena);
+		val = OidOutputFunctionCall(foutoid, values[i]);
 	}
 
+	if (i > 0)
+		appendStringInfoString(&buf, ", ");
+	appendStringInfoString(&buf, val);
+
 	appendStringInfoChar(&buf, ')');
 
 	return buf.data;
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
@@ -628,25 +628,19 @@ _bt_buildadd(BTWriteState *wstate, BTPageState *state, IndexTuple itup)
 		 * Truncate the tuple that we're going to insert
 		 * into the parent page as a downlink
 		 */
-		if (indnkeyatts < indnatts && P_ISLEAF(pageop))
-			state->btps_minkey = index_truncate_tuple(wstate->index, itup);
-		else
-			state->btps_minkey = CopyIndexTuple(itup);	}
-
-	/* Truncate nonkey attributes when inserting on nonleaf pages */
-	if (wstate->index->rd_index->indnatts
-		!= wstate->index->rd_index->indnkeyatts)
-	{
-		BTPageOpaque pageop = (BTPageOpaque) PageGetSpecialPointer(npage);
-
-		if (!P_ISLEAF(pageop))
+		if (indnkeyatts != indnatts && P_ISLEAF(pageop))
 		{
-			itup = index_truncate_tuple(wstate->index, itup);
+			state->btps_minkey = index_truncate_tuple(wstate->index, itup);
 			itupsz = IndexTupleDSize(*itup);
 			itupsz = MAXALIGN(itupsz);
 		}
+		else
+			state->btps_minkey = CopyIndexTuple(itup);
 	}
 
+
+
+
 	/*
 	 * Add the new item into the current page.
 	 */

Original file line number	Diff line number	Diff line change
`@@ -471,6 +471,5 @@ index_truncate_tuple(Relation idxrel, IndexTuple olditup)`
`471`	`471`	`itupdesc->natts = indnatts;`
`472`	`472`
`473`	`473`	`Assert(IndexTupleSize(newitup) <= IndexTupleSize(olditup));`
`474`		`-`
`475`	`474`	`return newitup;`
`476`	`475`	`}`