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

address feedback

merge-cstore-pykello
Hadi Moshayedi 2020-10-08 11:29:27 -07:00
parent 92e1603443
commit d1c7d9f09d
3 changed files with 4 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 -Wshadow PG_CFLAGS = -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

5
cstore_reader.c
View File

@ -988,7 +988,6 @@ DeserializeBlockData(StripeBuffers *stripeBuffers, uint64 blockIndex,
static Datum static Datum
ColumnDefaultValue(TupleConstr *tupleConstraints, Form_pg_attribute attributeForm) ColumnDefaultValue(TupleConstr *tupleConstraints, Form_pg_attribute attributeForm)
{ {
Datum defaultValue = 0;
Node *defaultValueNode = NULL; Node *defaultValueNode = NULL;
int defValIndex = 0; int defValIndex = 0;
@ -1009,7 +1008,7 @@ ColumnDefaultValue(TupleConstr *tupleConstraints, Form_pg_attribute attributeFor
if (IsA(defaultValueNode, Const)) if (IsA(defaultValueNode, Const))
{ {
Const *constNode = (Const *) defaultValueNode; Const *constNode = (Const *) defaultValueNode;
defaultValue = constNode->constvalue; return constNode->constvalue;
} }
else else
{ {
@ -1018,8 +1017,6 @@ ColumnDefaultValue(TupleConstr *tupleConstraints, Form_pg_attribute attributeFor
errhint("Expression is either mutable or " errhint("Expression is either mutable or "
"does not evaluate to constant value"))); "does not evaluate to constant value")));
} }
return defaultValue;
} }

4
cstore_writer.c
View File

@ -386,8 +386,8 @@ WriteToSmgr(TableWriteState *writeState, char *data, uint32 dataLength)
while (addr.blockno >= nblocks) while (addr.blockno >= nblocks)
{ {
buffer = ReadBuffer(rel, P_NEW); Buffer newBuffer = ReadBuffer(rel, P_NEW);
ReleaseBuffer(buffer); ReleaseBuffer(newBuffer);
nblocks = smgrnblocks(rel->rd_smgr, MAIN_FORKNUM); nblocks = smgrnblocks(rel->rd_smgr, MAIN_FORKNUM);
} }