WIP: files

include/CMakeLists.txt

@@ -41,12 +41,12 @@ set(libcaosdb_INCL
     ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/utility.h
     ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/register_file_upload_handler.h
     ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/Client.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/UploadRequestHandler.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/DownloadRequestHandler.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/FileWriter.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/FileReader.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/FileLock.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/FileError.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/upload_request_handler.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/download_request_handler.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/file_writer.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/file_reader.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/file_lock.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/file_error.h
     )
 
 # pass variable to parent scope

include/caosdb/file_transmission/DownloadRequestHandler.h → include/caosdb/file_transmission/download_request_handler.h

 #include "caosdb/entity.h"                        // for FileDescriptor
 #include "caosdb/entity/v1alpha1/main.grpc.pb.h"  // for FileTransmissionS...
 #include "caosdb/entity/v1alpha1/main.pb.h"       // for FileDownloadResponse
-#include "caosdb/file_transmission/FileWriter.h"  // for FileWriter
+#include "caosdb/file_transmission/file_writer.h" // for FileWriter
 #include "caosdb/handler_interface.h"             // for HandlerTag, Handl...
 #include "caosdb/transaction_status.h"            // for TransactionStatus
 #include <grpcpp/impl/codegen/async_stream.h>     // for ClientAsyncReader

include/caosdb/file_transmission/FileReader.h → include/caosdb/file_transmission/file_reader.h

 #pragma once
 
-#include "caosdb/file_transmission/FileLock.h" // for FileMutex, FileReadLock
+#include "caosdb/file_transmission/file_lock.h" // for FileMutex, FileReadLock
 #include <boost/filesystem/fstream.hpp>         // for ifstream
 #include <boost/filesystem/operations.hpp>      // for exists
 #include <boost/filesystem/path.hpp>            // for path

include/caosdb/file_transmission/FileWriter.h → include/caosdb/file_transmission/file_writer.h

 #pragma once
 
-#include "caosdb/file_transmission/FileLock.h" // for FileMutex, FileWriteLock
+#include "caosdb/file_transmission/file_lock.h" // for FileMutex, FileWriteLock
 #include <boost/filesystem/path.hpp>            // for path
 #include <fstream>                              // for ofstream
 #include <memory>                               // for shared_ptr

include/caosdb/file_transmission/UploadRequestHandler.h → include/caosdb/file_transmission/upload_request_handler.h

 #include "caosdb/entity.h"                        // for FileDescriptor
 #include "caosdb/entity/v1alpha1/main.grpc.pb.h"  // for FileTransmissionS...
 #include "caosdb/entity/v1alpha1/main.pb.h"       // for FileUploadRequest
-#include "caosdb/file_transmission/FileReader.h"  // for FileReader
+#include "caosdb/file_transmission/file_reader.h" // for FileReader
 #include "caosdb/handler_interface.h"             // for HandlerTag, Handl...
 #include "caosdb/transaction_status.h"            // for TransactionStatus
 #include <cstdint>                                // for uint64_t

src/CMakeLists.txt

@@ -31,11 +31,11 @@ set(libcaosdb_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/transaction_handler.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/unary_rpc_handler.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/register_file_upload_handler.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/Client.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/UploadRequestHandler.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/DownloadRequestHandler.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/FileWriter.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/FileReader.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/client.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/upload_request_handler.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/download_request_handler.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/file_writer.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/file_reader.cpp
     )
 
 # pass variable to parent scope

src/caosdb/file_transmission/Client.cpp → src/caosdb/file_transmission/client.cpp

 #include "caosdb/file_transmission/Client.h"
-#include "caosdb/file_transmission/DownloadRequestHandler.h" // for DownloadReq...
-#include "caosdb/file_transmission/UploadRequestHandler.h" // for UploadReque...
+#include "caosdb/file_transmission/download_request_handler.h" // for DownloadReq...
+#include "caosdb/file_transmission/upload_request_handler.h" // for UploadReque...
 #include "caosdb/logging.h"                           // for CAOSDB_LOG_...
 #include "caosdb/status_code.h"                       // for StatusCode
 #include <boost/log/core/record.hpp>                  // for record

src/caosdb/file_transmission/DownloadRequestHandler.cpp → src/caosdb/file_transmission/download_request_handler.cpp

-#include "caosdb/file_transmission/DownloadRequestHandler.h"
+#include "caosdb/file_transmission/download_request_handler.h"
 #include "caosdb/exceptions.h"                         // for Exception
 #include "caosdb/logging.h"                            // for CAOSDB_LOG_TRACE
 #include "caosdb/protobuf_helper.h"                    // for get_arena

src/caosdb/file_transmission/FileReader.cpp → src/caosdb/file_transmission/file_reader.cpp

-#include "caosdb/file_transmission/FileReader.h"
-#include "caosdb/file_transmission/FileError.h" // for FileIOError, FileLockError
+#include "caosdb/file_transmission/file_reader.h"
+#include "caosdb/file_transmission/file_error.h" // for FileIOError, FileLockError
 #include <boost/filesystem/path.hpp>             // for path
 #include <mutex>                                 // for try_to_lock
 #include <utility>                               // for move

src/caosdb/file_transmission/FileWriter.cpp → src/caosdb/file_transmission/file_writer.cpp

-#include "caosdb/file_transmission/FileWriter.h"
-#include "caosdb/file_transmission/FileError.h" // for FileIOError, FileLockError
+#include "caosdb/file_transmission/file_writer.h"
+#include "caosdb/file_transmission/file_error.h" // for FileIOError, FileLockError
 #include <boost/filesystem/path.hpp>             // for path
 #include <mutex>                                 // for try_to_lock
 #include <utility>                               // for move

src/caosdb/file_transmission/UploadRequestHandler.cpp → src/caosdb/file_transmission/upload_request_handler.cpp

-#include "caosdb/file_transmission/UploadRequestHandler.h"
+#include "caosdb/file_transmission/upload_request_handler.h"
 #include "caosdb/exceptions.h"                         // for Exception
 #include "caosdb/logging.h"                            // for CAOSDB_LOG_ERROR
 #include "caosdb/protobuf_helper.h"                    // for get_arena

src/caosdb/transaction.cpp

@@ -22,6 +22,7 @@
 #include "caosdb/entity/v1alpha1/main.pb.h"      // for TransactionRe...
 #include "caosdb/file_transmission/Client.h"     // for FileExchangeC...
 #include "caosdb/file_transmission/register_file_upload_handler.h"
+#include "caosdb/file_transmission/upload_request_handler.h" // Uplo...
 #include "caosdb/logging.h"         // for CAOSDB_LOG_FATAL
 #include "caosdb/protobuf_helper.h" // for get_arena
 #include "caosdb/status_code.h"     // for StatusCode
@@ -285,7 +286,6 @@ auto Transaction::ExecuteAsynchronously() noexcept -> StatusCode {
     CAOSDB_LOG_INFO(logger_name)
       << "Number of files to be uploaded: " << upload_files.size();
 
-    // TODO(tf): Use Arena
     auto *registration_request =
       Arena::CreateMessage<RegisterFileUploadRequest>(GetArena());
     auto *registration_response =
@@ -302,15 +302,15 @@ auto Transaction::ExecuteAsynchronously() noexcept -> StatusCode {
       return StatusCode::EXECUTING;
     }
 
-    FileExchangeClient upload_client(file_service);
-    for (auto file_descriptor : upload_files) {
+    for (auto &file_descriptor : upload_files) {
       file_descriptor.file_transmission_id->set_registration_id(
         registration_response->registration_id());
       CAOSDB_LOG_INFO(logger_name)
         << "Uploading " << file_descriptor.local_path;
-      auto file_upload_status = upload_client.upload(file_descriptor);
-      if (file_upload_status != StatusCode::SUCCESS) {
-        this->status = TransactionStatus::FILE_UPLOAD_ERROR();
+      handler_ = std::make_unique<UploadRequestHandler>(
+        &handler_, file_service.get(), &completion_queue, file_descriptor);
+      this->status = ProcessCalls();
+      if (this->status.GetCode() != StatusCode::SUCCESS) {
         return StatusCode::EXECUTING;
       }
     }

test/test_file_transmission.cpp

-#include "caosdb/file_transmission/FileWriter.h"
-#include "caosdb/file_transmission/FileReader.h"
+#include "caosdb/file_transmission/file_writer.h"
+#include "caosdb/file_transmission/file_reader.h"
 #include <boost/filesystem/operations.hpp>  // for exists, file_size, remove
 #include <boost/filesystem/path.hpp>        // for path
 #include <boost/filesystem/path_traits.hpp> // for filesystem