Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F3529523
D5675.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
6 KB
Referenced Files
None
Subscribers
None
D5675.diff
View Options
diff --git a/services/blob/Dockerfile b/services/blob/Dockerfile
--- a/services/blob/Dockerfile
+++ b/services/blob/Dockerfile
@@ -13,7 +13,7 @@
WORKDIR /transferred
COPY services/lib/docker/ scripts/
-COPY services/blob/ blob
+COPY services/blob/old/ blob
COPY services/lib/src lib/src/
WORKDIR /transferred/blob
diff --git a/services/blob/CMakeLists.txt b/services/blob/old/CMakeLists.txt
rename from services/blob/CMakeLists.txt
rename to services/blob/old/CMakeLists.txt
--- a/services/blob/CMakeLists.txt
+++ b/services/blob/old/CMakeLists.txt
@@ -27,9 +27,11 @@
if(${CMAKE_CURRENT_SOURCE_DIR} MATCHES "^\/transferred.*")
# Inside the docker build contex
set(_proto_path "grpc")
+ set(_lib_path "../lib/src")
else()
# Inside repo
- set(_proto_path "../../shared/protos")
+ set(_proto_path "../../../shared/protos")
+ set(_lib_path "../../lib/src")
endif()
# Shared Comm protos
@@ -39,7 +41,7 @@
)
# Reference native/cpp projects
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../lib/src
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/${_lib_path}
${CMAKE_CURRENT_BINARY_DIR}/common # CMake's build directory
EXCLUDE_FROM_ALL # Don't build everything, just what we need
)
diff --git a/services/blob/src/AwsS3Bucket.h b/services/blob/old/src/AwsS3Bucket.h
rename from services/blob/src/AwsS3Bucket.h
rename to services/blob/old/src/AwsS3Bucket.h
diff --git a/services/blob/src/AwsS3Bucket.cpp b/services/blob/old/src/AwsS3Bucket.cpp
rename from services/blob/src/AwsS3Bucket.cpp
rename to services/blob/old/src/AwsS3Bucket.cpp
diff --git a/services/blob/src/BlobServiceImpl.h b/services/blob/old/src/BlobServiceImpl.h
rename from services/blob/src/BlobServiceImpl.h
rename to services/blob/old/src/BlobServiceImpl.h
diff --git a/services/blob/src/BlobServiceImpl.cpp b/services/blob/old/src/BlobServiceImpl.cpp
rename from services/blob/src/BlobServiceImpl.cpp
rename to services/blob/old/src/BlobServiceImpl.cpp
diff --git a/services/blob/src/Constants.h b/services/blob/old/src/Constants.h
rename from services/blob/src/Constants.h
rename to services/blob/old/src/Constants.h
diff --git a/services/blob/src/DatabaseEntities/BlobItem.h b/services/blob/old/src/DatabaseEntities/BlobItem.h
rename from services/blob/src/DatabaseEntities/BlobItem.h
rename to services/blob/old/src/DatabaseEntities/BlobItem.h
diff --git a/services/blob/src/DatabaseEntities/BlobItem.cpp b/services/blob/old/src/DatabaseEntities/BlobItem.cpp
rename from services/blob/src/DatabaseEntities/BlobItem.cpp
rename to services/blob/old/src/DatabaseEntities/BlobItem.cpp
diff --git a/services/blob/src/DatabaseEntities/ReverseIndexItem.h b/services/blob/old/src/DatabaseEntities/ReverseIndexItem.h
rename from services/blob/src/DatabaseEntities/ReverseIndexItem.h
rename to services/blob/old/src/DatabaseEntities/ReverseIndexItem.h
diff --git a/services/blob/src/DatabaseEntities/ReverseIndexItem.cpp b/services/blob/old/src/DatabaseEntities/ReverseIndexItem.cpp
rename from services/blob/src/DatabaseEntities/ReverseIndexItem.cpp
rename to services/blob/old/src/DatabaseEntities/ReverseIndexItem.cpp
diff --git a/services/blob/src/DatabaseManager.h b/services/blob/old/src/DatabaseManager.h
rename from services/blob/src/DatabaseManager.h
rename to services/blob/old/src/DatabaseManager.h
diff --git a/services/blob/src/DatabaseManager.cpp b/services/blob/old/src/DatabaseManager.cpp
rename from services/blob/src/DatabaseManager.cpp
rename to services/blob/old/src/DatabaseManager.cpp
diff --git a/services/blob/src/MultiPartUploader.h b/services/blob/old/src/MultiPartUploader.h
rename from services/blob/src/MultiPartUploader.h
rename to services/blob/old/src/MultiPartUploader.h
diff --git a/services/blob/src/MultiPartUploader.cpp b/services/blob/old/src/MultiPartUploader.cpp
rename from services/blob/src/MultiPartUploader.cpp
rename to services/blob/old/src/MultiPartUploader.cpp
diff --git a/services/blob/src/Reactors/server/GetReactor.h b/services/blob/old/src/Reactors/server/GetReactor.h
rename from services/blob/src/Reactors/server/GetReactor.h
rename to services/blob/old/src/Reactors/server/GetReactor.h
diff --git a/services/blob/src/Reactors/server/PutReactor.h b/services/blob/old/src/Reactors/server/PutReactor.h
rename from services/blob/src/Reactors/server/PutReactor.h
rename to services/blob/old/src/Reactors/server/PutReactor.h
diff --git a/services/blob/src/S3Path.h b/services/blob/old/src/S3Path.h
rename from services/blob/src/S3Path.h
rename to services/blob/old/src/S3Path.h
diff --git a/services/blob/src/S3Path.cpp b/services/blob/old/src/S3Path.cpp
rename from services/blob/src/S3Path.cpp
rename to services/blob/old/src/S3Path.cpp
diff --git a/services/blob/src/S3Tools.h b/services/blob/old/src/S3Tools.h
rename from services/blob/src/S3Tools.h
rename to services/blob/old/src/S3Tools.h
diff --git a/services/blob/src/S3Tools.cpp b/services/blob/old/src/S3Tools.cpp
rename from services/blob/src/S3Tools.cpp
rename to services/blob/old/src/S3Tools.cpp
diff --git a/services/blob/src/Tools.h b/services/blob/old/src/Tools.h
rename from services/blob/src/Tools.h
rename to services/blob/old/src/Tools.h
diff --git a/services/blob/src/Tools.cpp b/services/blob/old/src/Tools.cpp
rename from services/blob/src/Tools.cpp
rename to services/blob/old/src/Tools.cpp
diff --git a/services/blob/src/server.cpp b/services/blob/old/src/server.cpp
rename from services/blob/src/server.cpp
rename to services/blob/old/src/server.cpp
diff --git a/services/blob/test/DatabaseManagerTest.cpp b/services/blob/old/test/DatabaseManagerTest.cpp
rename from services/blob/test/DatabaseManagerTest.cpp
rename to services/blob/old/test/DatabaseManagerTest.cpp
diff --git a/services/blob/test/MultiPartUploadTest.cpp b/services/blob/old/test/MultiPartUploadTest.cpp
rename from services/blob/test/MultiPartUploadTest.cpp
rename to services/blob/old/test/MultiPartUploadTest.cpp
diff --git a/services/blob/test/StorageManagerTest.cpp b/services/blob/old/test/StorageManagerTest.cpp
rename from services/blob/test/StorageManagerTest.cpp
rename to services/blob/old/test/StorageManagerTest.cpp
diff --git a/services/blob/test/TestTools.h b/services/blob/old/test/TestTools.h
rename from services/blob/test/TestTools.h
rename to services/blob/old/test/TestTools.h
diff --git a/services/blob/test/TestTools.cpp b/services/blob/old/test/TestTools.cpp
rename from services/blob/test/TestTools.cpp
rename to services/blob/old/test/TestTools.cpp
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Dec 25, 7:27 PM (12 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2703010
Default Alt Text
D5675.diff (6 KB)
Attached To
Mode
D5675: [services][blob] Move current implementation to cpp directory
Attached
Detach File
Event Timeline
Log In to Comment