MCOL-641 Fix the cpimport issue when tables contains wide-DECIMAL and other types.

writeengine/bulk/we_tableinfo.cpp

@@ -69,6 +69,31 @@ const std::string  BOLD_STOP       = "\033[0;39m";
 
 namespace WriteEngine
 {
+// Helpers
+int TableInfo::compareHWMs(const int smallestColumnId,
+    const int widerColumnId,
+    const size_t widerColumnWidth,
+    const std::vector<DBRootExtentInfo>& segFileInfo,
+    int& colIdx)
+{
+    int rc = NO_ERROR;
+    if (widerColumnId < 0)
+    {
+        return rc;
+    }
+    HWM hwmLo = segFileInfo[smallestColumnId].fLocalHwm * widerColumnWidth;
+    HWM hwmHi = hwmLo + widerColumnWidth - 1;
+
+    if ((segFileInfo[widerColumnId].fLocalHwm < hwmLo) ||
+            (segFileInfo[widerColumnId].fLocalHwm > hwmHi))
+    {
+        colIdx = widerColumnId;
+        rc     = ERR_BRM_HWMS_OUT_OF_SYNC;
+    }
+    return rc;
+}
+
+
 //------------------------------------------------------------------------------
 // Puts the current thread to sleep for the specified number of milliseconds.
 // (Ex: used to wait for a Read buffer to become available.)
@@ -2064,6 +2089,7 @@ int TableInfo::validateColumnHWMs(
     int byte2First = -1;
     int byte4First = -1;
     int byte8First = -1;
+    int byte16First = -1;
 
     // Make sure the HWMs for all 1-byte columns match; same for all 2-byte,
     // 4-byte, and 8-byte columns as well.
@@ -2107,7 +2133,6 @@ int TableInfo::validateColumnHWMs(
             }
 
             case 8:
-            default:
             {
                 if (byte8First == -1)
                     byte8First = k;
@@ -2115,7 +2140,25 @@ int TableInfo::validateColumnHWMs(
                 k1 = byte8First;
                 break;
             }
-        } // end of switch based on column width (1,2,4, or 8)
+            case 16:
+            {
+                if (byte16First == -1)
+                    byte16First = k;
+
+                k1 = byte16First;
+                break;
+            }
+            default:
+            {
+                ostringstream oss;
+                oss << stage << " Unsupported width for"
+                    " OID-"        << jobColK.mapOid               <<
+                    "; column-"    << jobColK.colName              <<
+                    "; width-"     << jobColK.width;
+                fLog->logMsg( oss.str(), ERR_BRM_UNSUPP_WIDTH, MSGLVL_ERROR );
+                return ERR_BRM_UNSUPP_WIDTH;
+            }
+        } // end of switch based on column width.
 
         // Validate HWMs in jobTable if we have it, else use fColumns.
         const JobColumn& jobColK1 =
@@ -2259,6 +2302,11 @@ int TableInfo::validateColumnHWMs(
                 goto errorCheck;
             }
         }
+        if ((rc = compareHWMs(byte1First, byte16First, 16,
+             segFileInfo, colIdx) < 0))
+        {
+            goto errorCheck;
+        }
     }
 
     // Validate/compare HWMs given a 2-byte column as a starting point
@@ -2293,6 +2341,13 @@ int TableInfo::validateColumnHWMs(
                 goto errorCheck;
             }
         }
+        if ((rc = compareHWMs(byte2First, byte16First, 16,
+             segFileInfo, colIdx) < 0))
+        {
+            goto errorCheck;
+        }
+
+
     }
 
     // Validate/compare HWMs given a 4-byte column as a starting point
@@ -2313,6 +2368,22 @@ int TableInfo::validateColumnHWMs(
                 goto errorCheck;
             }
         }
+        if ((rc = compareHWMs(byte4First, byte16First, 16,
+             segFileInfo, colIdx) < 0))
+        {
+            goto errorCheck;
+        }
+
+    }
+    if (byte8First >= 0)
+    {
+        refCol = byte8First;
+        if ((rc = compareHWMs(byte8First, byte16First, 16,
+             segFileInfo, colIdx) < 0))
+        {
+            goto errorCheck;
+        }
+
     }
 
 // To avoid repeating this message 6 times in the preceding source code, we

writeengine/bulk/we_tableinfo.h

@@ -187,6 +187,13 @@ private:
     int  openTableFile();               // Open data file and set the buffer
     void reportTotals(double elapsedSec);//Report summary totals
     void sleepMS(long int ms);          // Sleep method
+    // Compare column HWM with the examplar HWM.
+    int compareHWMs(const int smallestColumnId,
+                               const int widerColumnId,
+                               const size_t widerColumnWidth,
+                               const std::vector<DBRootExtentInfo>& segFileInfo,
+                               int& colIdx);
+
     int synchronizeAutoInc();           // Sychronize AutoInc in BRM with syscat
 
     // Write the list of errors for this table

writeengine/shared/we_define.cpp

@@ -205,6 +205,7 @@ WErrorCodes::WErrorCodes() : fErrorCodes()
     fErrorCodes[ERR_BRM_SUSPEND] = " The system is in write suspended mode";
     fErrorCodes[ERR_BRM_GET_SUSPEND] = " BRM error get the system suspend flag ";
     fErrorCodes[ERR_BRM_BAD_STRIPE_CNT] = " Incorrect number of column extents allocated in stripe";
+    fErrorCodes[ERR_BRM_UNSUPP_WIDTH] = " Unsupported non-dictionary column width";
 
     // DM error
     fErrorCodes[ERR_DM_CONVERT_OID] = " a DM Conversion error";

writeengine/shared/we_define.h

@@ -308,6 +308,7 @@ const int   ERR_BRM_GET_SHUTDOWN    = ERR_BRMBASE + 43;// error getting BRM Shut
 const int   ERR_BRM_SUSPEND         = ERR_BRMBASE + 44;// BRM is set to Suspend writes
 const int   ERR_BRM_GET_SUSPEND     = ERR_BRMBASE + 45;// error getting BRM Suspend flag
 const int   ERR_BRM_BAD_STRIPE_CNT  = ERR_BRMBASE + 46;// Incorrect num of cols allocated in stripe
+const int   ERR_BRM_UNSUPP_WIDTH    = ERR_BRMBASE + 47;// Non-dict column Width > allowed MAX.
 
 //--------------------------------------------------------------------------
 // DM error