MCOL-3536 Collation

dbcon/execplan/calpontsystemcatalog.cpp

@@ -77,9 +77,7 @@ using namespace rowgroup;
 #include "idbregistry.h"
 #endif
 
-#include <mariadb.h>
+#include "collation.h"
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
 
 #undef BAIL_IF_0
 #if 1

dbcon/execplan/predicateoperator.cpp

@@ -30,10 +30,7 @@
 
 #include "liboamcpp.h"
 
-#include <mariadb.h>
+#include "collation.h"
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-#include <m_ctype.h>
 
 using namespace oam;
 

dbcon/mysql/ha_mcs_execplan.cpp

@@ -86,9 +86,7 @@ using namespace execplan;
 #include "functor.h"
 using namespace funcexp;
 
-#include <mariadb.h>
+#include "collation.h"
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
 
 const uint64_t AGG_BIT = 0x01;
 const uint64_t SUB_BIT = 0x02;

ddlproc/ddlproc.cpp

@@ -18,10 +18,6 @@
 
 /******************************************************************************************
 ******************************************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-
 #include <string>
 #include <unistd.h>
 #include <signal.h>
@@ -68,6 +64,8 @@ using namespace execplan;
 #include "crashtrace.h"
 #include "installdir.h"
 
+#include "collation.h"
+
 namespace
 {
 DistributedEngineComm* Dec;

dmlproc/dmlproc.cpp

@@ -20,10 +20,6 @@
 *
 *
 ***********************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-
 #include <unistd.h>
 #include <signal.h>
 #include <string>
@@ -88,6 +84,8 @@ using namespace joblist;
 #include "crashtrace.h"
 #include "installdir.h"
 
+#include "collation.h"
+
 threadpool::ThreadPool DMLServer::fDmlPackagepool(10, 0);
 
 namespace

exemgr/main.cpp

@@ -39,10 +39,6 @@
  * on the Front-End Processor where it is returned to the DBMS
  * front-end.
  */
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-
 #include <iostream>
 #include <cstdint>
 #include <csignal>
@@ -80,6 +76,8 @@
 
 #include "dbrm.h"
 
+#include "collation.h"
+
 namespace
 {
 

primitives/linux-port/dictionary.cpp

@@ -34,10 +34,7 @@ using namespace std;
 #include "dataconvert.h"
 #include <sstream>
 
-#include <mariadb.h>
+#include "collation.h"
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-#include <m_ctype.h>
 
 using namespace logging;
 

primitives/primproc/primproc.cpp

@@ -21,10 +21,6 @@
  *
  *
  ***********************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-
 #include <unistd.h>
 #include <string>
 #include <iostream>
@@ -78,6 +74,8 @@ using namespace idbdatafile;
 #include "crashtrace.h"
 #include "installdir.h"
 
+#include "collation.h"
+
 namespace primitiveprocessor
 {
 

utils/common/utils_utf8.cpp

@@ -13,12 +13,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-#include <m_ctype.h>
-
 #include "utils_utf8.h"
+#include "collation.h"
 
 namespace utf8
 {

utils/funcexp/func_between.cpp

@@ -22,10 +22,6 @@
 *
 ****************************************************************************/
 
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-
 #include <cstdlib>
 #include <string>
 using namespace std;
@@ -41,6 +37,9 @@ using namespace execplan;
 #include "errorcodes.h"
 #include "idberrorinfo.h"
 #include "errorids.h"
+
+#include "collation.h"
+
 using namespace logging;
 
 namespace

utils/funcexp/func_case.cpp

@@ -22,10 +22,6 @@
 *
 ****************************************************************************/
 
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-
 #include <string>
 //#define NDEBUG
 #include <cassert>
@@ -47,6 +43,8 @@ using namespace logging;
 #include "utils_utf8.h"
 using namespace funcexp;
 
+#include "collation.h"
+
 namespace
 {
 using namespace funcexp;

utils/funcexp/func_char_length.cpp

@@ -21,10 +21,6 @@
 *
 ****************************************************************************/
 
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-
 #include <cstdlib>
 #include <string>
 #include <sstream>
@@ -42,6 +38,9 @@ using namespace execplan;
 #include "errorcodes.h"
 #include "idberrorinfo.h"
 #include "errorids.h"
+
+#include "collation.h"
+
 using namespace logging;
 
 namespace funcexp

utils/funcexp/func_concat_ws.cpp

@@ -20,9 +20,6 @@
 *
 *
 ****************************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
 
 #include <string>
 using namespace std;
@@ -35,6 +32,8 @@ using namespace execplan;
 #include "rowgroup.h"
 using namespace rowgroup;
 
+#include "collation.h"
+
 namespace funcexp
 {
 

utils/funcexp/func_find_in_set.cpp

@@ -20,9 +20,6 @@
 *
 *
 ****************************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
 
 #include <cstdlib>
 #include <string>
@@ -45,6 +42,8 @@ using namespace execplan;
 #include "errorids.h"
 using namespace logging;
 
+#include "collation.h"
+
 namespace funcexp
 {
 

utils/funcexp/func_greatest.cpp

@@ -22,10 +22,6 @@
 *
 ****************************************************************************/
 
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-
 #include <cstdlib>
 #include <string>
 #include <sstream>
@@ -44,6 +40,7 @@ using namespace joblist;
 #include "utils_utf8.h"
 using namespace funcexp;
 
+#include "collation.h"
 
 class to_lower
 {

utils/funcexp/func_in.cpp

@@ -22,10 +22,6 @@
 *
 ****************************************************************************/
 
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-
 #include <cstdlib>
 #include <string>
 using namespace std;
@@ -48,6 +44,8 @@ using namespace logging;
 #include "utils_utf8.h"
 using namespace funcexp;
 
+#include "collation.h"
+
 namespace
 {
 template<typename result_t>

utils/funcexp/func_insert.cpp

@@ -20,9 +20,6 @@
 *
 *
 ****************************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
 
 #include <string>
 using namespace std;
@@ -40,6 +37,8 @@ using namespace joblist;
 #include "utf8.h"
 using namespace utf8;
 
+#include "collation.h"
+
 namespace funcexp
 {
 

utils/funcexp/func_instr.cpp

@@ -20,10 +20,6 @@
 *
 *
 ****************************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-#include <m_ctype.h>
 
 #include <cstdlib>
 #include <string>
@@ -36,6 +32,8 @@ using namespace std;
 #include "utils_utf8.h"
 using namespace execplan;
 
+#include "collation.h"
+
 namespace funcexp
 {
 CalpontSystemCatalog::ColType Func_instr::operationType( FunctionParm& fp, CalpontSystemCatalog::ColType& resultType )

utils/funcexp/func_lcase.cpp

@@ -20,10 +20,6 @@
 *
 *
 ****************************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-#include <m_ctype.h>
 
 #include <string>
 using namespace std;
@@ -39,6 +35,8 @@ using namespace rowgroup;
 #include "joblisttypes.h"
 using namespace joblist;
 
+#include "collation.h"
+
 class to_lower
 {
 public:

utils/funcexp/func_least.cpp

@@ -22,10 +22,6 @@
 *
 ****************************************************************************/
 
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-
 #include <cstdlib>
 #include <string>
 #include <sstream>
@@ -44,6 +40,8 @@ using namespace joblist;
 #include "utils_utf8.h"
 using namespace funcexp;
 
+#include "collation.h"
+
 class to_lower
 {
 public:

utils/funcexp/func_left.cpp

@@ -20,10 +20,6 @@
 *
 *
 ****************************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-
 #include <string>
 using namespace std;
 
@@ -38,6 +34,8 @@ using namespace rowgroup;
 #include "joblisttypes.h"
 using namespace joblist;
 
+#include "collation.h"
+
 namespace funcexp
 {
 

utils/funcexp/func_length.cpp

@@ -20,9 +20,6 @@
 *
 *
 ****************************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
 
 #include <cstdlib>
 #include <string>
@@ -36,6 +33,8 @@ using namespace execplan;
 
 #include "rowgroup.h"
 
+#include "collation.h"
+
 namespace funcexp
 {
 CalpontSystemCatalog::ColType Func_length::operationType( FunctionParm& fp, CalpontSystemCatalog::ColType& resultType )

utils/funcexp/func_lpad.cpp

@@ -20,9 +20,6 @@
 *
 *
 ****************************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
 
 #include "errorids.h"
 #include <string>
@@ -39,6 +36,8 @@ using namespace rowgroup;
 #include "joblisttypes.h"
 using namespace joblist;
 
+#include "collation.h"
+
 namespace funcexp
 {
 const string Func_lpad::fPad = " ";

utils/funcexp/func_ltrim.cpp

@@ -20,9 +20,6 @@
 *
 *
 ****************************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
 
 #include <string>
 using namespace std;
@@ -38,6 +35,7 @@ using namespace rowgroup;
 #include "joblisttypes.h"
 using namespace joblist;
 
+#include "collation.h"
 
 namespace funcexp
 {

utils/funcexp/func_nullif.cpp

@@ -22,10 +22,10 @@
 *
 ****************************************************************************/
 
-#include <mariadb.h>
+//#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
+//#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#undef LONGLONG_MIN
+//#undef LONGLONG_MIN
-#include <my_sys.h>
+//#include <my_sys.h>
 
 #include <cstdlib>
 #include <string>
@@ -50,6 +50,8 @@ using namespace dataconvert;
 #include "utils_utf8.h"
 using namespace funcexp;
 
+#include "collation.h"
+
 namespace funcexp
 {
 

utils/funcexp/func_replace.cpp

@@ -21,10 +21,6 @@
 *
 ****************************************************************************/
 
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-
 #include <string>
 using namespace std;
 
@@ -38,6 +34,8 @@ using namespace rowgroup;
 #include "joblisttypes.h"
 using namespace joblist;
 
+#include "collation.h"
+
 namespace funcexp
 {
 

utils/funcexp/func_right.cpp

@@ -20,9 +20,6 @@
 *
 *
 ****************************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
 
 #include <string>
 using namespace std;
@@ -38,6 +35,8 @@ using namespace rowgroup;
 #include "joblisttypes.h"
 using namespace joblist;
 
+#include "collation.h"
+
 namespace funcexp
 {
 

utils/funcexp/func_rpad.cpp

@@ -20,10 +20,6 @@
 *
 *
 ****************************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-
 #include "errorids.h"
 #include <string>
 using namespace std;
@@ -39,7 +35,7 @@ using namespace rowgroup;
 #include "joblisttypes.h"
 using namespace joblist;
 
-#define STRCOLL_ENH__
+#include "collation.h"
 
 namespace funcexp
 {
@@ -115,10 +111,10 @@ std::string Func_rpad::getStrVal(rowgroup::Row& row,
 
     while (padLength >= plen)
     {
-        memcpy(pBuf, posP, plen);
+        memcpy(pBuf, posP, binPLen);
         padLength -= plen;
-        byteCount += plen;
+        byteCount += binPLen;
-        pBuf += plen;
+        pBuf += binPLen;
     }
     // Sometimes, in a case with multi-char pad, we need to add a partial pad
     if (padLength > 0)

utils/funcexp/func_rtrim.cpp

@@ -20,9 +20,6 @@
 *
 *
 ****************************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
 
 #include <string>
 using namespace std;
@@ -38,6 +35,8 @@ using namespace rowgroup;
 #include "joblisttypes.h"
 using namespace joblist;
 
+#include "collation.h"
+
 namespace funcexp
 {
 

utils/funcexp/func_strcmp.cpp

@@ -20,13 +20,6 @@
 *
 *
 ****************************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
 
 #include <cstdlib>
 #include <string>
@@ -46,6 +39,8 @@ using namespace joblist;
 #include "utils_utf8.h"
 using namespace funcexp;
 
+#include "collation.h"
+
 // Because including my_sys.h in a Columnstore header causes too many conflicts
 struct charset_info_st;
 typedef const struct charset_info_st CHARSET_INFO;

utils/funcexp/func_substr.cpp

@@ -20,9 +20,6 @@
 *
 *
 ****************************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
 
 #include <string>
 using namespace std;
@@ -38,6 +35,8 @@ using namespace rowgroup;
 #include "joblisttypes.h"
 using namespace joblist;
 
+#include "collation.h"
+
 #define STRCOLL_ENH__
 
 namespace funcexp

utils/funcexp/func_substring_index.cpp

@@ -21,10 +21,6 @@
 *
 *
 ****************************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-
 #include <string>
 using namespace std;
 
@@ -38,6 +34,8 @@ using namespace rowgroup;
 #include "joblisttypes.h"
 using namespace joblist;
 
+#include "collation.h"
+
 namespace funcexp
 {
 

utils/funcexp/func_trim.cpp

@@ -20,9 +20,6 @@
 *
 *
 ****************************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
 
 #include <string>
 using namespace std;
@@ -38,6 +35,8 @@ using namespace rowgroup;
 #include "joblisttypes.h"
 using namespace joblist;
 
+#include "collation.h"
+
 namespace funcexp
 {
 CalpontSystemCatalog::ColType Func_trim::operationType(FunctionParm& fp, CalpontSystemCatalog::ColType& resultType)

utils/funcexp/func_ucase.cpp

@@ -20,10 +20,6 @@
 *
 *
 ****************************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-#include <m_ctype.h>
 
 #include <string>
 using namespace std;
@@ -39,6 +35,8 @@ using namespace rowgroup;
 #include "joblisttypes.h"
 using namespace joblist;
 
+#include "collation.h"
+
 class to_upper
 {
 public:

utils/rowgroup/rowaggregation.cpp

@@ -24,10 +24,6 @@
  * is the primary class.
  */
 
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-
 #include <unistd.h>
 #include <sstream>
 #include <stdexcept>
@@ -55,6 +51,8 @@
 #include "calpontsystemcatalog.h"
 #include "utils_utf8.h"
 
+#include "collation.h"
+
 //..comment out NDEBUG to enable assertions, uncomment NDEBUG to disable
 //#define NDEBUG
 

utils/rowgroup/rowgroup.cpp

@@ -26,10 +26,6 @@
 // Author: Patrick LeBlanc <pleblanc@calpont.com>, (C) 2008
 //
 
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
-
 //#define NDEBUG
 #include <sstream>
 #include <iterator>
@@ -47,6 +43,8 @@ using namespace execplan;
 #include "nullvaluemanip.h"
 #include "rowgroup.h"
 
+#include "collation.h"
+
 namespace rowgroup
 {
 

utils/windowfunction/idborderby.cpp

@@ -18,9 +18,6 @@
 
 //  $Id: idborderby.cpp 3932 2013-06-25 16:08:10Z xlou $
 
-
-#include <mariadb.h>
-#include <m_ctype.h>
 #include <iostream>
 #include <cassert>
 #include <string>
@@ -51,6 +48,8 @@ using namespace rowgroup;
 
 #include "joblisttypes.h"
 
+#include "collation.h"
+
 // See agg_arg_charsets in sql_type.h to see conversion rules for 
 // items that have different char sets
 namespace ordering

writeengine/server/we_server.cpp

@@ -19,9 +19,6 @@
 * $Id: we_server.cpp 4700 2013-07-08 16:43:49Z bpaul $
 *
 *******************************************************************************/
-#include <mariadb.h>
-#undef set_bits  // mariadb.h defines set_bits, which is incompatible with boost
-#include <my_sys.h>
 
 #include <unistd.h>
 #include <iostream>
@@ -44,7 +41,6 @@ using namespace messageqcpp;
 using namespace threadpool;
 
 #include "we_readthread.h"
-using namespace WriteEngine;
 
 #include "liboamcpp.h"
 using namespace oam;
@@ -56,6 +52,10 @@ using namespace oam;
 
 #include "crashtrace.h"
 
+#include "collation.h"
+
+using namespace WriteEngine;
+
 namespace
 {
 void added_a_pm(int)