external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove shadowed variables

merge-cstore-pykello
Hadi Moshayedi 2020-10-08 11:03:07 -07:00
parent 9b9b9e2cf0
commit 92e1603443
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -25,7 +25,7 @@ else
$(error version $(VER) is not supported) $(error version $(VER) is not supported)
endif endif
PG_CPPFLAGS = -std=c11 PG_CPPFLAGS = -std=c11 -Wshadow
OBJS = cstore.o cstore_writer.o cstore_reader.o \ OBJS = cstore.o cstore_writer.o cstore_reader.o \
cstore_compression.o mod.o cstore_metadata_tables.o cstore_compression.o mod.o cstore_metadata_tables.o

7
cstore_reader.c
View File

@ -179,7 +179,6 @@ CStoreReadNextRow(TableReadState *readState, Datum *columnValues, bool *columnNu
uint32 lastBlockIndex = 0; uint32 lastBlockIndex = 0;
uint32 blockRowCount = 0; uint32 blockRowCount = 0;
uint32 stripeRowCount = 0; uint32 stripeRowCount = 0;
StripeMetadata *stripeMetadata = readState->currentStripeMetadata;
stripeRowCount = stripeMetadata->rowCount; stripeRowCount = stripeMetadata->rowCount;
lastBlockIndex = stripeRowCount / stripeMetadata->blockRowCount; lastBlockIndex = stripeRowCount / stripeMetadata->blockRowCount;
@ -995,10 +994,10 @@ ColumnDefaultValue(TupleConstr *tupleConstraints, Form_pg_attribute attributeFor
for (defValIndex = 0; defValIndex < tupleConstraints->num_defval; defValIndex++) for (defValIndex = 0; defValIndex < tupleConstraints->num_defval; defValIndex++)
{ {
AttrDefault defaultValue = tupleConstraints->defval[defValIndex]; AttrDefault attrDefault = tupleConstraints->defval[defValIndex];
if (defaultValue.adnum == attributeForm->attnum) if (attrDefault.adnum == attributeForm->attnum)
{ {
defaultValueNode = stringToNode(defaultValue.adbin); defaultValueNode = stringToNode(attrDefault.adbin);
break; break;
} }
} }

3
cstore_writer.c
View File

@ -386,7 +386,7 @@ WriteToSmgr(TableWriteState *writeState, char *data, uint32 dataLength)
while (addr.blockno >= nblocks) while (addr.blockno >= nblocks)
{ {
Buffer buffer = ReadBuffer(rel, P_NEW); buffer = ReadBuffer(rel, P_NEW);
ReleaseBuffer(buffer); ReleaseBuffer(buffer);
nblocks = smgrnblocks(rel->rd_smgr, MAIN_FORKNUM); nblocks = smgrnblocks(rel->rd_smgr, MAIN_FORKNUM);
} }
@ -534,7 +534,6 @@ FlushStripe(TableWriteState *writeState)
for (columnIndex = 0; columnIndex < columnCount; columnIndex++) for (columnIndex = 0; columnIndex < columnCount; columnIndex++)
{ {
ColumnBuffers *columnBuffers = stripeBuffers->columnBuffersArray[columnIndex]; ColumnBuffers *columnBuffers = stripeBuffers->columnBuffersArray[columnIndex];
uint32 blockIndex = 0;
for (blockIndex = 0; blockIndex < stripeSkipList->blockCount; blockIndex++) for (blockIndex = 0; blockIndex < stripeSkipList->blockCount; blockIndex++)
{ {