Commit180e339

committed

Push attcompression and attstorage handling into BuildDescForRelation()

1 parent04e4852 commit180e339Copy full SHA for 180e339

File tree

-6

lines changed

-6

lines changed

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -940,10 +940,6 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,`
`940`	`940`	`cookedDefaults = lappend(cookedDefaults, cooked);`
`941`	`941`	`attr->atthasdef = true;`
`942`	`942`	`}`
`943`		`-`
`944`		`-attr->attcompression = GetAttributeCompression(attr->atttypid, colDef->compression);`
`945`		`-if (colDef->storage_name)`
`946`		`-attr->attstorage = GetAttributeStorage(attr->atttypid, colDef->storage_name);`
`947`	`943`	`}`
`948`	`944`
`949`	`945`	`/*`
`@@ -1346,8 +1342,6 @@ BuildDescForRelation(const List *columns)`
`1346`	`1342`
`1347`	`1343`	`/* Override TupleDescInitEntry's settings as requested */`
`1348`	`1344`	`TupleDescInitEntryCollation(desc, attnum, attcollation);`
`1349`		`-if (entry->storage)`
`1350`		`-att->attstorage = entry->storage;`
`1351`	`1345`
`1352`	`1346`	`/* Fill in additional stuff not handled by TupleDescInitEntry */`
`1353`	`1347`	`att->attnotnull = entry->is_not_null;`
`@@ -1356,6 +1350,11 @@ BuildDescForRelation(const List *columns)`
`1356`	`1350`	`att->attinhcount = entry->inhcount;`
`1357`	`1351`	`att->attidentity = entry->identity;`
`1358`	`1352`	`att->attgenerated = entry->generated;`
	`1353`	`+att->attcompression = GetAttributeCompression(att->atttypid, entry->compression);`
	`1354`	`+if (entry->storage)`
	`1355`	`+att->attstorage = entry->storage;`
	`1356`	`+else if (entry->storage_name)`
	`1357`	`+att->attstorage = GetAttributeStorage(att->atttypid, entry->storage_name);`
`1359`	`1358`	`}`
`1360`	`1359`
`1361`	`1360`	`if (has_not_null)`

Comments

(0)