diff --git a/dbcon/joblist/jlf_subquery.cpp b/dbcon/joblist/jlf_subquery.cpp index 27c0129e6..ac2f4b950 100644 --- a/dbcon/joblist/jlf_subquery.cpp +++ b/dbcon/joblist/jlf_subquery.cpp @@ -85,8 +85,8 @@ void getColumnValue(ConstantColumn** cc, uint64_t i, const Row& row, const strin *cc = new ConstantColumn(oss.str(), row.getIntField(i)); break; } - - // else > 0; fall through + /* fall through */ + /* else > 0 */ case CalpontSystemCatalog::DECIMAL: case CalpontSystemCatalog::UDECIMAL: diff --git a/dbcon/joblist/tupleaggregatestep.cpp b/dbcon/joblist/tupleaggregatestep.cpp index 8ba3473c5..d3d9b2165 100644 --- a/dbcon/joblist/tupleaggregatestep.cpp +++ b/dbcon/joblist/tupleaggregatestep.cpp @@ -1307,7 +1307,7 @@ void TupleAggregateStep::prep1PhaseAggregate( case ROWAGG_AVG: avgFuncMap.insert(make_pair(key, funct)); - + /* fall through */ case ROWAGG_SUM: { if (typeProj[colProj] == CalpontSystemCatalog::CHAR || @@ -1890,6 +1890,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate( else break; } + /* fall through */ case ROWAGG_COUNT_ASTERISK: case ROWAGG_COUNT_COL_NAME: @@ -3166,6 +3167,7 @@ void TupleAggregateStep::prep2PhasesAggregate( // let fall through to add a count column for average function if (aggOp != ROWAGG_AVG) break; + /* fall through */ case ROWAGG_COUNT_ASTERISK: case ROWAGG_COUNT_COL_NAME: @@ -4048,6 +4050,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate( funct->fAuxColumnIndex = colAggPm; else break; + /* fall through */ case ROWAGG_COUNT_ASTERISK: case ROWAGG_COUNT_COL_NAME: diff --git a/dbcon/mysql/ha_mcs_execplan.cpp b/dbcon/mysql/ha_mcs_execplan.cpp index 1da9d8175..81c5acd09 100755 --- a/dbcon/mysql/ha_mcs_execplan.cpp +++ b/dbcon/mysql/ha_mcs_execplan.cpp @@ -3323,6 +3323,7 @@ ReturnedColumn* buildReturnedColumn( break; } } + /* fall through */ case Item::NULL_ITEM: { @@ -4828,6 +4829,7 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi) break; } } + /* fall through */ default: { diff --git a/dbcon/mysql/ha_mcs_partition.cpp b/dbcon/mysql/ha_mcs_partition.cpp index 82aa74a98..1bd8b65ba 100644 --- a/dbcon/mysql/ha_mcs_partition.cpp +++ b/dbcon/mysql/ha_mcs_partition.cpp @@ -263,6 +263,7 @@ const string format(int64_t v, CalpontSystemCatalog::ColType& ct) case CalpontSystemCatalog::TIME: oss << DataConvert::timeToString(v); + break; case CalpontSystemCatalog::CHAR: case CalpontSystemCatalog::VARCHAR: diff --git a/utils/common/hasher.h b/utils/common/hasher.h index e70f62600..4978689c4 100644 --- a/utils/common/hasher.h +++ b/utils/common/hasher.h @@ -114,10 +114,10 @@ public: { case 3: k1 ^= tail[2] << 16; - + /* fall through */ case 2: k1 ^= tail[1] << 8; - + /* fall through */ case 1: k1 ^= tail[0]; k1 *= c1; diff --git a/utils/funcexp/func_hour.cpp b/utils/funcexp/func_hour.cpp index 666e84ce0..918fe193d 100644 --- a/utils/funcexp/func_hour.cpp +++ b/utils/funcexp/func_hour.cpp @@ -84,6 +84,7 @@ int64_t Func_hour::getIntVal(rowgroup::Row& row, { isNull = true; } + /* fall through */ case execplan::CalpontSystemCatalog::VARCHAR: case execplan::CalpontSystemCatalog::CHAR: diff --git a/utils/funcexp/func_minute.cpp b/utils/funcexp/func_minute.cpp index 6cdd109a6..fdad4e9cf 100644 --- a/utils/funcexp/func_minute.cpp +++ b/utils/funcexp/func_minute.cpp @@ -83,6 +83,7 @@ int64_t Func_minute::getIntVal(rowgroup::Row& row, { isNull = true; } + /* fall through */ case execplan::CalpontSystemCatalog::VARCHAR: case execplan::CalpontSystemCatalog::CHAR: diff --git a/utils/funcexp/func_nullif.cpp b/utils/funcexp/func_nullif.cpp index ca835e5bc..90c546ea3 100644 --- a/utils/funcexp/func_nullif.cpp +++ b/utils/funcexp/func_nullif.cpp @@ -912,6 +912,7 @@ execplan::IDB_Decimal Func_nullif::getDecimalVal(rowgroup::Row& row, exp2.value = value; exp2.scale = 0; } + /* fall through */ case execplan::CalpontSystemCatalog::DOUBLE: case execplan::CalpontSystemCatalog::UDOUBLE: diff --git a/utils/funcexp/func_quarter.cpp b/utils/funcexp/func_quarter.cpp index 6cc4316c4..c1dcda89e 100644 --- a/utils/funcexp/func_quarter.cpp +++ b/utils/funcexp/func_quarter.cpp @@ -130,6 +130,7 @@ int64_t Func_quarter::getIntVal(rowgroup::Row& row, else { isNull = true; + break; } } diff --git a/utils/funcexp/func_second.cpp b/utils/funcexp/func_second.cpp index 45cca7e21..475f7495e 100644 --- a/utils/funcexp/func_second.cpp +++ b/utils/funcexp/func_second.cpp @@ -81,8 +81,9 @@ int64_t Func_second::getIntVal(rowgroup::Row& row, case execplan::CalpontSystemCatalog::DOUBLE: case execplan::CalpontSystemCatalog::FLOAT: { - isNull = true; + isNull = true; } + /* fall through */ case execplan::CalpontSystemCatalog::VARCHAR: case execplan::CalpontSystemCatalog::CHAR: diff --git a/utils/funcexp/func_timediff.cpp b/utils/funcexp/func_timediff.cpp index 5bf16e413..3c629933f 100644 --- a/utils/funcexp/func_timediff.cpp +++ b/utils/funcexp/func_timediff.cpp @@ -129,6 +129,7 @@ string Func_timediff::getStrVal(rowgroup::Row& row, case execplan::CalpontSystemCatalog::TIME: isTime1 = true; + /* fall through */ case execplan::CalpontSystemCatalog::DATETIME: // Diff between time and datetime returns NULL in MariaDB if ((type2 == execplan::CalpontSystemCatalog::TIME || @@ -229,6 +230,7 @@ string Func_timediff::getStrVal(rowgroup::Row& row, case execplan::CalpontSystemCatalog::TIME: isTime2 = true; + /* fall through */ case execplan::CalpontSystemCatalog::DATETIME: val2 = parm[1]->data()->getDatetimeIntVal(row, isNull); break; diff --git a/utils/rowgroup/rowaggregation.cpp b/utils/rowgroup/rowaggregation.cpp index 5c02d0c48..b59ce6542 100755 --- a/utils/rowgroup/rowaggregation.cpp +++ b/utils/rowgroup/rowaggregation.cpp @@ -1709,6 +1709,7 @@ void RowAggregation::updateEntry(const Row& rowIn) // if NOT null, let execution fall through. if (isNull(&fRowGroupIn, rowIn, colIn) == true) break; + /* fall through */ case ROWAGG_COUNT_ASTERISK: fRow.setUintField<8>(fRow.getUintField<8>(colOut) + 1, colOut); @@ -2467,6 +2468,7 @@ void RowAggregationUM::updateEntry(const Row& rowIn) // if NOT null, let execution fall through. if (isNull(&fRowGroupIn, rowIn, colIn) == true) break; + /* fall through */ case ROWAGG_COUNT_ASTERISK: fRow.setUintField<8>(fRow.getUintField<8>(colOut) + 1, colOut); diff --git a/utils/rowgroup/rowgroup.cpp b/utils/rowgroup/rowgroup.cpp index 2bfcca9fc..f3922fbe3 100644 --- a/utils/rowgroup/rowgroup.cpp +++ b/utils/rowgroup/rowgroup.cpp @@ -744,6 +744,7 @@ void Row::initToNull() case CalpontSystemCatalog::LONGDOUBLE: *((long double*) &data[offsets[i]]) = joblist::LONGDOUBLENULL; + break; case CalpontSystemCatalog::DATETIME: *((uint64_t*) &data[offsets[i]]) = joblist::DATETIMENULL; diff --git a/writeengine/bulk/cpimport.cpp b/writeengine/bulk/cpimport.cpp index 4a878210a..c54fc2ee3 100644 --- a/writeengine/bulk/cpimport.cpp +++ b/writeengine/bulk/cpimport.cpp @@ -418,6 +418,7 @@ void parseCmdLineArgs( case 'h': // -h: help { printUsage(); + break; } case 'i': // -i: log info to console diff --git a/writeengine/server/we_dmlcommandproc.cpp b/writeengine/server/we_dmlcommandproc.cpp index bf805870e..191dd56ea 100644 --- a/writeengine/server/we_dmlcommandproc.cpp +++ b/writeengine/server/we_dmlcommandproc.cpp @@ -3033,6 +3033,7 @@ uint8_t WE_DMLCommandProc::processUpdate(messageqcpp::ByteStream& bs, // else // fall through to integer cases } + /* fall through */ case CalpontSystemCatalog::BIGINT: case CalpontSystemCatalog::UBIGINT: @@ -3377,6 +3378,7 @@ uint8_t WE_DMLCommandProc::processUpdate(messageqcpp::ByteStream& bs, // else // fall through to integer cases } + /* fall through */ case CalpontSystemCatalog::BIGINT: case CalpontSystemCatalog::UBIGINT: