NO SUBCHUNK MATERIALIZATION: cleanup at workers (1)

Author: iagaponenko

src/wbase/Task.cc

@@ -164,7 +164,7 @@ Task::Task(TaskMsgPtr const& t, int fragmentNumber, shared_ptr<UserQueryInfo> co
     _scanInfo.sortTablesSlowestFirst();
     _scanInteractive = t->scaninteractive();
     _maxTableSize = t->maxtablesize_mb() * ::MB_SIZE_BYTES;
-
+#if 0
     // Create sets and vectors for 'aquiring' subchunk temporary tables.
     proto::TaskMsg_Fragment const& fragment(t->fragment(_queryFragmentNum));
     DbTableSet dbTbls_;
@@ -203,6 +203,7 @@ Task::Task(TaskMsgPtr const& t, int fragmentNumber, shared_ptr<UserQueryInfo> co
                               << " subChunks=" << util::printable(subchunksVect_));
     }
     _dbTblsAndSubchunks = make_unique<DbTblsAndSubchunks>(dbTbls_, subchunksVect_);
+#endif
     if (_sendChannel == nullptr) {
         throw util::Bug(ERR_LOC, "Task::Task _sendChannel==null " + getIdStr());
     }

src/wbase/Task.h

@@ -126,7 +126,7 @@ class Task : public util::CommandForThreadPool {
     static std::string const defaultUser;
     using Ptr = std::shared_ptr<Task>;
     using TaskMsgPtr = std::shared_ptr<proto::TaskMsg>;
-
+#if 0
     /// Class to store constant sets and vectors.
     class DbTblsAndSubchunks {
     public:
@@ -144,7 +144,7 @@ class Task : public util::CommandForThreadPool {
         /// Vector of subchunkIds. Set in constructor and should never change.
         const IntVector subchunksVect;
     };
-
+#endif
     struct ChunkEqual {
         bool operator()(Ptr const& x, Ptr const& y);
     };
@@ -272,10 +272,7 @@ class Task : public util::CommandForThreadPool {
     int getSubchunkId() const { return _subchunkId; }
 
     /// Returns a reference to dbTbls.
-    const DbTableSet& getDbTbls() const { return _dbTblsAndSubchunks->dbTbls; }
-
-    /// Return a reference to the list of subchunk ids.
-    const IntVector& getSubchunksVect() const { return _dbTblsAndSubchunks->subchunksVect; }
+    // const DbTableSet& getDbTbls() const { return _dbTblsAndSubchunks->dbTbls; }
 
     /// Return an identifier of the corresponding MySQL query (if any was set).
     unsigned long getMySqlThreadId() const { return _mysqlThreadId.load(); }
@@ -317,7 +314,7 @@ class Task : public util::CommandForThreadPool {
     int const _czarId;                 ///< czar Id from the task message.
 
     /// Set of tables and vector of subchunk ids used by ChunkResourceRequest. Do not change/reset.
-    std::unique_ptr<DbTblsAndSubchunks> _dbTblsAndSubchunks;
+    // std::unique_ptr<DbTblsAndSubchunks> _dbTblsAndSubchunks;
 
     /// The path to the result file.
     std::string _resultFileAbsPath;