Merge pull request mariadb-corporation#2811 from mariadb-corporation/remove-boost-shared-array

Remove boost shared array

Author: drrtuy

dbcon/execplan/sessionmanager.cpp

@@ -119,7 +119,7 @@ const TxnID SessionManager::getTxnID(const SID session)
   return ret;
 }
 
-boost::shared_array<SIDTIDEntry> SessionManager::SIDTIDMap(int& len)
+std::shared_ptr<SIDTIDEntry[]> SessionManager::SIDTIDMap(int& len)
 {
   // is this cast valid?
   return dbrm.SIDTIDMap(len);
@@ -150,7 +150,7 @@ bool SessionManager::checkActiveTransaction(const SID sessionId, bool& bIsDbrmUp
   bIsDbrmUp = true;
   int arrayLenth = 0;
   bool ret = false;
-  boost::shared_array<SIDTIDEntry> sIDTIDMap;
+  std::shared_ptr<SIDTIDEntry[]> sIDTIDMap;
 
   sIDTIDMap = SIDTIDMap(arrayLenth);
 
@@ -178,7 +178,7 @@ bool SessionManager::isTransactionActive(const SID sessionId, bool& bIsDbrmUp)
   bIsDbrmUp = true;
   int arrayLenth = 0;
   bool ret = false;
-  boost::shared_array<SIDTIDEntry> sIDTIDMap;
+  std::shared_ptr<SIDTIDEntry[]> sIDTIDMap;
 
   sIDTIDMap = SIDTIDMap(arrayLenth);
 

dbcon/execplan/sessionmanager.h

@@ -28,7 +28,6 @@
 
 #include "calpontsystemcatalog.h"
 #include "brm.h"
-#include "boost/shared_array.hpp"
 
 namespace execplan
 {
@@ -174,7 +173,7 @@ class SessionManager
    * @return A pointer to the array.  Note: The caller is responsible for
    * deallocating it.  Use delete[].
    */
-  boost::shared_array<BRM::SIDTIDEntry> SIDTIDMap(int& len);
+  std::shared_ptr<BRM::SIDTIDEntry[]> SIDTIDMap(int& len);
 
   /** @brief Returns a unique uint32_t.  It eventually wraps around, but who cares.
    *

dbcon/joblist/batchprimitiveprocessor-jl.cpp

@@ -873,7 +873,7 @@ void BatchPrimitiveProcessorJL::getRowGroupData(ByteStream& in, vector<RGData>*
 
     if (!pmSendsFinalResult() || pmSendsMatchesAnyway)
     {
-      boost::shared_array<vector<uint32_t> > joinResults;
+      std::shared_ptr<vector<uint32_t>[]> joinResults;
       uint32_t i, j;
 
       if (pmSendsMatchesAnyway)
@@ -920,7 +920,6 @@ void BatchPrimitiveProcessorJL::getRowGroupData(ByteStream& in, vector<RGData>*
   idbassert(in.length() == 0);
 }
 
-// boost::shared_array<uint8_t>
 RGData BatchPrimitiveProcessorJL::getErrorRowGroupData(uint16_t error) const
 {
   RGData ret;

dbcon/joblist/batchprimitiveprocessor-jl.h

@@ -184,8 +184,7 @@ class BatchPrimitiveProcessorJL
     return status;
   }
   void runErrorBPP(messageqcpp::ByteStream&);
-  //	uint32_t getErrorTableBand(uint16_t error, messageqcpp::ByteStream *out);
-  //	boost::shared_array<uint8_t> getErrorRowGroupData(uint16_t error) const;
+
   rowgroup::RGData getErrorRowGroupData(uint16_t error) const;
 
   // @bug 1098

dbcon/joblist/crossenginestep.cpp

@@ -27,7 +27,7 @@
 using namespace std;
 
 #include <boost/shared_ptr.hpp>
-#include <boost/shared_array.hpp>
+
 #include <boost/uuid/uuid_io.hpp>
 using namespace boost;
 
@@ -408,7 +408,6 @@ void CrossEngineStep::execute()
     int num_fields = mysql->getFieldCount();
 
     char** rowIn;  // input
-    // shared_array<uint8_t> rgDataDelivered;      // output
     RGData rgDataDelivered;
     fRowGroupAdded.initRow(&fRowDelivered);
     // use getDataSize() i/o getMaxDataSize() to make sure there are 8192 rows.
@@ -438,7 +437,7 @@ void CrossEngineStep::execute()
 
     else if (doFE1 && !doFE3)  // FE in WHERE clause only
     {
-      shared_array<uint8_t> rgDataFe1;  // functions in where clause
+      std::shared_ptr<uint8_t[]> rgDataFe1;  // functions in where clause
       Row rowFe1;                       // row for fe evaluation
       fRowGroupFe1.initRow(&rowFe1, true);
       rgDataFe1.reset(new uint8_t[rowFe1.getSize()]);
@@ -489,7 +488,7 @@ void CrossEngineStep::execute()
 
     else if (!doFE1 && doFE3)  // FE in SELECT clause only
     {
-      shared_array<uint8_t> rgDataFe3;  // functions in select clause
+      std::shared_ptr<uint8_t[]> rgDataFe3;  // functions in select clause
       Row rowFe3;                       // row for fe evaluation
       fRowGroupOut.initRow(&rowFe3, true);
       rgDataFe3.reset(new uint8_t[rowFe3.getSize()]);
@@ -510,13 +509,13 @@ void CrossEngineStep::execute()
 
     else  // FE in SELECT clause, FE join and WHERE clause
     {
-      shared_array<uint8_t> rgDataFe1;  // functions in where clause
+      std::shared_ptr<uint8_t[]> rgDataFe1;  // functions in where clause
       Row rowFe1;                       // row for fe1 evaluation
       fRowGroupFe1.initRow(&rowFe1, true);
       rgDataFe1.reset(new uint8_t[rowFe1.getSize()]);
       rowFe1.setData(rowgroup::Row::Pointer(rgDataFe1.get()));
 
-      shared_array<uint8_t> rgDataFe3;  // functions in select clause
+      std::shared_ptr<uint8_t[]> rgDataFe3;  // functions in select clause
       Row rowFe3;                       // row for fe3 evaluation
       fRowGroupOut.initRow(&rowFe3, true);
       rgDataFe3.reset(new uint8_t[rowFe3.getSize()]);
@@ -708,7 +707,6 @@ const RowGroup& CrossEngineStep::getDeliveredRowGroup() const
 
 uint32_t CrossEngineStep::nextBand(messageqcpp::ByteStream& bs)
 {
-  // shared_array<uint8_t> rgDataOut;
   RGData rgDataOut;
   bool more = false;
   uint32_t rowCount = 0;

dbcon/joblist/crossenginestep.h

@@ -178,7 +178,7 @@ class CrossEngineStep : public BatchPrimitive, public TupleDeliveryStep
   virtual std::string makeQuery();
   virtual void setField(int, const char*, unsigned long, MYSQL_FIELD*, rowgroup::Row&);
   inline void addRow(rowgroup::RGData&);
-  // inline  void addRow(boost::shared_array<uint8_t>&);
+
   template <typename T>
   T convertValueNum(const char*, const execplan::CalpontSystemCatalog::ColType&);
   virtual void formatMiniStats();
@@ -238,8 +238,8 @@ class CrossEngineStep : public BatchPrimitive, public TupleDeliveryStep
   std::map<uint32_t, uint32_t> fColumnMap;  // projected key position (k->p)
   uint64_t fColumnCount;
   boost::scoped_array<int> fFe1Column;
-  boost::shared_array<int> fFeMapping1;
-  boost::shared_array<int> fFeMapping3;
+  std::shared_ptr<int[]> fFeMapping1;
+  std::shared_ptr<int[]> fFeMapping3;
   rowgroup::RowGroup fRowGroupFe1;
   rowgroup::RowGroup fRowGroupFe3;
 

dbcon/joblist/diskjoinstep.cpp

@@ -359,9 +359,9 @@ void DiskJoinStep::joinFcn()
   Row l_largeRow;
   Row l_joinFERow, l_outputRow, baseRow;
   vector<vector<Row::Pointer> > joinMatches;
-  boost::shared_array<Row> smallRowTemplates(new Row[1]);
+  std::shared_ptr<Row[]> smallRowTemplates(new Row[1]);
   vector<std::shared_ptr<TupleJoiner>> joiners;
-  boost::shared_array<boost::shared_array<int> > colMappings, fergMappings;
+  std::shared_ptr<std::shared_ptr<int[]>[]> colMappings, fergMappings;
   boost::scoped_array<boost::scoped_array<uint8_t> > smallNullMem;
   boost::scoped_array<uint8_t> joinFEMem;
   Row smallNullRow;
@@ -386,13 +386,13 @@ void DiskJoinStep::joinFcn()
   smallRG.initRow(&smallRowTemplates[0]);
   joiners.resize(1);
 
-  colMappings.reset(new boost::shared_array<int>[2]);
+  colMappings.reset(new std::shared_ptr<int[]>[2]);
   colMappings[0] = SOMapping;
   colMappings[1] = LOMapping;
 
   if (fe)
   {
-    fergMappings.reset(new boost::shared_array<int>[2]);
+    fergMappings.reset(new std::shared_ptr<int[]>[2]);
     fergMappings[0] = SjoinFEMapping;
     fergMappings[1] = LjoinFEMapping;
   }

dbcon/joblist/diskjoinstep.h

@@ -50,7 +50,7 @@ class DiskJoinStep : public JobStep
   boost::shared_ptr<RowGroupDL> largeDL, outputDL;
   RowGroupDL* smallDL;
 
-  boost::shared_array<int> LOMapping, SOMapping, SjoinFEMapping, LjoinFEMapping;
+  std::shared_ptr<int[]> LOMapping, SOMapping, SjoinFEMapping, LjoinFEMapping;
   TupleHashJoinStep* thjs;
   boost::shared_ptr<funcexp::FuncExpWrapper> fe;
   bool typeless;

dbcon/joblist/elementtype.h

@@ -26,7 +26,7 @@
 #include <utility>
 #include <string>
 #include <stdexcept>
-#include <boost/shared_array.hpp>
+
 #include <stdint.h>
 #include <rowgroup.h>
 

dbcon/joblist/expressionstep.cpp

@@ -24,7 +24,7 @@
 using namespace std;
 
 #include <boost/shared_ptr.hpp>
-#include <boost/shared_array.hpp>
+
 using namespace boost;
 
 #include "messagequeue.h"