MCOL-392 Apply astyle

Make this branch apply our style guidelines

dbcon/execplan/simplefilter.cpp

@@ -606,6 +606,7 @@ void SimpleFilter::convertConstant()
                 result.intVal = dataconvert::DataConvert::timeToInt(result.strVal);
             }
         }
+
         rcc->result(result);
     }
 }

dbcon/execplan/treenode.h

@@ -995,6 +995,7 @@ inline int64_t TreeNode::getDatetimeIntVal()
         int day = 0;
 
         memcpy(&tt, &fResult.intVal, 8);
+
         // Note, this should probably be current date +/- time
         if ((tt.hour > 23) && (!tt.is_neg))
         {
@@ -1005,6 +1006,7 @@ inline int64_t TreeNode::getDatetimeIntVal()
         {
             tt.hour = 0;
         }
+
         dataconvert::DateTime dt(0, 0, day, tt.hour, tt.minute, tt.second, tt.msecond);
         memcpy(&fResult.intVal, &dt, 8);
         return fResult.intVal;

dbcon/joblist/groupconcat.cpp

@@ -648,10 +648,12 @@ int64_t GroupConcator::lengthEstimate(const rowgroup::Row& row)
                 fieldLen = 19; // YYYY-MM-DD HH24:MI:SS
                 // Decimal point and milliseconds
                 uint64_t colPrecision = row.getPrecision(*i);
+
                 if (colPrecision > 0 && colPrecision < 7)
                 {
                     fieldLen += colPrecision + 1;
                 }
+
                 break;
             }
 
@@ -660,10 +662,12 @@ int64_t GroupConcator::lengthEstimate(const rowgroup::Row& row)
                 fieldLen = 10; //  -HHH:MI:SS
                 // Decimal point and milliseconds
                 uint64_t colPrecision = row.getPrecision(*i);
+
                 if (colPrecision > 0 && colPrecision < 7)
                 {
                     fieldLen += colPrecision + 1;
                 }
+
                 break;
             }
 

dbcon/mysql/ha_calpont_dml.cpp

@@ -842,6 +842,7 @@ int ha_calpont_impl_write_batch_row_(uchar* buf, TABLE* table, cal_impl_if::cal_
                             const uchar* pos = buf;
                             longlong tmp = my_datetime_packed_from_binary(pos, table->field[colpos]->decimals());
                             TIME_from_longlong_datetime_packed(&ltime, tmp);
+
                             if (!ltime.second_part)
                             {
                                 fprintf(ci.filePtr, "%04d-%02d-%02d %02d:%02d:%02d%c",
@@ -855,6 +856,7 @@ int ha_calpont_impl_write_batch_row_(uchar* buf, TABLE* table, cal_impl_if::cal_
                                         ltime.hour, ltime.minute, ltime.second,
                                         ltime.second_part, ci.delimiter);
                             }
+
                             buf += table->field[colpos]->pack_length();
                         }
                         else
@@ -892,6 +894,7 @@ int ha_calpont_impl_write_batch_row_(uchar* buf, TABLE* table, cal_impl_if::cal_
                         const uchar* pos = buf;
                         longlong tmp = my_time_packed_from_binary(pos, table->field[colpos]->decimals());
                         TIME_from_longlong_time_packed(&ltime, tmp);
+
                         if (!ltime.second_part)
                         {
                             fprintf(ci.filePtr, "%02d:%02d:%02d%c",
@@ -903,6 +906,7 @@ int ha_calpont_impl_write_batch_row_(uchar* buf, TABLE* table, cal_impl_if::cal_
                                     ltime.hour, ltime.minute, ltime.second,
                                     ltime.second_part, ci.delimiter);
                         }
+
                         buf += table->field[colpos]->pack_length();
                     }
 

utils/dataconvert/dataconvert.cpp

@@ -1020,6 +1020,7 @@ bool mysql_str_to_time( const string& input, Time& output )
         {
             output.reset();
         }
+
         return false;
     }
 
@@ -1918,6 +1919,7 @@ int64_t DataConvert::convertColumnTime(
     inSecond      = 0;
     inMicrosecond = 0;
     bool isNeg = false;
+
     if ( datetimeFormat != CALPONTTIME_ENUM )
     {
         status = -1;
@@ -1941,6 +1943,7 @@ int64_t DataConvert::convertColumnTime(
     }
 
     p = strtok_r(NULL, ":.", &savePoint);
+
     if (p == NULL)
     {
         status = -1;
@@ -1976,6 +1979,7 @@ int64_t DataConvert::convertColumnTime(
     if (p != NULL)
     {
         inMicrosecond = strtol(p, 0, 10);
+
         if (errno)
         {
             status = -1;
@@ -2017,6 +2021,7 @@ int64_t DataConvert::convertColumnTime(
             atime.is_neg = false;
             memcpy( &value, &atime, 8);
         }
+
         // If neither of the above match then we return a 0 time
 
         status = -1;
@@ -2067,21 +2072,25 @@ std::string DataConvert::datetimeToString( long long  datetimevalue, long decima
     {
         decimals = 0;
     }
+
     // @bug 4703 abandon multiple ostringstream's for conversion
     DateTime dt(datetimevalue);
     const int DATETIMETOSTRING_LEN = 28; // YYYY-MM-DD HH:MM:SS.mmmmmm\0
     char buf[DATETIMETOSTRING_LEN];
 
     sprintf(buf, "%04d-%02d-%02d %02d:%02d:%02d", dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second);
+
     if (dt.msecond && decimals)
     {
         snprintf(buf + strlen(buf), 21 + decimals, ".%d", dt.msecond);
+
         // Pad end with zeros
         if (strlen(buf) < (size_t)(21 + decimals))
         {
             sprintf(buf + strlen(buf), "%0*d", (int)(21 + decimals - strlen(buf)), 0);
         }
     }
+
     return buf;
 }
 
@@ -2092,6 +2101,7 @@ std::string DataConvert::timeToString( long long  timevalue, long decimals )
     {
         decimals = 0;
     }
+
     // @bug 4703 abandon multiple ostringstream's for conversion
     Time dt(timevalue);
     const int TIMETOSTRING_LEN = 19; // (-H)HH:MM:SS.mmmmmm\0
@@ -2105,16 +2115,19 @@ std::string DataConvert::timeToString( long long  timevalue, long decimals )
     }
 
     sprintf(outbuf, "%02d:%02d:%02d", dt.hour, dt.minute, dt.second);
+
     if (dt.msecond && decimals)
     {
         size_t start = strlen(buf);
         snprintf(buf + strlen(buf), 12 + decimals, ".%d", dt.msecond);
+
         // Pad end with zeros
         if (strlen(buf) - start < (size_t)decimals)
         {
             sprintf(buf + strlen(buf), "%0*d", (int)(decimals - (strlen(buf) - start) + 1), 0);
         }
     }
+
     return buf;
 }
 

utils/dataconvert/dataconvert.h

@@ -277,6 +277,7 @@ inline uint32_t getDaysInMonth(uint32_t month, int year)
         return 0;
 
     uint32_t days = daysInMonth[month - 1];
+
     if ((month == 2) && isLeapYear(year))
         days++;
 
@@ -567,11 +568,14 @@ inline void DataConvert::datetimeToString( long long datetimevalue, char* buf, u
     {
         decimals = 0;
     }
+
     int msec = 0;
+
     if ((datetimevalue & 0xfffff) > 0)
     {
         msec = (unsigned)((datetimevalue) & 0xfffff);
     }
+
     snprintf( buf, buflen, "%04d-%02d-%02d %02d:%02d:%02d",
               (unsigned)((datetimevalue >> 48) & 0xffff),
               (unsigned)((datetimevalue >> 44) & 0xf),
@@ -585,6 +589,7 @@ inline void DataConvert::datetimeToString( long long datetimevalue, char* buf, u
     {
         size_t start = strlen(buf);
         snprintf(buf + strlen(buf), buflen - start, ".%d", msec);
+
         // Pad end with zeros
         if (strlen(buf) - start < (size_t)decimals)
         {
@@ -600,8 +605,10 @@ inline void DataConvert::timeToString( long long timevalue, char* buf, unsigned
     {
         decimals = 0;
     }
+
     // Handle negative correctly
     int hour = 0, msec = 0;
+
     if ((timevalue >> 40) & 0x800)
     {
         hour = 0xfffff000;
@@ -613,12 +620,14 @@ inline void DataConvert::timeToString( long long timevalue, char* buf, unsigned
     {
         msec = (unsigned)((timevalue) & 0xffffff);
     }
+
     if ((hour >= 0) && (timevalue >> 63))
     {
         buf[0] = '-';
         buf++;
         buflen--;
     }
+
     snprintf( buf, buflen, "%02d:%02d:%02d",
               hour,
               (unsigned)((timevalue >> 32) & 0xff),
@@ -629,6 +638,7 @@ inline void DataConvert::timeToString( long long timevalue, char* buf, unsigned
     {
         size_t start = strlen(buf);
         snprintf(buf + strlen(buf), buflen - start, ".%d", msec);
+
         // Pad end with zeros
         if (strlen(buf) - start < (size_t)decimals)
         {
@@ -662,6 +672,7 @@ inline void DataConvert::timeToString1( long long timevalue, char* buf, unsigned
 {
     // Handle negative correctly
     int hour = 0;
+
     if ((timevalue >> 40) & 0x800)
     {
         hour = 0xfffff000;

utils/funcexp/func_bitand.cpp

@@ -165,6 +165,7 @@ int64_t Func_bitand::getIntVal(Row& row,
                         min = 0,
                         sec = 0,
                         msec = 0;
+
                 // Handle negative correctly
                 if ((time >> 40) & 0x800)
                 {
@@ -172,8 +173,10 @@ int64_t Func_bitand::getIntVal(Row& row,
                 }
 
                 hour |= ((time >> 40) & 0xfff);
+
                 if ((hour >= 0) && (time >> 63))
                     hour *= -1;
+
                 min = (uint32_t)((time >> 32) & 0xff);
                 sec = (uint32_t)((time >> 24) & 0xff);
                 msec = (uint32_t)(time & 0xffffff);

utils/funcexp/func_extract.cpp

@@ -146,8 +146,10 @@ long long timeGet( uint64_t time, IntervalColumn::interval_type unit )
 
     // If negative, mask so it doesn't turn positive
     int64_t mask = 0;
+
     if ((time >> 40) & 0x800)
         mask = 0xfffffffffffff000;
+
     hour = mask | ((time >> 40) & 0xfff);
 
     if ((hour >= 0) && (time >> 63))
@@ -275,6 +277,7 @@ int64_t Func_extract::getIntVal(rowgroup::Row& row,
     }
 
     long long value;
+
     if (isTime)
         value = timeGet( time, unit );
     else

utils/funcexp/func_hour.cpp

@@ -130,6 +130,7 @@ int64_t Func_hour::getIntVal(rowgroup::Row& row,
         // If negative, mask so it doesn't turn positive
         bool isNeg = false;
         int64_t mask = 0;
+
         if ((val >> 40) & 0x800)
             mask = 0xfffffffffffff000;
 
@@ -137,7 +138,9 @@ int64_t Func_hour::getIntVal(rowgroup::Row& row,
         {
             isNeg = true;
         }
+
         val = mask | ((val >> 40) & 0xfff);
+
         if (isNeg)
             val *= -1;
     }

utils/funcexp/func_time.cpp

@@ -111,6 +111,7 @@ string Func_time::getStrVal(rowgroup::Row& row,
             val = parm[0]->data()->getTimeIntVal(row, isNull);
             break;
         }
+
         case execplan::CalpontSystemCatalog::DATETIME:
         {
             val = parm[0]->data()->getTimeIntVal(row, isNull);

utils/funcexp/func_time_to_sec.cpp

@@ -72,16 +72,19 @@ int64_t Func_time_to_sec::getIntVal(rowgroup::Row& row,
 
         case CalpontSystemCatalog::TIME:
             val = parm[0]->data()->getTimeIntVal(row, isNull);
+
             // If negative, mask so it doesn't turn positive
             if ((val >> 40) & 0x800)
                 mask = 0xfffffffffffff000;
 
             bIsNegative = val >> 63;
             hour = (int32_t)(mask | ((val >> 40) & 0xfff));
+
             if ((hour >= 0) && bIsNegative)
                 hour *= -1;
             else
                 bIsNegative = false;
+
             min = (int32_t)((val >> 32) & 0xff);
             sec = (int32_t)((val >> 24) & 0xff);
             break;
@@ -162,6 +165,7 @@ int64_t Func_time_to_sec::getIntVal(rowgroup::Row& row,
     }
 
     int64_t rtn;
+
     if (hour < 0)
     {
         rtn = (int64_t)(hour * 60 * 60) - (min * 60) - sec;

utils/funcexp/functor_all.h

@@ -208,7 +208,8 @@ public:
     int64_t getTimeIntVal(rowgroup::Row& row,
                           FunctionParm& fp,
                           bool& isNull,
-                              execplan::CalpontSystemCatalog::ColType& op_ct);};
+                          execplan::CalpontSystemCatalog::ColType& op_ct);
+};
 
 
 /** @brief Func_ifnull class
@@ -359,7 +360,8 @@ public:
     int64_t getTimeIntVal(rowgroup::Row& row,
                           FunctionParm& fp,
                           bool& isNull,
-                              execplan::CalpontSystemCatalog::ColType& op_ct);};
+                          execplan::CalpontSystemCatalog::ColType& op_ct);
+};
 
 
 /** @brief Func_coalesce class

utils/rowgroup/rowaggregation.cpp

@@ -1543,6 +1543,7 @@ void RowAggregation::doBitOp(const Row& rowIn, int64_t colIn, int64_t colOut, in
             int64_t dtm = rowIn.getUintField(colIn);
             // Handle negative correctly
             int hour = 0;
+
             if ((dtm >> 40) & 0x800)
             {
                 hour = 0xfffff000;
@@ -2077,6 +2078,7 @@ void RowAggregation::doUDAF(const Row& rowIn, int64_t colIn, int64_t colOut, int
                 datum.columnData = rowIn.getUintField(colIn);
                 break;
             }
+
             case execplan::CalpontSystemCatalog::TIME:
             {
                 datum.dataType = execplan::CalpontSystemCatalog::BIGINT;