remove old redurant code (impl construct req) (#92)

* remove old redurant code (impl construct req) * + defininion remove
open-gpdb · Feb 5, 2025 · 855e25e · 855e25e
1 parent 6cdf699
commit 855e25e
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 236 deletions.
diff --git a/include/yproxy_connector.h b/include/yproxy_connector.h
@@ -26,19 +26,6 @@ struct storageChunkMeta {
   std::string chunkName;
 };
 
-static std::vector<char> CommonCostructCommandCompleteRequestOld() {
-  std::vector<char> buff(MSG_HEADER_SIZE + PROTO_HEADER_SIZE, 0);
-  buff[8] = MessageTypeCommandComplete;
-  uint64_t len = MSG_HEADER_SIZE + PROTO_HEADER_SIZE;
-
-  uint64_t cp = len;
-  for (ssize_t i = 7; i >= 0; --i) {
-    buff[i] = cp & ((1 << 8) - 1);
-    cp >>= 8;
-  }
-
-  return buff;
-}
 
 static std::vector<char> CommonCostructCommandCompleteRequest() {
   MsgBuilder builder = MsgBuilder().fieldProto().endDescription();

diff --git a/include/yproxy_deleter.h b/include/yproxy_deleter.h
@@ -25,7 +25,6 @@ class YProxyDeleter : YProxyConnector {
   /* prepare connection for chunk reading */
   std::vector<char> ConstructDeleteRequest(std::string fileName);
 
-  std::vector<char> ConstructDeleteRequestOld(std::string fileName);
   virtual int prepareYproxyConnection();
 
 private:

diff --git a/include/yproxy_lister.h b/include/yproxy_lister.h
@@ -17,7 +17,6 @@ class YProxyLister : YProxyConnector {
 protected:
   std::vector<char> ConstructListRequest(std::string fileName);
 
-  std::vector<char> ConstructListRequestOld(std::string fileName);
   virtual int prepareYproxyConnection();
 
   struct message {

diff --git a/include/yproxy_reader.h b/include/yproxy_reader.h
@@ -24,8 +24,6 @@ class YProxyReader : YProxyConnector {
 protected:
   /* prepare connection for chunk reading */
   std::vector<char> ConstructCatRequest(const ChunkInfo &ci, size_t start_off);
-  std::vector<char> ConstructCatRequestOld(const ChunkInfo &ci,
-                                           size_t start_off);
   virtual int prepareYproxyConnection(const ChunkInfo &ci, size_t start_off);
 
 private:

diff --git a/include/yproxy_writer.h b/include/yproxy_writer.h
@@ -19,9 +19,6 @@ class YProxyWriter : YProxyConnector {
   std::vector<char> ConstructPutRequest(std::string fileName);
   std::vector<char> ConstructCopyDataRequest(const char *buffer, size_t amount);
 
-  std::vector<char> ConstructPutRequestOld(std::string fileName);
-  std::vector<char> ConstructCopyDataRequestOld(const char *buffer,
-                                                size_t amount);
   virtual int prepareYproxyConnection();
 
 private:

diff --git a/src/yproxy_deleter.cpp b/src/yproxy_deleter.cpp
@@ -50,49 +50,6 @@ bool YProxyDeleter::deleteChunk(const std::string &chunkName) {
         Confirm bool
         Garbage bool
 */
-std::vector<char>
-YProxyDeleter::ConstructDeleteRequestOld(std::string fileName) {
-  std::vector<char> buff(MSG_HEADER_SIZE + PROTO_HEADER_SIZE + fileName.size() +
-                             1 + OFFSET_SZ + OFFSET_SZ,
-                         0);
-  buff[8] = MessageTypeDelete;
-  /* confirm */
-  buff[9] = confirm_;
-  /* garbage */
-  buff[10] = garbage_cleanup_;
-
-  uint64_t len = buff.size();
-
-  uint64_t cp = len;
-  for (ssize_t i = 7; i >= 0; --i) {
-    buff[i] = cp & ((1 << 8) - 1);
-    cp >>= 8;
-  }
-
-  strncpy(buff.data() + MSG_HEADER_SIZE + PROTO_HEADER_SIZE, fileName.c_str(),
-          fileName.size());
-
-  uint64_t port = PostPortNumber;
-
-  int off = MSG_HEADER_SIZE + PROTO_HEADER_SIZE + fileName.size() + 1;
-
-  for (ssize_t i = off + 7; i >= off; --i) {
-    buff[i] = port & ((1 << 8) - 1);
-    port >>= 8;
-  }
-
-  off += OFFSET_SZ;
-
-  uint64_t segId = segindx_;
-  for (ssize_t i = off + 7; i >= off; --i) {
-    buff[i] = segId & ((1 << 8) - 1);
-    segId >>= 8;
-  }
-
-  off += OFFSET_SZ;
-  return buff;
-}
-
 std::vector<char> YProxyDeleter::ConstructDeleteRequest(std::string fileName) {
 
   MsgBuilder builder = MsgBuilder()

diff --git a/src/yproxy_lister.cpp b/src/yproxy_lister.cpp
@@ -62,24 +62,6 @@ std::vector<std::string> YProxyLister::list_chunk_names() {
   return res;
 }
 
-std::vector<char> YProxyLister::ConstructListRequestOld(std::string fileName) {
-  std::vector<char> buff(
-      MSG_HEADER_SIZE + PROTO_HEADER_SIZE + fileName.size() + 1, 0);
-  buff[8] = MessageTypeList;
-  uint64_t len = buff.size();
-
-  strncpy(buff.data() + MSG_HEADER_SIZE + PROTO_HEADER_SIZE, fileName.c_str(),
-          fileName.size());
-
-  uint64_t cp = len;
-  for (ssize_t i = 7; i >= 0; --i) {
-    buff[i] = cp & ((1 << 8) - 1);
-    cp >>= 8;
-  }
-
-  return buff;
-}
-
 std::vector<char> YProxyLister::ConstructListRequest(std::string fileName) {
   MsgBuilder builder =
       MsgBuilder().fieldProto().fieldString(fileName.size()).endDescription();

diff --git a/src/yproxy_reader.cpp b/src/yproxy_reader.cpp
@@ -12,76 +12,6 @@ YProxyReader::~YProxyReader() { close(); }
 
 bool YProxyReader::close() { return YProxyConnector::close(); }
 
-std::vector<char> YProxyReader::ConstructCatRequestOld(const ChunkInfo &ci,
-                                                       size_t start_off) {
-
-  uint64_t settingsCnt = 1;
-  uint64_t settingsMsgSpace = 0;
-
-  std::vector<std::pair<std::string, std::string>> settings = {
-      {"TableSpace", adv_->tableSpace},
-  };
-
-  for (uint64_t j = 0; j < settingsCnt; ++j) {
-    settingsMsgSpace += settings[j].first.size() + 1;
-    settingsMsgSpace += settings[j].second.size() + 1;
-  }
-
-  std::vector<char> buff(MSG_HEADER_SIZE + PROTO_HEADER_SIZE +
-                             ci.x_path.size() + 1 + OFFSET_SZ +
-                             MSG_HEADER_SIZE + settingsMsgSpace,
-                         0);
-  buff[8] = MessageTypeCatV2;
-  if (ci.enc) {
-    buff[9] = DecryptRequest;
-  } else {
-    buff[9] = NoDecryptRequest;
-  }
-
-  if (start_off != 0) {
-    buff[10] = ExtendedMessage;
-  }
-  uint64_t len = buff.size();
-
-  strncpy(buff.data() + MSG_HEADER_SIZE + PROTO_HEADER_SIZE, ci.x_path.c_str(),
-          ci.x_path.size());
-
-  uint64_t cp = len;
-  for (ssize_t i = 7; i >= 0; --i) {
-    buff[i] = cp & ((1 << 8) - 1);
-    cp >>= 8;
-  }
-
-  cp = start_off;
-  for (ssize_t i = 7; i >= 0; --i) {
-    buff[MSG_HEADER_SIZE + PROTO_HEADER_SIZE + ci.x_path.size() + 1 + i] =
-        cp & ((1 << 8) - 1);
-    cp >>= 8;
-  }
-
-  uint64_t settings_offset =
-      MSG_HEADER_SIZE + PROTO_HEADER_SIZE + ci.x_path.size() + 1 + OFFSET_SZ;
-
-  cp = settingsCnt;
-  for (ssize_t i = 7; i >= 0; --i) {
-    buff[settings_offset + i] = cp & ((1 << 8) - 1);
-    cp >>= 8;
-  }
-
-  settings_offset += MSG_HEADER_SIZE;
-
-  for (uint64_t j = 0; j < settingsCnt; ++j) {
-    strncpy(buff.data() + settings_offset, settings[j].first.c_str(),
-            settings[j].first.size());
-    settings_offset += settings[j].first.size() + 1;
-
-    strncpy(buff.data() + settings_offset, settings[j].second.c_str(),
-            settings[j].second.size());
-    settings_offset += settings[j].second.size() + 1;
-  }
-
-  return buff;
-}
 
 std::vector<char> YProxyReader::ConstructCatRequest(const ChunkInfo &ci,
                                                     size_t start_off) {

diff --git a/src/yproxy_writer.cpp b/src/yproxy_writer.cpp
@@ -76,69 +76,6 @@ int YProxyWriter::prepareYproxyConnection() {
   return 0;
 }
 
-std::vector<char> YProxyWriter::ConstructPutRequestOld(std::string fileName) {
-  uint64_t settingsCnt = 4;
-  uint64_t settingsMsgSpace = 0;
-
-  std::vector<std::pair<std::string, std::string>> settings = {
-      {"StorageClass", adv_->storage_class},
-      {"MultipartChunksize", std::to_string(adv_->multipart_chunksize)},
-      {"MultipartUpload", adv_->multipart_upload ? "1" : "0"},
-      {"TableSpace", adv_->tableSpace},
-  };
-
-  for (uint64_t j = 0; j < settingsCnt; ++j) {
-    settingsMsgSpace += settings[j].first.size() + 1;
-    settingsMsgSpace += settings[j].second.size() + 1;
-  }
-
-  std::vector<char> buff(MSG_HEADER_SIZE + PROTO_HEADER_SIZE + fileName.size() +
-                             1 + MSG_HEADER_SIZE + settingsMsgSpace,
-                         0);
-
-  uint64_t len = buff.size();
-
-  uint64_t cp = len;
-  for (ssize_t i = 7; i >= 0; --i) {
-    buff[i] = cp & ((1 << 8) - 1);
-    cp >>= 8;
-  }
-
-  buff[8] = MessageTypePutV2;
-
-  if (adv_->use_gpg_crypto) {
-    buff[9] = EncryptRequest;
-  } else {
-    buff[9] = NoEncryptRequest;
-  }
-
-  strncpy(buff.data() + MSG_HEADER_SIZE + PROTO_HEADER_SIZE, fileName.c_str(),
-          fileName.size());
-  /* no need to set null byte */
-
-  uint64_t settings_offset =
-      MSG_HEADER_SIZE + PROTO_HEADER_SIZE + fileName.size() + 1;
-
-  cp = settingsCnt;
-  for (ssize_t i = 7; i >= 0; --i) {
-    buff[settings_offset + i] = cp & ((1 << 8) - 1);
-    cp >>= 8;
-  }
-
-  settings_offset += MSG_HEADER_SIZE;
-
-  for (uint64_t j = 0; j < settingsCnt; ++j) {
-    strncpy(buff.data() + settings_offset, settings[j].first.c_str(),
-            settings[j].first.size());
-    settings_offset += settings[j].first.size() + 1;
-
-    strncpy(buff.data() + settings_offset, settings[j].second.c_str(),
-            settings[j].second.size());
-    settings_offset += settings[j].second.size() + 1;
-  }
-
-  return buff;
-}
 
 std::vector<char> YProxyWriter::ConstructPutRequest(std::string fileName) {
   uint64_t settingsCnt = 4;
@@ -171,28 +108,6 @@ std::vector<char> YProxyWriter::ConstructPutRequest(std::string fileName) {
   return builder.get();
 }
 
-std::vector<char> YProxyWriter::ConstructCopyDataRequestOld(const char *buffer,
-                                                            size_t amount) {
-  std::vector<char> buff(MSG_HEADER_SIZE + PROTO_HEADER_SIZE + 8 + amount, 0);
-  buff[8] = MessageTypeCopyData;
-  uint64_t len = buff.size();
-
-  memcpy(buff.data() + 20, buffer, amount);
-
-  uint64_t cp = amount;
-  for (ssize_t i = 19; i >= 12; --i) {
-    buff[i] = cp & ((1 << 8) - 1);
-    cp >>= 8;
-  }
-
-  cp = len;
-  for (ssize_t i = 7; i >= 0; --i) {
-    buff[i] = cp & ((1 << 8) - 1);
-    cp >>= 8;
-  }
-
-  return buff;
-}
 
 std::vector<char> YProxyWriter::ConstructCopyDataRequest(const char *buffer,
                                                          size_t amount) {