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

Fix tautological compare issue (#19)

merge-cstore-pykello
Hadi Moshayedi 2020-10-09 12:35:42 -07:00
parent ad78260c3d
commit 102b7670d4
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,6 +7,7 @@
*.ko *.ko
*.obj *.obj
*.elf *.elf
*.bc
# Libraries # Libraries
*.lib *.lib

10
cstore_metadata_tables.c
View File

@ -205,7 +205,7 @@ ReadStripeSkipList(Oid relfilenode, uint64 stripe, TupleDesc tupleDescriptor,
uint32 blockCount) uint32 blockCount)
{ {
StripeSkipList *skipList = NULL; StripeSkipList *skipList = NULL;
uint32 columnIndex = 0; int32 columnIndex = 0;
Oid cstoreSkipNodesOid = InvalidOid; Oid cstoreSkipNodesOid = InvalidOid;
Relation cstoreSkipNodes = NULL; Relation cstoreSkipNodes = NULL;
Relation index = NULL; Relation index = NULL;
@ -237,8 +237,8 @@ ReadStripeSkipList(Oid relfilenode, uint64 stripe, TupleDesc tupleDescriptor,
while (HeapTupleIsValid(heapTuple = systable_getnext(scanDescriptor))) while (HeapTupleIsValid(heapTuple = systable_getnext(scanDescriptor)))
{ {
uint32 attr = 0; int32 attr = 0;
uint32 blockIndex = 0; int32 blockIndex = 0;
ColumnBlockSkipNode *skipNode = NULL; ColumnBlockSkipNode *skipNode = NULL;
Datum datumArray[Natts_cstore_skipnodes]; Datum datumArray[Natts_cstore_skipnodes];
@ -253,13 +253,13 @@ ReadStripeSkipList(Oid relfilenode, uint64 stripe, TupleDesc tupleDescriptor,
if (attr <= 0 || attr > columnCount) if (attr <= 0 || attr > columnCount)
{ {
ereport(ERROR, (errmsg("invalid stripe skipnode entry"), ereport(ERROR, (errmsg("invalid stripe skipnode entry"),
errdetail("Attribute number out of range: %u", attr))); errdetail("Attribute number out of range: %d", attr)));
} }
if (blockIndex < 0 || blockIndex >= blockCount) if (blockIndex < 0 || blockIndex >= blockCount)
{ {
ereport(ERROR, (errmsg("invalid stripe skipnode entry"), ereport(ERROR, (errmsg("invalid stripe skipnode entry"),
errdetail("Block number out of range: %u", blockIndex))); errdetail("Block number out of range: %d", blockIndex)));
} }
columnIndex = attr - 1; columnIndex = attr - 1;