Commitdb39866

committed

cleanup of cfs related files. TODO: more comments

1 parentff42c83 commitdb39866Copy full SHA for db39866

File tree

+147

-111

lines changed

+147

-111

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1227,11 +1227,11 @@ movedb(const char dbname, const char tblspcname)`
`1227`	`1227`	`/*`
`1228`	`1228`	`* Copy files from the old tablespace to the new one`
`1229`	`1229`	`*/`
`1230`		`-if (src_compressed ^dst_compressed) {`
	`1230`	`+if (src_compressed ^dst_compressed)`
`1231`	`1231`	`copyzipdir(src_dbpath,src_compressed,dst_dbpath,dst_compressed);`
`1232`		`-}else {`
	`1232`	`+else`
`1233`	`1233`	`copydir(src_dbpath,dst_dbpath, false);`
`1234`		`-}`
	`1234`	`+`
`1235`	`1235`
`1236`	`1236`	`/*`
`1237`	`1237`	`* Record the filesystem change in XLOG`

Lines changed: 11 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1062,21 +1062,26 @@ AlterTableSpaceOptions(AlterTableSpaceOptionsStmt *stmt)`
`1062`	`1062`	`/* If tablespace should be compressed */`
`1063`	`1063`	`compressed=getBoolOption(stmt->options,"compression", false);`
`1064`	`1064`
`1065`		`-if (compressed ^is_tablespace_compressed(tablespaceoid)) {`
	`1065`	`+if (compressed ^is_tablespace_compressed(tablespaceoid))`
	`1066`	`+{`
`1066`	`1067`	`char*tbsdir=psprintf("pg_tblspc/%u/%s",tablespaceoid,TABLESPACE_VERSION_DIRECTORY);`
`1067`		`-if (!directory_is_empty(tbsdir)) {`
	`1068`	`+`
	`1069`	`+if (!directory_is_empty(tbsdir))`
`1068`	`1070`	`ereport(ERROR,`
`1069`	`1071`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`1070`	`1072`	`errmsg("It is not possible to toggle compression option for tablespace")));`
`1071`		`-}else {`
	`1073`	`+else`
	`1074`	`+{`
`1072`	`1075`	`char*compressionFilePath=psprintf("%s/pg_compression",tbsdir);`
`1073`		`-if (compressed) {`
	`1076`	`+`
	`1077`	`+if (compressed)`
	`1078`	`+{`
`1074`	`1079`	`FILE*comp=fopen(compressionFilePath,"w");`
`1075`	`1080`	`fputs(cfs_algorithm(),comp);`
`1076`	`1081`	`fclose(comp);`
`1077`		`-}else {`
`1078`		`-unlink(compressionFilePath);`
`1079`	`1082`	`}`
	`1083`	`+else`
	`1084`	`+unlink(compressionFilePath);`
`1080`	`1085`	`}`
`1081`	`1086`	`}`
`1082`	`1087`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -807,6 +807,7 @@ static bool cfs_gc_file(char* map_path)`
`807`	`807`	`Assert(rc);`
`808`	`808`	`cfs_decrypt(block, (off_t)i*BLCKSZ,size);`
`809`	`809`	`res=cfs_decompress(decomressedBlock,BLCKSZ,block,size);`
	`810`	`+`
`810`	`811`	`if (res!=BLCKSZ)`
`811`	`812`	`{`
`812`	`813`	`pg_atomic_fetch_sub_u32(&map->lock,CFS_GC_LOCK);/* release lock */`

Comments

(0)