optimize dataResourceLoader

Author: cyjseagull

cpp/wedpr-computing/ppc-psi/src/ecdh-multi-psi/core/EcdhMultiPSICalculator.cpp

@@ -135,7 +135,7 @@ void EcdhMultiPSICalculator::loadAndEncrypt(std::string _taskID, bcos::bytes _ra
                 uint32_t(EcdhMultiPSIMessageType::SEND_ENCRYPTED_SET_TO_MASTER_FROM_CALCULATOR));
             message->constructDataMap(encryptedData, dataOffset);
             // release the encryptedData
-            std::vector<bcos::bytes>.swap(encryptedData);
+            std::vector<bcos::bytes>().swap(encryptedData);
             message->setFrom(m_taskState->task()->selfParty()->id());
             if (reader->readFinished())
             {
@@ -267,7 +267,7 @@ void EcdhMultiPSICalculator::onReceiveMasterCipher(PSIMessageInterface::Ptr _msg
             }
         });
         // release the cipher
-        std::vector<bcos::bytes>.swap(cipher);
+        std::vector<bcos::bytes>().swap(cipher);
 
         auto seq = _msg->seq();
         bool finished = m_calculatorCache->appendMasterCipher(

cpp/wedpr-storage/ppc-io/src/DataResourceLoaderImpl.cpp

@@ -32,6 +32,34 @@ using namespace ppc::storage;
 using namespace ppc::protocol;
 using namespace bcos;
 
+
+DataResourceLoaderImpl::DataResourceLoaderImpl(
+    ppc::protocol::SQLConnectionOption::Ptr const& _sqlConnectionOpt,
+    ppc::protocol::FileStorageConnectionOption::Ptr const& _fileStorageConnectionOpt,
+    ppc::protocol::RemoteStorageConnectionOption::Ptr const& _remoteStorageConnectionOpt,
+    ppc::storage::SQLStorageFactory::Ptr const& _sqlStorageFactory,
+    ppc::storage::FileStorageFactory::Ptr const& _fileStorageFactory,
+    ppc::storage::RemoteStorageFactory::Ptr const& _remoteStorageFactory)
+  : m_sqlConnectionOpt(_sqlConnectionOpt),
+    m_fileStorageConnectionOpt(_fileStorageConnectionOpt),
+    m_remoteStorageConnectionOpt(_remoteStorageConnectionOpt),
+    m_sqlStorageFactory(_sqlStorageFactory),
+    m_fileStorageFactory(_fileStorageFactory),
+    m_remoteStorageFactory(_remoteStorageFactory)
+{
+    if (m_fileStorageConnectionOpt)
+    {
+        m_hdfsStorage = m_fileStorageFactory->createFileStorage(
+            DataResourceType::HDFS, m_fileStorageConnectionOpt);
+    }
+    if (m_sqlConnectionOpt)
+    {
+        m_sqlStorage =
+            m_sqlStorageFactory->createSQLStorage(DataResourceType::MySQL, m_sqlConnectionOpt);
+    }
+}
+
+
 LineReader::Ptr DataResourceLoaderImpl::loadReader(DataResourceDesc::ConstPtr _desc,
     DataSchema _schema, bool _parseByColumn, FileStorage::Ptr const& _fileStorage)
 {
@@ -76,8 +104,7 @@ LineReader::Ptr DataResourceLoaderImpl::loadSQLResource(
     }
     else if (m_sqlConnectionOpt)
     {
-        storage = m_sqlStorageFactory->createSQLStorage(
-            (ppc::protocol::DataResourceType)_desc->type(), m_sqlConnectionOpt);
+        storage = m_sqlStorage;
     }
     else
     {
@@ -106,8 +133,7 @@ LineReader::Ptr DataResourceLoaderImpl::loadHDFSResource(
         }
         else if (m_fileStorageConnectionOpt)
         {
-            storage = m_fileStorageFactory->createFileStorage(
-                (ppc::protocol::DataResourceType)_desc->type(), m_fileStorageConnectionOpt);
+            storage = m_hdfsStorage;
         }
         else
         {
@@ -144,8 +170,7 @@ void DataResourceLoaderImpl::deleteResource(
             }
             else if (m_fileStorageConnectionOpt)
             {
-                storage = m_fileStorageFactory->createFileStorage(
-                    (ppc::protocol::DataResourceType)_desc->type(), m_fileStorageConnectionOpt);
+                storage = m_hdfsStorage;
             }
             else
             {
@@ -194,8 +219,7 @@ void DataResourceLoaderImpl::renameResource(ppc::protocol::DataResourceDesc::Con
             }
             else if (m_fileStorageConnectionOpt)
             {
-                storage = m_fileStorageFactory->createFileStorage(
-                    (ppc::protocol::DataResourceType)_desc->type(), m_fileStorageConnectionOpt);
+                storage = m_hdfsStorage;
             }
             else
             {
@@ -253,8 +277,7 @@ void DataResourceLoaderImpl::checkResourceExists(
             }
             else if (m_fileStorageConnectionOpt)
             {
-                storage = m_fileStorageFactory->createFileStorage(
-                    (ppc::protocol::DataResourceType)_desc->type(), m_fileStorageConnectionOpt);
+                storage = m_hdfsStorage;
             }
             else
             {
@@ -307,9 +330,7 @@ LineWriter::Ptr DataResourceLoaderImpl::loadWriter(
             }
             else if (m_fileStorageConnectionOpt)
             {
-                // create the hdfsStorage
-                storage = m_fileStorageFactory->createFileStorage(
-                    (ppc::protocol::DataResourceType)_desc->type(), m_fileStorageConnectionOpt);
+                storage = m_hdfsStorage;
             }
             else
             {

cpp/wedpr-storage/ppc-io/src/DataResourceLoaderImpl.h

@@ -35,14 +35,7 @@ class DataResourceLoaderImpl : public DataResourceLoader
         ppc::protocol::RemoteStorageConnectionOption::Ptr const& _remoteStorageConnectionOpt,
         ppc::storage::SQLStorageFactory::Ptr const& _sqlStorageFactory,
         ppc::storage::FileStorageFactory::Ptr const& _fileStorageFactory,
-        ppc::storage::RemoteStorageFactory::Ptr const& _remoteStorageFactory)
-      : m_sqlConnectionOpt(_sqlConnectionOpt),
-        m_fileStorageConnectionOpt(_fileStorageConnectionOpt),
-        m_remoteStorageConnectionOpt(_remoteStorageConnectionOpt),
-        m_sqlStorageFactory(_sqlStorageFactory),
-        m_fileStorageFactory(_fileStorageFactory),
-        m_remoteStorageFactory(_remoteStorageFactory)
-    {}
+        ppc::storage::RemoteStorageFactory::Ptr const& _remoteStorageFactory);
 
     DataResourceLoaderImpl() = default;
     ~DataResourceLoaderImpl() override = default;
@@ -71,8 +64,13 @@ class DataResourceLoaderImpl : public DataResourceLoader
         ppc::storage::FileStorage::Ptr const& _fileStorage);
 
 private:
+    // the sql storage
     ppc::protocol::SQLConnectionOption::Ptr m_sqlConnectionOpt;
+    ppc::storage::SQLStorage::Ptr m_sqlStorage;
+    // the hdfs storage
     ppc::protocol::FileStorageConnectionOption::Ptr m_fileStorageConnectionOpt;
+    ppc::storage::FileStorage::Ptr m_hdfsStorage;
+
     ppc::protocol::RemoteStorageConnectionOption::Ptr m_remoteStorageConnectionOpt;
 
     ppc::storage::SQLStorageFactory::Ptr m_sqlStorageFactory;