From 32e3e51ed45afe1745e02a55ce2237e99a0f6bdf Mon Sep 17 00:00:00 2001 From: Onur Tirtir Date: Wed, 8 Sep 2021 20:03:59 +0300 Subject: [PATCH] Fix a compiler warning that we get on debian (#5260) --- src/backend/columnar/columnar_metadata.c | 73 ++++++++++-------------- 1 file changed, 30 insertions(+), 43 deletions(-) diff --git a/src/backend/columnar/columnar_metadata.c b/src/backend/columnar/columnar_metadata.c index 6319ac3f0..dc0d097df 100644 --- a/src/backend/columnar/columnar_metadata.c +++ b/src/backend/columnar/columnar_metadata.c @@ -830,51 +830,38 @@ CheckStripeMetadataConsistency(StripeMetadata *stripeMetadata) (stripeMetadata->fileOffset == ColumnarInvalidLogicalOffset && stripeMetadata->dataLength == 0)); - switch (StripeWriteState(stripeMetadata)) + StripeWriteStateEnum stripeWriteState = StripeWriteState(stripeMetadata); + if (stripeWriteState == STRIPE_WRITE_FLUSHED && stripeLooksFlushed) { - case STRIPE_WRITE_FLUSHED: - { - /* - * If stripe was flushed to disk, then we expect stripe to store - * at least one tuple. - */ - if (stripeLooksFlushed) - { - break; - } - } - - case STRIPE_WRITE_IN_PROGRESS: - { - /* - * If stripe was not flushed to disk, then values of given four - * fields should match the columns inserted by - * InsertEmptyStripeMetadataRow. - */ - if (stripeLooksInProgress) - { - break; - } - } - - case STRIPE_WRITE_ABORTED: - { - /* - * Stripe metadata entry for an aborted write can be complete or - * incomplete. We might have aborted the transaction before or after - * inserting into stripe metadata. - */ - if (stripeLooksInProgress || stripeLooksFlushed) - { - break; - } - } - - default: - ereport(ERROR, (errmsg("unexpected stripe state, stripe metadata " - "entry for stripe with id=" UINT64_FORMAT - " is not consistent", stripeMetadata->id))); + /* + * If stripe was flushed to disk, then we expect stripe to store + * at least one tuple. + */ + return; } + else if (stripeWriteState == STRIPE_WRITE_IN_PROGRESS && stripeLooksInProgress) + { + /* + * If stripe was not flushed to disk, then values of given four + * fields should match the columns inserted by + * InsertEmptyStripeMetadataRow. + */ + return; + } + else if (stripeWriteState == STRIPE_WRITE_ABORTED && (stripeLooksInProgress || + stripeLooksFlushed)) + { + /* + * Stripe metadata entry for an aborted write can be complete or + * incomplete. We might have aborted the transaction before or after + * inserting into stripe metadata. + */ + return; + } + + ereport(ERROR, (errmsg("unexpected stripe state, stripe metadata " + "entry for stripe with id=" UINT64_FORMAT + " is not consistent", stripeMetadata->id))); }